diff --git a/IFD_statuseffects.config.patch b/IFD_statuseffects.config.patch index 1aa1fd29..c321928c 100644 --- a/IFD_statuseffects.config.patch +++ b/IFD_statuseffects.config.patch @@ -67,7 +67,10 @@ ,[{"op":"add","path":"/effectNames/sb_maxenergyboost5","value":{"path":"/stats/effects/maxenergyboost/sb_maxenergyboost5.statuseffect","customLabels":["^#0f0;+ 5 Max Energy^reset;"]}}] ,[{"op":"add","path":"/effectNames/sb_maxenergyboost10","value":{"path":"/stats/effects/maxenergyboost/sb_maxenergyboost10.statuseffect","customLabels":["^#0f0;+ 10 Max Energy^reset;"]}}] +,[{"op":"add","path":"/effectNames/sb_maxenergyboost15","value":{"path":"/stats/effects/maxenergyboost/sb_maxenergyboost15.statuseffect","customLabels":["^#0f0;+ 15 Max Energy^reset;"]}}] +,[{"op":"add","path":"/effectNames/sb_maxenergyboost20","value":{"path":"/stats/effects/maxenergyboost/sb_maxenergyboost20.statuseffect","customLabels":["^#0f0;+ 20 Max Energy^reset;"]}}] ,[{"op":"add","path":"/effectNames/sb_maxenergyboost30","value":{"path":"/stats/effects/maxenergyboost/sb_maxenergyboost30.statuseffect","customLabels":["^#0f0;+ 30 Max Energy^reset;"]}}] +,[{"op":"add","path":"/effectNames/sb_maxenergyboost40","value":{"path":"/stats/effects/maxenergyboost/sb_maxenergyboost40.statuseffect","customLabels":["^#0f0;+ 40 Max Energy^reset;"]}}] ,[{"op":"add","path":"/effectNames/sb_berserk","value":{"path":"/tech/starbound/unscripted/berserk.statuseffect","customLabels":["^#0f0;+ Berserk^reset;"]}}] @@ -75,6 +78,9 @@ ,[{"op":"add","path":"/effectNames/sb_greystim","value":{"path":"/stats/sb_effects/stats/greystim.statuseffect","customLabels":["^#0f0;+ 5 Protection^reset;"]}}] ,[{"op":"add","path":"/effectNames/sb_shipgreystim","value":{"path":"/stats/sb_effects/stats/shipgreystim.statuseffect","customLabels":["^#0f0;+ 5 Protection^reset;"]}}] +,[{"op":"add","path":"/effectNames/sb_gauzeheal","value":{"path":"/stats/effects/heal/sb_gauzeheal.statuseffect","effectConfigTypes":["healAmount"]}}] +,[{"op":"add","path":"/effectNames/sb_regeneration5","value":{"path":"/stats/effects/regeneration/sb_regeneration5.statuseffect","effectConfigTypes":["healTime"]}}] + ,[{"op":"add","path":"/effectNames/sb_energyregen","value":{"path":"/stats/sb_effects/energyregen/energyregen.statuseffect","customLabels":["^#0f0;+ 5% Energy Regen^reset;"]}}] ,[{"op":"add","path":"/effectNames/sb_energyregen96","value":{"path":"/stats/sb_effects/energyregen/energyregen96.statuseffect","customLabels":["^#0f0;+ 1.6% Energy Regen^reset;"]}}] ,[{"op":"add","path":"/effectNames/sb_energyregen192","value":{"path":"/stats/sb_effects/energyregen/energyregen192.statuseffect","customLabels":["^#0f0;+ 3.2% Energy Regen^reset;"]}}] diff --git a/_metadata b/_metadata index 338f3b0e..ff65b51c 100644 --- a/_metadata +++ b/_metadata @@ -2,10 +2,10 @@ "author": "XRC - 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, this mod changes the way you craft, explore, defend, and fight in a simple-to-learn-hard-to-master way! Pickaxes, tech, quests, food, recipes, dungeons, weapons, biomes, and more!\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][/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] 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[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 sprite was 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]!", "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", "Harvester Beamgun v2.21", "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"], + "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"], "link": "steam://urlCommunityFilePage/2010607826", "name": "XRC_BETA_STARBOUND", "steamContentId": "2010607826", "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.10f" + "version": "0.11" } diff --git a/animations/dash/sb_crouchdash.png b/animations/dash/sb_crouchdash.png index e1772e1c..636686ff 100644 Binary files a/animations/dash/sb_crouchdash.png and b/animations/dash/sb_crouchdash.png differ diff --git a/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png b/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png index 935dec48..90875d06 100644 Binary files a/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png and b/animations/sb/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png differ diff --git a/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.png b/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.png index f7cc7c96..0211f33e 100644 Binary files a/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.png and b/animations/sb/muzzleflash/bulletmuzzle3/bulletmuzzle3.png differ diff --git a/animations/sb/muzzleflash/electromuzzle/electromuzzle.png b/animations/sb/muzzleflash/electromuzzle/electromuzzle.png index 426b90f6..ebbbd60d 100644 Binary files a/animations/sb/muzzleflash/electromuzzle/electromuzzle.png and b/animations/sb/muzzleflash/electromuzzle/electromuzzle.png differ diff --git a/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.png b/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.png index f797ff19..55ffff77 100644 Binary files a/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.png and b/animations/sb/muzzleflash/flamemuzzle/flamemuzzle.png differ diff --git a/animations/sb/muzzleflash/meteorflash/meteorflash.png b/animations/sb/muzzleflash/meteorflash/meteorflash.png index 786951cc..f3ff62ad 100644 Binary files a/animations/sb/muzzleflash/meteorflash/meteorflash.png and b/animations/sb/muzzleflash/meteorflash/meteorflash.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png b/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png index 59bc7fb5..8771377b 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png and b/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.png b/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.png index 8bd7b260..59306cde 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.png and b/animations/sb/muzzleflash/plasmamuzzle3blue/plasmamuzzle3blue.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.png b/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.png index b775fb17..d2309bd6 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.png and b/animations/sb/muzzleflash/plasmamuzzle3green/plasmamuzzle3green.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.png b/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.png index 4e90fc73..951f0110 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.png and b/animations/sb/muzzleflash/plasmamuzzle3pink/plasmamuzzle3pink.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.png b/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.png index 1bb50bc4..6c7638af 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.png and b/animations/sb/muzzleflash/plasmamuzzle4/plasmamuzzle4.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.png b/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.png index 896e854f..f21fee6a 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.png and b/animations/sb/muzzleflash/plasmamuzzle4green/plasmamuzzle4green.png differ diff --git a/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.png b/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.png index ba79c549..a4463fa3 100644 Binary files a/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.png and b/animations/sb/muzzleflash/plasmamuzzle4yellow/plasmamuzzle4yellow.png differ diff --git a/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.png b/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.png index 55b9f2d7..5749e73a 100644 Binary files a/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.png and b/animations/sb/muzzleflash/smokemuzzle/smokemuzzle.png differ diff --git a/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.png b/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.png index 18895691..60980f79 100644 Binary files a/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.png and b/animations/sb/muzzleflash/tankflashmuzzle/tankflashmuzzle.png differ diff --git a/animations/sb_deployment/deployshardbottom.png b/animations/sb_deployment/deployshardbottom.png index 0826c3d2..05091735 100644 Binary files a/animations/sb_deployment/deployshardbottom.png and b/animations/sb_deployment/deployshardbottom.png differ diff --git a/animations/sb_deployment/deployshardtop.png b/animations/sb_deployment/deployshardtop.png index 613f6659..1cd7de7d 100644 Binary files a/animations/sb_deployment/deployshardtop.png and b/animations/sb_deployment/deployshardtop.png differ diff --git a/animations/statuseffects/sb_frozenburning/frozenburning.png b/animations/statuseffects/sb_frozenburning/frozenburning.png index 25a6ac13..a4f00dde 100644 Binary files a/animations/statuseffects/sb_frozenburning/frozenburning.png and b/animations/statuseffects/sb_frozenburning/frozenburning.png differ diff --git a/betabound.config b/betabound.config index 27231222..1ad3bdd2 100644 --- a/betabound.config +++ b/betabound.config @@ -9,6 +9,9 @@ [21, 39]//scan ], + //the one in player.config isn't read by the game + "defaultItems": ["sb_inspect", "sb_survivalguide-codex", "sb_gunguide-codex"], + "rotFood": true, "hungerPopups": true, @@ -17,6 +20,7 @@ "updateNote": "Update Note", "removedItemDescription": "Hello! You might have noticed some white X's in your inventory. Don't be alarmed; re-log or drop them in a chest or on the ground and they'll return to normal.", "convert3description": "An item was removed. This parcel contains a refund. If it's a white X, drop it on the ground or put it in a chest.", + "changedQuestRewardsDescription": "Rewards for one or more completed quests have been adjusted. (Contains %s items.)", "updateNotes": { "090": ["6/OCT/2022", "Hello! Because you're using a character created prior to Betabound 0.9.0, you don't need to craft a Metalworking or Compounding Upgrade. You already have the recipes!"], "090b": ["6/OCT/2022", "Hello! Please use the Inventor's Table as your main crafting table-- redundant Betabound crafting stations have been phased out."], diff --git a/betabound.macros b/betabound.macros index 3b01b0ae..18ee714c 100644 --- a/betabound.macros +++ b/betabound.macros @@ -1,83 +1,132 @@ { - "sb_human" : ["/startquest '\"human_mission1\"'","/completequest human_mission1"], - "sb_floran" : ["/startquest '\"floran_mission1\"'","/completequest floran_mission1", "/startquest '\"floran_mission2\"'","/completequest floran_mission2"], - "sb_hylotl" : ["/startquest '\"hylotl_mission1\"'","/completequest hylotl_mission1", "/startquest '\"hylotl_mission2\"'","/completequest hylotl_mission2"], - "sb_avian" : ["/startquest '\"avian_mission1\"'","/completequest avian_mission1", "/startquest '\"avian_mission2\"'","/completequest avian_mission2"], - "sb_apex" : ["/startquest '\"apex_mission1\"'","/completequest apex_mission1", "/startquest '\"apex_mission2\"'","/completequest apex_mission2"], - "sb_glitch" : ["/startquest '\"glitch_mission1\"'","/completequest glitch_mission1", "/startquest '\"glitch_mission2\"'","/completequest glitch_mission2"], - "sb_story" : ["/sb_human","/sb_floran","/sb_hylotl","/sb_avian","/sb_apex","/sb_glitch"], + //Spawning entities + "sb_punchy": ["^#ff0,shadow;Spawned a Punchy at the location of the cursor.", "/spawnmonster punchy"], + "sb_evilpunchy": ["^#ff0,shadow;Spawned an enemy Punchy at the location of the cursor.", "/spawnmonster punchy 1 '{\"damageTeamType\":\"enemy\"}'"], + "sb_gleap": ["^#ff0,shadow;Spawned a Gleap at the location of the cursor.", "/spawnmonster gleap"], + "sb_cultist": ["^#ff0,shadow;Spawned a cultist at the location of the cursor.", "/spawnnpc human cultist"], + "sb_npc": ["^#ff0,shadow;Spawned an NPC at the location of the cursor.", "/spawnnpc human villager"], + "sb_bunny": ["^#ff0,shadow;Spawned a bunny at the location of the cursor.", "/spawnmonster bunnycritter"], + "sb_fish": ["^#ff0,shadow;Spawned a fish at the location of the cursor.", "/spawnmonster fish"], - "sb_punchy":["^#ff0,shadow;Spawned a Punchy at the location of the cursor.","/spawnmonster punchy"], - "sb_evilpunchy":["^#ff0,shadow;Spawned an enemy Punchy at the location of the cursor.","/spawnmonster punchy 1 '{\"damageTeamType\":\"enemy\"}'"], - "sb_gleap":["^#ff0,shadow;Spawned a Gleap at the location of the cursor.","/spawnmonster gleap"], - "sb_cultist":["^#ff0,shadow;Spawned a cultist at the location of the cursor.","/spawnnpc human cultist"], - "sb_npc":["^#ff0,shadow;Spawned an NPC at the location of the cursor.","/spawnnpc human villager"], - "sb_bunny":["^#ff0,shadow;Spawned a bunny at the location of the cursor.","/spawnmonster bunnycritter"], - "sb_fish":["^#ff0,shadow;Spawned a fish at the location of the cursor.","/spawnmonster fish"], - - "sb_copyobject":["/entityeval if object then world.spawnItem(object.name(),object.position(),1,config.getParameter(\"\")) return object.name() else return \"Couldn't find an object at the cursor.\" end"], - "sb_copynpc":["/entityeval if npc then local tnme = npc.humanoidIdentity().name world.spawnItem({name=\"spawnerwizard\",count=5,parameters={shortdescription=tnme..\" Spawner\",spawner={npcTypeOptions={npc.npcType()},npcSpeciesOptions={npc.species()},npcParameterOptions={{identity=npc.humanoidIdentity()}}}}},entity.position()) return tnme end return \"Can't find NPC.\""], - "sb_toggledronespawning":["/entityeval if world then world.setProperty(\"sb_envprobe\",not world.getProperty(\"sb_envprobe\",true)) return \"Probe spawning \"..(world.getProperty(\"sb_envprobe\") and \"en\" or \"dis\")..\"abled for this world.\" else return \"Couldn't find an object at the cursor.\" end"], - "sb_toggleevents":["/entityeval if world then world.setProperty(\"sb_events\",not world.getProperty(\"sb_events\",true)) return \"Random events \"..(world.getProperty(\"sb_events\") and \"en\" or \"dis\")..\"abled for this world.\" else return \"Couldn't find an object at the cursor.\" end"], - - "sb_givemetech" : [ - "/spawnitem sb_tech","/spawnitem sb_tech","/spawnitem sb_tech" + //Utility + "sb_copyobject": ["/entityeval if object then world.spawnItem(object.name(),object.position(),1,config.getParameter(\"\")) return object.name() else return \"Couldn't find an object at the cursor.\" end"], + "sb_copynpc": ["/entityeval if npc then local tnme = npc.humanoidIdentity().name world.spawnItem({name=\"spawnerwizard\",count=5,parameters={shortdescription=tnme..\" Spawner\",spawner={npcTypeOptions={npc.npcType()},npcSpeciesOptions={npc.species()},npcParameterOptions={{identity=npc.humanoidIdentity()}}}}},entity.position()) return tnme end return \"Can't find NPC.\""], + "sb_lootpool": ["/entityeval if object then object.say(object.name()..'\\n'..math.floor(entity.position()[1])..', '..math.floor(entity.position()[2])..'\\n'..config.getParameter('treasurePools',{''})[1]) return config.getParameter('treasurePools') end"], + "sb_printable": ["/entityeval object and object.name().. \" - \"..tostring(root.itemConfig(object.name()).config.printable)"], + "sb_numbers": ["/entityeval if not world then return end for n=0,9 do world.spawnItem('number'..n,entity.position(),99) end"], + "sb_dyes": [ + "/spawnitem dyeremover 30 '{\"sb_reusable\":false,\"rarity\":\"rare\"}", + "/entityeval if not world then return end + i={'black','blue','brown','green','grey','sb_greyblue','sb_lightgrey','sb_limegreen','orange','pink','purple','red','sb_teal','white','yellow'} + for n=1,#i do world.spawnItem(i[n]..'dye',entity.position(),30,{sb_reusable=false,rarity='rare'}) end" ], + "sb_beamaxe": ["/spawnitem sb_beamaxe2 1 '{\"upgrades\":[\"size1\",\"size2\",\"size3\",\"range1\",\"range2\",\"range3\",\"power1\",\"power2\",\"power3\",\"liquidcollection\",\"paintmode\",\"wiremode\"],\"canCollectLiquid\":true,\"blockRadius\":5,\"tileDamage\":4.8,\"minBeamWidth\":8,\"minBeamJitter\":0.2}"], + "sb_repeatversioning": ["/run status.setStatusProperty('xrc_0018z',status.statusProperty('xrc_0018z')-1)"], - "sb_tech" : ["/entityeval if not world then return end -local t=root.assetJson('/tech/starbound/tech.config') -for i=1,#t do world.spawnItem('sb_tech',entity.position(),1,{techModule=t[i]}) end"], + //Completion + "sb_tech": ["/entityeval if not world then return end local t=root.assetJson('/tech/starbound/tech.config') for i=1,#t do world.spawnItem('sb_tech',entity.position(),1,{techModule=t[i]}) end"], + "sb_music": ["/entityeval if not world then return end local music=root.assetJson('/collections/sb_music.collection').collectables for k,_ in pairs(music) do world.spawnItem('sb_musicsheet',entity.position(),1,{music=k}) end"], + "sb_actionfigures": ["/entityeval i = root.collectables(\"actionfigures\") for j = 1, #i do world.spawnItem(i[j].name,entity.position()) end"], + "sb_cookingrecipes": ["/entityeval local food = root.collectables('cooking') local recipes = {} for i = 1, #food do recipes[#recipes+1] = food[i].name end world.spawnItem('paper',entity.position(),1,{learnBlueprintsOnPickup=recipes,consumeOnPickup=true})"], - "sb_music" : ["/entityeval if not world then return end -local music=root.assetJson('/collections/sb_music.collection').collectables -for k,_ in pairs(music) do world.spawnItem('sb_musicsheet',entity.position(),1,{music=k}) end"], - - "sb_checkblueprints" : [ - "^yellow;Printing default blueprints to the log...", - "/eval local p = root.assetJson('/player.config:defaultBlueprints') sb.logInfo(sb.printJson(p,1))", - "^yellow;Logging the last changes to player.config to the log...", - "/eval local p = root.assetJson('/player.config.patch') sb.logInfo(sb.printJson(p,1))", - "/eval local p = root.assetJson('/player.config:defaultBlueprints') i=0 for a,b in pairs(p) do for c,d in pairs(b) do i=i+1 end end sb.logInfo(i)" - ], + //Warping + "sb_home": ["/warp CelestialWorld:-161011021:-960048166:41000317:4=1448.1027"], + "sb_storage": ["/warp InstanceWorld:playerstation:21df53c9aade582dfc2b38e6a28b62f0:1=cba2e7459537ec44bcfced0ab0548c99"], + "sb_storage2": ["/warp InstanceWorld:playerstation:6f20604db8080bfa09f17a9cd667956b:1=2acb1e351639f3d2f738182d7f86c8a3"], + "sb_elliot": ["/spawnitem techlabscientistshop 1 '{\"shortdescription\":\"Questless Elliot\",\"offeredQuests\":[]}"], + "sb_biggy": ["/spawnitem penguinweaponshop 1 '{\"selectCount\":99}"], + "sb_kill": ["/entityeval if status then status.setResource('health',0) end"], + //Progression + "sb_human": ["/startquest '\"human_mission1\"'", "/completequest human_mission1"], + "sb_floran": ["/startquest '\"floran_mission1\"'", "/completequest floran_mission1", "/startquest '\"floran_mission2\"'", "/completequest floran_mission2"], + "sb_hylotl": ["/startquest '\"hylotl_mission1\"'", "/completequest hylotl_mission1", "/startquest '\"hylotl_mission2\"'", "/completequest hylotl_mission2"], + "sb_avian": ["/startquest '\"avian_mission1\"'", "/completequest avian_mission1", "/startquest '\"avian_mission2\"'", "/completequest avian_mission2"], + "sb_apex": ["/startquest '\"apex_mission1\"'", "/completequest apex_mission1", "/startquest '\"apex_mission2\"'", "/completequest apex_mission2"], + "sb_glitch": ["/startquest '\"glitch_mission1\"'", "/completequest glitch_mission1", "/startquest '\"glitch_mission2\"'", "/completequest glitch_mission2"], + "sb_story": ["/sb_human", "/sb_floran", "/sb_hylotl", "/sb_avian", "/sb_apex", "/sb_glitch"], - "sb_bars" : ["/entityeval if not world then return end i={'ironbar','tungstenbar','sb_steelbar','durasteelbar','refinedaegisalt','refinedviolium','sb_refinedrubium','sb_feroziumcompound','sb_ceruliumcompound','sb_imperviumcompound'} for n = 1, #i do world.spawnItem(i[n],entity.position(),20) end"], + "sb_swansong": ["/warp instanceworld:cultistmission1=1633.795"], - "sb_lootpool" : ["/entityeval if object then object.say(object.name()..'\\n'..math.floor(entity.position()[1])..', '..math.floor(entity.position()[2])..'\\n'..config.getParameter('treasurePools',{''})[1]) return config.getParameter('treasurePools') end"], + "sb_tier6kit": [ + "/enabletech sb_targetblink", + "/enabletech sb_rocketboots", + "/enabletech sb_dash", + "/sb_enabletech sb_glow", + "/sb_beamaxe", + "/naked", - "sb_slimehandgrapple" : [ - "/spawnitem sb_testrevolver", - "/spawnitem sb_testrevolver", - "/spawnitem sb_slimehandgrapple 1 '{\"consumeOnUse\":false,\"rarity\":\"legendary\",\"maxStack\":1}" + "/spawnitem sb_itembox 1 '{\"items\":[ + \"shipT8\", + [\"fillerup\",999], + [\"sb_tech\",1,{\"techModule\":\"sb_glow\"}], + [\"sb_maxfuel1\",1,{\"customUpgradeID\":\"xrc_1\",\"shipUpgrade\":{\"shipSpeed\":999},\"shortdescription\":\"Thruster MK+\",\"description\":\"Increases thruster speed by 999.\\n^#f00;Usable once per ship.^reset;\"}], + \"humantier6mhead\", + \"humantier6mchest\", + \"humantier6mpants\", + \"heatprotectionback\", + \"xenonpack\", + [\"sb_starcleaver\",1,{\"level\":6}], + [\"sb_flamethrower\",1,{\"level\":6}], + [\"sb_freezeray\",1,{\"level\":6}], + [\"sb_uncommonshield\",1,{\"level\":6}], + \"sb_draintool\", + \"grapplinghook\", + [\"nanowrap\",999], + [\"sb_doping\",999], + [\"sb_vegetablesoup\",999], + \"sb_flashfreeze\" + ]}'", + "/sb_elliot" ], - "sb_madloot" : [ - "/spawntreasure valuableTreasure", - "/spawntreasure valuableTreasure 2", - "/spawntreasure valuableTreasure 3", - "/spawntreasure valuableTreasure 4", - "/spawntreasure valuableTreasure 5", - "/spawntreasure valuableTreasure 6" + //Misc + "sb_toggleevents": ["/entityeval if world then world.setProperty(\"sb_events\",not world.getProperty(\"sb_events\",true)) return \"Random events \"..(world.getProperty(\"sb_events\") and \"en\" or \"dis\")..\"abled for this world.\" else return \"Couldn't find an object at the cursor.\" end"], + "sb_checkblueprints": [ + "^yellow;Printing default blueprints to the log...", + "/eval local p = root.assetJson('/player.config:defaultBlueprints') sb.logInfo(sb.printJson(p,1))", + "^yellow;Logging the last changes to player.config to the log...", + "/eval local p = root.assetJson('/player.config.patch') sb.logInfo(sb.printJson(p,1))", + "/eval local p = root.assetJson('/player.config:defaultBlueprints') i=0 for a,b in pairs(p) do for c,d in pairs(b) do i=i+1 end end sb.logInfo(i)" ], - - "sb_greenscreensuit" : [ + "sb_greenscreensuit": [ "/spawnitem darkdisguisehead 1 '{\"directives\":\"?setcolor=0f0\",\"effectSources\":[]}]", "/spawnitem darkdisguisechest 1 '{\"directives\":\"?setcolor=0f0\",\"effectSources\":[]}]", "/spawnitem darkdisguiselegs 1 '{\"directives\":\"?setcolor=0f0\",\"effectSources\":[]}]" ], + "sb_buffs": [ + "^yellow;Spawning IFD stuff at the cursor position.", + "/entityeval if not world then return end + i={ + //damaging + 'bleed','explosivepunch', - "sb_home" : ["/warp CelestialWorld:-161011021:-960048166:41000317:4=1448.1027"], - "sb_storage" : ["/warp InstanceWorld:playerstation:21df53c9aade582dfc2b38e6a28b62f0:1=cba2e7459537ec44bcfced0ab0548c99"], + 'energyregen','energyregen96','energyregen192','energyregen288','energyregen384','energyregen480','energyregen672', + 'energyregen','energyregen96','energyregen192','energyregen288','energyregen384','energyregen480','energyregen672', + 'light2energy','light2energy96','light2energy192','light2energy288','light2energy384','light2energy480','light2energy672', - "sb_beamaxe" : ["/spawnitem sb_beamaxe2 1 '{\"upgrades\":[\"sb_generic\",\"size1\",\"size2\",\"size3\",\"range1\",\"range2\",\"range3\",\"power1\",\"power2\",\"power3\",\"liquidcollection\",\"paintmode\",\"wiremode\"],\"canCollectLiquid\":true,\"blockRadius\":5,\"tileDamage\":4.8,\"minBeamWidth\":8,\"minBeamJitter\":0.2}"], - "sb_beam" : ["/entityeval frame = {1,2,15} frame=frame[math.random(3)] species = root.assetJson(\"/interface/windowconfig/charcreation.config:speciesOrdering\") for i = 1, #species do world.spawnItem(\"redapple\",entity.position(),1,{timeToRot=1,inventoryIcon=\"/animations/teleport/penguinplayerwarpin.png:\"..frame..(root.assetJson(\"/species/\"..species[i]..\".species\")[\"effectDirectives\"] or \"\"),shortdescription=species[i]}) end"], - "sb_wickedrobotsplitter" : ["/spawnitem sb_uncommonbroadsword 1 '{\"seed\":-362604192805478673,\"level\":2,\"animationPartVariants\":{\"blade\":45,\"handle\":33}}"], - "sb_swansong" : ["/warp instanceworld:cultistmission1=1633.795"], -//"sb_mttest" : ["/spawnnpc human villager 1 1 '{\"scripts\":[]}'"], - "sb_elliot" : ["/spawnitem techlabscientistshop 1 '{\"shortdescription\":\"Questless Elliot\",\"offeredQuests\":[]}"], - "sb_biggy" : ["/spawnitem penguinweaponshop 1 '{\"selectCount\":99}"], - "sb_kill" : ["/entityeval if status then status.setResource('health',0) end"], - "sb_actionfigures" : ["/entityeval i = root.collectables(\"actionfigures\") for j = 1, #i do world.spawnItem(i[j].name,entity.position()) end"], - "sb_cookingrecipes" : ["/entityeval local food = root.collectables('cooking') local recipes = {} for i = 1, #food do recipes[#recipes+1] = food[i].name end world.spawnItem('paper',entity.position(),1,{learnBlueprintsOnPickup=recipes,consumeOnPickup=true})"], - "sb_printable" : ["/entityeval object and object.name().. \" - \"..tostring(root.itemConfig(object.name()).config.printable)"] -} \ No newline at end of file + 'foodheal10','foodheal25','foodheal35','foodheal50','foodheal70','foodheal95', + 'foodheal120','foodheal135','foodheal145','foodheal170','foodheal190','foodheal215', + 'foodheal240','foodheal265','foodheal315','foodheal360','foodheal720','repairbotheal', + //instant + 'directdamage','energy','food','health','restoration', + //movement + 'encumbered','foodslow','glide','jellyslow','sugarrush','tranquilized', + //stats + 'greystim','grit','protectionboost5','shipgreystim', + //unsorted + 'airpocket','brainextractor','fooddepletionsuppressed','frozenburning','ladder','minibossspawn','outpost','poisoncreep', + //tech + 'absorptiontech','sb_enhancedhealingtech','sb_forcefieldtech','sb_spikedtech','sb_tanktech','sb_vamptech', + 'sb_explosiveprotectiontech', + 'sb_groundsmashdamage','sb_groundsmashknockbackX','sb_groundsmashknockbackY', + 'sb_magnet', + 'sb_gravitytech','sb_jumptech','sb_mobilitytech','sb_speedtech', + 'sb_energyregentech','sb_regenerationtech', + 'sb_shield', + 'sb_breathprotectiontech','sb_coldprotectiontech','sb_environmentalprotectiontech','sb_heatprotectiontech','sb_radiationprotectiontech', + 'sb_berserk','sb_energytech','sb_glowtech','sb_grittech','sb_healthtech','sb_protectiontech','sb_reducefalldamagetech' + } + for n = 1, #i do world.spawnItem('soda',entity.position(),80,{maxStack=9999,shortdescription=i[n],effects={{'sb_'..i[n]}}}) end" + ] +} diff --git a/betabound2.macros b/betabound2.macros deleted file mode 100644 index 4b232a93..00000000 --- a/betabound2.macros +++ /dev/null @@ -1,59 +0,0 @@ -{ - "sb_armor" : [ - "/entityeval if not world then return end - local i={'apex','avian','floran','glitch','human','hylotl'} - local l={'head','chest','pants'} - for n=1,#i do for j=1,10 do for p=1,#l do world.spawnItem('sb_'..i[n]..'tier'..j..l[p],entity.position()) end end end" - ], - - "sb_chests" : [ - "^yellow;Spawning testing chests at the cursor position.", - "/entityeval if not world then return end - i={1,9,12,16,24,32,40,48,56,60,64} - for n=1,#i do world.spawnItem('sb_woodenlocker',entity.position(),3,{shortdescription=''..i[n],slotCount=i[n]}) end" - ], - - "sb_dyes" : [ - "/spawnitem dyeremover 30 '{\"sb_reusable\":false,\"rarity\":\"rare\"}", - "/entityeval if not world then return end - i={'black','blue','brown','green','grey','sb_greyblue','sb_lightgrey','sb_limegreen','orange','pink','purple','red','sb_teal','white','yellow'} - for n=1,#i do world.spawnItem(i[n]..'dye',entity.position(),30,{sb_reusable=false,rarity='rare'}) end" - ], - - "sb_numbers" : [ - "/entityeval if not world then return end - for n=0,9 do world.spawnItem('number'..n,entity.position(),30) end" - ], - - "sb_buffs" : [ - "^yellow;Spawning IFD stuff at the cursor position.", -"/entityeval if not world then return end -i={ -'sb_bleed','sb_poisoncreep','sb_outpostnpcspawner','sb_capturedmonster', -'sb_levelup', - -'sb_foodslow','sb_encumbered','sb_jellyslow','sb_sugarrush', - -'sb_breathprotectiontech','sb_radiationprotectiontech','sb_coldprotectiontech','sb_heatprotectiontech', - -'sb_healthtech','sb_energytech','sb_grittech','sb_glowtech','sb_mobilitytech','sb_jumptech','sb_speedtech', -'sb_gravitytech','sb_shield','sb_regenerationtech','sb_energyregentech','sb_protectiontech','sb_magnet','sb_berserk', - -'sb_health','sb_energy','sb_food','sb_directdamage', -'sb_maxenergyboost5','sb_maxenergyboost10','sb_maxenergyboost30', -'sb_protectionboost5', - -'sb_energyregen','sb_energyregen96','sb_energyregen192','sb_energyregen288','sb_energyregen384','sb_energyregen480','sb_energyregen672', -'sb_light2energy','sb_light2energy96','sb_light2energy192','sb_light2energy288','sb_light2energy384','sb_light2energy480','sb_light2energy672', - -'sb_foodheal10','sb_foodheal25','sb_foodheal35','sb_foodheal50','sb_foodheal70','sb_foodheal95', -'sb_foodheal120','sb_foodheal135','sb_foodheal145','sb_foodheal170','sb_foodheal190','sb_foodheal215', -'sb_foodheal240','sb_foodheal265','sb_foodheal315','sb_foodheal360','sb_foodheal720', - -'sb_airpocket','sb_frozenburning','sb_fooddepletionsuppressed','sb_bouncy','sb_grit', -'sb_brainextractor','sb_groundsmashdamage','sb_groundsmashknockbackX','sb_groundsmashknockbackY','sb_glide','sb_ladder','sb_tranquilized', -'sb_explosivepunch','sb_minibossspawn' -} -for n = 1, #i do world.spawnItem('soda',entity.position(),80,{maxStack=9999,shortdescription=i[n],effects={{i[n]}}}) end" - ] -} \ No newline at end of file diff --git a/betabound3.macros b/betabound3.macros deleted file mode 100644 index b0e16fad..00000000 --- a/betabound3.macros +++ /dev/null @@ -1,250 +0,0 @@ -{ - - "sb_tier2tech" : [ - "/sb_givemetech", - "/maketechavailable sb_doublejump", - "/maketechavailable sb_dash", - "/maketechavailable sb_bounce", - "/enabletech distortionsphere", - "/enabletech dash", - "/enabletech doublejump", - "/spawnitem sb_tech 1 '{\"techModule\":\"sb_breathprotection\"}", - "/sb_enabletech sb_breathprotection", - "/maketechavailable aquasphere", - "/maketechavailable sonicsphere", - "/maketechavailable spikesphere", - "/maketechavailable airdash", - "/maketechavailable blinkdash", - "/maketechavailable sprint", - "/maketechavailable multijump", - "/maketechavailable rocketjump", - "/maketechavailable walljump", - "/spawnitem techcard 20" - ], - - "sb_tier3tech" : [ - "/sb_givemetech", - "/sb_tier2tech", - "/maketechavailable sb_groundsmash", - "/maketechavailable sb_rocketjump", - "/maketechavailable sb_boat", - "/spawnitem sb_tech 1 '{\"techModule\":\"sb_radiationprotection\"}", - "/sb_enabletech sb_radiationprotection", - "/spawnitem techcard 30" - ], - - "sb_tier4tech" : [ - "/sb_givemetech", - "/sb_tier3tech", - "/maketechavailable sb_morphball", - "/maketechavailable sb_gravitybubble", - "/maketechavailable sb_lightrig", - "/maketechavailable skyrail", - "/spawnitem sb_tech 1 '{\"techModule\":\"sb_coldprotection\"}", - "/sb_enabletech sb_coldprotection", - "/spawnitem techcard 40" - ], - - "sb_tier5tech" : [ - "/sb_givemetech", - "/sb_tier4tech", - "/maketechavailable sb_targetblink", - "/maketechavailable sb_ftlboost", - "/maketechavailable sb_rocketboots", - "/spawnitem sb_tech 1 '{\"techModule\":\"sb_heatprotection\"}", - "/spawnitem sb_tech 1 '{\"techModule\":\"sb_environmentalprotectiontech\"}", - "/sb_enabletech sb_heatprotection", - "/sb_enabletech sb_environmentalprotectiontech", - "/spawnitem techcard 50" - ], - - - "sb_tier1kit" : [ - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T1 Kit: Armour\",\"items\":[ - \"copperarmorhead\", - \"copperarmorchest\", - \"copperarmorpants\", - \"humantier1head\", - \"humantier1chest\", - \"humantier1pants\", - \"simplecapeback\" - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T1 Kit: Combat\",\"items\":[ - \"sb_humantier1dagger\", - \"sb_humantier1dagger\", - \"sb_humantier1axe\", - \"sb_humantier1axe\", - \"sb_humantier1broadsword\", - \"sb_humantier1shortsword\", - \"sb_humantier1shortsword\", - \"sb_humantier1spear\", - \"sb_humantier1hammer\", - \"sb_novatier1revolver\", - \"sb_novatier1revolver\", - \"sb_novatier1rifle\", - [\"sb_ammo\",750], - \"sb_tier1shield\" - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T1 Kit: Misc\",\"items\":[ - \"silverpickaxe\", - [\"sb_silver_repair\",20], - [\"manipulatormodule\",12], - [\"climbingrope\",40], - \"sb_ladderdeployer\", - [\"sb_copperladder\",500], - [\"torch\",500], - [\"salve\",20], - [\"sb_tomatojuice\",5], - [\"sb_carrotjuice\",5], - [\"sb_boiledpearlpeas\",5], - [\"sb_sweetcorn\",5], - \"sb_vegetablesoup\", - \"sb_alienburger\" - ]}", - "/sb_elliot" - ], - - "sb_tier2kit" : [ - "/sb_tier2tech", - - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T2 Kit: Misc\",\"items\":[ - \"shipT3\", - [\"fillerup\",999], - [\"sb_maxfuel1\",1,{\"customUpgradeID\":\"xrc_1\",\"shipUpgrade\":{\"shipSpeed\":999},\"shortdescription\":\"Thruster MK+\",\"description\":\"Increases thruster speed by 999.\n^#f00;Usable once per ship.^reset;\"}] - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T2 Kit: Armour\",\"items\":[ - \"silverarmorhead\", - \"silverarmorchest\", - \"silverarmorlegs\", - \"humantier2head\", - \"humantier2chest\", - \"humantier2pants\", - \"breathprotectionback\", - \"lanternstickback\" - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T2 Kit: Combat\",\"items\":[ - [\"sb_starcleaver\",1,{\"level\":2}], - [\"sb_slavesword\",1,{\"level\":2}], - \"sb_humantier2dagger\", - \"sb_humantier2dagger\", - \"sb_humantier2axe\", - \"sb_humantier2axe\", - \"sb_humantier2broadsword\", - \"sb_humantier2shortsword\", - \"sb_humantier2shortsword\", - \"sb_humantier2spear\", - \"sb_humantier2hammer\", - \"sb_novatier2revolver\", - \"sb_novatier2revolver\", - \"sb_novatier2rifle\", - [\"sb_ammo\",750], - [\"sb_tier2shield\",1,{\"level\":2}] - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T2 Kit: Tools\",\"items\":[ - \"goldpickaxe\", - [\"sb_gold_repair\",20], - [\"manipulatormodule\",13], - [\"climbingrope\",80], - \"sb_ladderdeployer\", - [\"sb_copperladder\",500] - ]}", - "/sb_elliot" - ], - - "sb_tier3kit" : [ - "/sb_tier3tech", - - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T3 Kit: Misc\",\"items\":[ - \"shipT4\", - [\"fillerup\",999], - [\"sb_maxfuel1\",1,{\"customUpgradeID\":\"xrc_1\",\"shipUpgrade\":{\"shipSpeed\":999},\"shortdescription\":\"Thruster MK+\",\"description\":\"Increases thruster speed by 999.\n^#f00;Usable once per ship.^reset;\"}] - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T3 Kit: Armour\",\"items\":[ - \"goldarmorhead\", - \"goldarmorchest\", - \"goldarmorlegs\", - \"humantier3head\", - \"humantier3chest\", - \"humantier3pants\", - \"radiationprotectionback\", - \"lanternstickback\" - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T3 Kit: Combat\",\"items\":[ - \"sb_humantier3dagger\", - \"sb_humantier3dagger\", - \"sb_humantier3axe\", - \"sb_humantier3axe\", - \"sb_humantier3broadsword\", - \"sb_humantier3shortsword\", - \"sb_humantier3shortsword\", - \"sb_humantier3spear\", - \"sb_humantier3hammer\", - \"sb_novatier3revolver\", - \"sb_novatier3revolver\", - \"sb_novatier3rifle\", - [\"sb_ammo\",750], - [\"sb_tier2shield\",1,{\"level\":3}] - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T3 Kit: Tools\",\"items\":[ - \"platinumpickaxe\", - [\"sb_platinum_repair\",20], - [\"manipulatormodule\",26], - [\"climbingrope\",80], - \"sb_ladderdeployer\", - [\"sb_copperladder\",500] - ]}", - "/sb_elliot" - ], - -//halogen is T4 (halogenpack), and so is xenonpack - - "sb_tier10kit" : [ - "/enabletech sb_targetblink", - "/enabletech sb_rocketboots", - "/enabletech sb_dash", - "/sb_enabletech sb_glow", - "/sb_beamaxe", - - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T10 Kit: Misc\",\"description\":\"Contains 4 items.\",\"items\":[ - \"shipT8\", - [\"fillerup\",999], - [\"sb_tech\",1,{\"techModule\":\"sb_glow\"}], - [\"sb_maxfuel1\",1,{\"customUpgradeID\":\"xrc_1\",\"shipUpgrade\":{\"shipSpeed\":999},\"shortdescription\":\"Thruster MK+\",\"description\":\"Increases thruster speed by 999.\n^#f00;Usable once per ship.^reset;\"}] - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T10 Kit: Armour\",\"description\":\"Contains 7 items.\",\"items\":[ - \"sb_humantier10head\", - \"sb_humantier10chest\", - \"sb_humantier10pants\", - \"sb_emptyhead\", - \"invisibleback\", - \"heatprotectionback\", - \"xenonpack\" - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T10 Kit: Combat\",\"description\":\"Contains 13 items.\",\"items\":[\"sb_testrevolver\", - [\"sb_starcleaver\",1,{\"level\":10}], - [\"sb_slavesword\",1,{\"level\":10}], - [\"sb_flamethrower\",1,{\"level\":10}], - [\"sb_freezeray\",1,{\"level\":10}], - [\"sb_humantier10dagger\",1,{\"level\":10}], - [\"sb_humantier10axe\",1,{\"level\":10}], - [\"sb_humantier10broadsword\",1,{\"level\":10}], - [\"sb_humantier10shortsword\",1,{\"level\":10}], - [\"sb_humantier10spear\",1,{\"level\":10}], - [\"sb_humantier10hammer\",1,{\"level\":10}], - [\"sb_frozenfirebow\",1,{\"level\":10}], - [\"sb_feroziumbow\",1,{\"level\":10}], - [\"sb_tierxshield\",1,{\"level\":10}], - [\"sb_tierxshield\",1,{\"level\":10}] - ]}", - "/spawnitem sb_itembox 1 '{\"shortdescription\":\"T10 Kit: Tools\",\"description\":\"Contains 5 items.\",\"items\":[ - \"sb_wiretool\", - \"sb_painttool\", - \"sb_draintool\", - \"sb_swingingvine\", - \"sb_swingingvine\" - ]}", - "/spawnitem sb_pizza 999", - "/spawnitem sb_doping 999", - "/sb_elliot" - ] -} \ No newline at end of file diff --git a/biomes/oredistributions.configfunctions.patch b/biomes/oredistributions.configfunctions.patch index 722ebcdf..1acbda53 100644 --- a/biomes/oredistributions.configfunctions.patch +++ b/biomes/oredistributions.configfunctions.patch @@ -1,13 +1,25 @@ [ -//plat -[{"op":"add","path":"/depth1/1/1/-","value":["platinum",0.75]}], -[{"op":"add","path":"/depth1/2/1/-","value":["platinum",0.50]}], - -[{"op":"add","path":"/depth2/1/1/-","value":["platinum",0.90]}], -[{"op":"add","path":"/depth2/2/1/-","value":["platinum",0.65]}], - -[{"op":"add","path":"/depth3/1/1/-","value":["platinum",1]}], -[{"op":"add","path":"/depth3/2/1/-","value":["platinum",0.80]}], +//plat. these rates are based on gold +[{"op":"add","path":"/depth2/0/1/-","value":["platinum",0.45]}], +[{"op":"add","path":"/depth2/1/1/-","value":["platinum",0.45]}], +[{"op":"add","path":"/depth2/2/1/-","value":["platinum",0.45]}], +[{"op":"add","path":"/depth2/3/1/-","value":["platinum",0.45]}], +[{"op":"add","path":"/depth2/4/1/-","value":["platinum",0.45]}], +[{"op":"add","path":"/depth2/5/1/-","value":["platinum",0.45]}], + +[{"op":"add","path":"/depth3/0/1/-","value":["platinum",0.95]}], +[{"op":"add","path":"/depth3/1/1/-","value":["platinum",0.95]}], +[{"op":"add","path":"/depth3/2/1/-","value":["platinum",0.95]}], +[{"op":"add","path":"/depth3/3/1/-","value":["platinum",0.95]}], +[{"op":"add","path":"/depth3/4/1/-","value":["platinum",0.95]}], +[{"op":"add","path":"/depth3/5/1/-","value":["platinum",0.95]}], + +[{"op":"add","path":"/core/0/1/-","value":["platinum",0.8]}], +[{"op":"add","path":"/core/1/1/-","value":["platinum",0.8]}], +[{"op":"add","path":"/core/2/1/-","value":["platinum",0.8]}], +[{"op":"add","path":"/core/3/1/-","value":["platinum",0.8]}], +[{"op":"add","path":"/core/4/1/-","value":["platinum",0.8]}], +[{"op":"add","path":"/core/5/1/-","value":["platinum",0.8]}], //sulphur [{"op":"add","path":"/surface/0/1/-","value":["sulphur",0.7]}], @@ -67,23 +79,21 @@ [{"op":"add","path":"/depth3/4/1/-","value":["lead",0.7]}], [{"op":"add","path":"/depth3/5/1/-","value":["lead",0.7]}], - -[{"op":"add","path":"/core/1/1/-","value":["platinum",1]}], -[{"op":"add","path":"/core/2/1/-","value":["platinum",0.8]}], - +//diamonds [{"op":"add","path":"/core/0/1/-","value":["diamond",0.5]}], -[{"op":"add","path":"/core/1/1/-","value":["diamond",0.5]}], -[{"op":"add","path":"/core/2/1/-","value":["diamond",0.5]}], -[{"op":"add","path":"/core/3/1/-","value":["diamond",0.5]}], -[{"op":"add","path":"/core/4/1/-","value":["diamond",0.5]}], -[{"op":"add","path":"/core/5/1/-","value":["diamond",0.5]}], [{"op":"add","path":"/core/0/1/-","value":["diamond",0.5]}], [{"op":"add","path":"/core/1/1/-","value":["diamond",0.5]}], +[{"op":"add","path":"/core/1/1/-","value":["diamond",0.5]}], +[{"op":"add","path":"/core/2/1/-","value":["diamond",0.5]}], [{"op":"add","path":"/core/2/1/-","value":["diamond",0.5]}], [{"op":"add","path":"/core/3/1/-","value":["diamond",0.5]}], +[{"op":"add","path":"/core/3/1/-","value":["diamond",0.5]}], [{"op":"add","path":"/core/4/1/-","value":["diamond",0.5]}], +[{"op":"add","path":"/core/4/1/-","value":["diamond",0.5]}], +[{"op":"add","path":"/core/5/1/-","value":["diamond",0.5]}], [{"op":"add","path":"/core/5/1/-","value":["diamond",0.5]}], + //rubium [{"op":"add","path":"/depth1/4/1/-","value":["sb_rubium",0.75]}], [{"op":"add","path":"/depth1/5/1/-","value":["sb_rubium",0.60]}], @@ -92,8 +102,6 @@ [{"op":"add","path":"/depth3/4/1/-","value":["sb_rubium",1]}], [{"op":"add","path":"/depth3/5/1/-","value":["sb_rubium",0.80]}], -[{"op":"add","path":"/depth3/5/1/-","value":["sb_cerulium",0.80]}], - [{"op":"add","path":"/core/4/1/-","value":["sb_rubium",1]}], [{"op":"add","path":"/core/5/1/-","value":["sb_rubium",0.80]}], [{"op":"add","path":"/core/5/1/-","value":["sb_cerulium",0.80]}], @@ -101,13 +109,16 @@ [{"op":"add","path":"/moon/0/1/-","value":["plutonium",0.50]}], [{"op":"add","path":"/moon/0/1/-","value":["moonstone",0.60]}], +//cerulium +[{"op":"add","path":"/depth3/5/1/-","value":["sb_cerulium",0.80]}], + //asteroid [{"op":"add","path":"/asteroid/0/1/-","value":["coal",0.85]}], [{"op":"add","path":"/asteroid/0/1/-","value":["diamond",0.35]}], [{"op":"add","path":"/asteroid/0/1/-","value":["iron",0.35]}], [{"op":"add","path":"/asteroid/0/1/-","value":["plutonium",0.35]}], - +//fossils [{"op":"add","path":"/surface/2/1/-","value":["sb_fossil",0.50]}], [{"op":"add","path":"/surface/3/1/-","value":["sb_fossil",0.50]}], [{"op":"add","path":"/depth2/2/1/-","value":["sb_fossil",0.50]}], diff --git a/biomes/sb_oredistributions.configfunctions b/biomes/sb_oredistributions.configfunctions index f9e9ee5b..bc419361 100644 --- a/biomes/sb_oredistributions.configfunctions +++ b/biomes/sb_oredistributions.configfunctions @@ -1,19 +1,28 @@ { - "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]]], - [3.5,[["coal",0.90],["uranium",0.35],["plutonium",0.00],["solarium",0.00],["copper",0.60],["silver",0.30],["gold",0.15],["platinum",0.15],["diamond",0.10],["titanium",0.15]]], - [4.5,[["coal",0.90],["uranium",0.45],["plutonium",0.45],["solarium",0.00],["copper",0.60],["silver",0.40],["gold",0.20],["platinum",0.20],["diamond",0.15],["aegisalt",0.45],["sb_rubium",0.45]]], - [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_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]]], + [3.5,[["coal",0.90],["uranium",0.35],["plutonium",0.00],["solarium",0.00],["copper",0.60],["silver",0.30],["gold",0.15],["platinum",0.15],["diamond",0.10],["titanium",0.15]]], + [4.5,[["coal",0.90],["uranium",0.45],["plutonium",0.45],["solarium",0.00],["copper",0.60],["silver",0.40],["gold",0.20],["platinum",0.20],["diamond",0.15],["aegisalt",0.45],["sb_rubium",0.45]]], + [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" : [ - [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]]], - [3.5,[["crystal",1],["coal",0.90],["copper",0.75],["silver",0.90],["gold",0.60],["iron",0.00],["tungsten",0.00],["titanium",0.65],["durasteel",0.90],["aegisalt",0.00],["ferozium",0.00],["violium",0.00],["solarium",0.00]]], - [4.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.65],["aegisalt",0.90],["ferozium",0.90],["violium",0.90],["solarium",0.00],["sb_rubium",0.75]]], - [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_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]]], + [3.5,[["crystal",1],["coal",0.90],["copper",0.75],["silver",0.90],["gold",0.60],["iron",0.00],["tungsten",0.00],["titanium",0.65],["durasteel",0.90],["aegisalt",0.00],["ferozium",0.00],["violium",0.00],["solarium",0.00]]], + [4.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.65],["aegisalt",0.90],["ferozium",0.90],["violium",0.90],["solarium",0.00],["sb_rubium",0.75]]], + [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" :[ + [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]]], + [3.5,[["sulphur",1],["coal",0.9],["copper",0],["silver",0.75],["gold",0.9],["diamond",0.1],["corefragment",0],["iron",0],["tungsten",0],["titanium",0.8],["durasteel",1],["aegisalt",0],["ferozium",0],["violium",0],["solarium",0],["sulphur",0.7],["lead",0.7]]], + [4.5,[["sulphur",1],["coal",0.9],["copper",0],["silver",0.75],["gold",0.9],["diamond",0.1],["corefragment",0],["iron",0],["tungsten",0],["titanium",0],["durasteel",0.8],["aegisalt",1],["ferozium",1],["violium",1],["solarium",0],["sulphur",0.7],["lead",0.7],["sb_rubium",1]]], + [5.5,[["sulphur",1],["coal",0.9],["copper",0],["silver",0.75],["gold",0.9],["diamond",0.1],["corefragment",0],["iron",0],["tungsten",0],["titanium",0],["durasteel",0],["aegisalt",0.8],["ferozium",0.8],["violium",0.8],["solarium",1],["sulphur",0.7],["lead",0.7],["sb_rubium",0.8],["sb_cerulium",0.8]]] + ] } \ No newline at end of file diff --git a/biomes/surface/desert.biome.patch b/biomes/surface/desert.biome.patch index 7ec733df..3ca7ae43 100644 --- a/biomes/surface/desert.biome.patch +++ b/biomes/surface/desert.biome.patch @@ -16,5 +16,43 @@ "type":"microdungeon", "microdungeons":["sb_glitchencounter","sb_randomencounter","sb_miniboss"]} } + ], + [ + {"op":"add","path":"/surfacePlaceables/items/-","value":{ + "mode":"floor", + "priority":2, + "variants":2, + "distribution": "/biomes/distributions.config:scatteredLarge", + "type":"bush", + "bushes":[ + {"name":"cactus1","baseHueShiftMax":0,"modHueShiftMax":0}, + {"name":"cactus2","baseHueShiftMax":0,"modHueShiftMax":0} + ]} + } + ], + [ + {"op":"add","path":"/surfacePlaceables/items/-","value":{ + "mode":"floor", + "priority":2, + "variants":1, + "distribution": "/biomes/distributions.config:scatteredLarge", + "type":"bush", + "bushes":[ + {"name":"desertrocks","baseHueShiftMax":0,"modHueShiftMax":0} + ]} + } + ], + [ + {"op":"add","path":"/undergroundPlaceables/items/-","value":{ //Yes, this works, albeit rarely. + "mode":"floor", + "priority":2, + "variants":2, + "distribution": "/biomes/distributions.config:denseMedium", + "type":"bush", + "bushes":[ + {"name":"ceilingdesertrocks","baseHueShiftMax":0,"modHueShiftMax":0}, + {"name":"ceilingdesertrocks2","baseHueShiftMax":0,"modHueShiftMax":0} + ]} + } ] ] \ No newline at end of file diff --git a/biomes/surface/forest.biome.patch b/biomes/surface/forest.biome.patch index 87ee2ced..4fbbe36c 100644 --- a/biomes/surface/forest.biome.patch +++ b/biomes/surface/forest.biome.patch @@ -1,23 +1,64 @@ [ - [ - {"op":"test","path":"/undergroundPlaceables/items"}, - {"op":"add","path":"/undergroundPlaceables/items/-","value":{"mode":"floor","priority":0,"variants":1,"distribution":"/biomes/distributions.config:undergroundweaponChests","type":"treasureBox","treasureBoxSets":["sb_gunChest"]}} + [{ + "op": "test", + "path": "/undergroundPlaceables/items" + }, { + "op": "add", + "path": "/undergroundPlaceables/items/-", + "value": { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:undergroundweaponChests", + "type": "treasureBox", + "treasureBoxSets": ["sb_gunChest"] + } + } ], - [ - {"op":"add","path":"/musicTrack/night/tracks/-","value":"/music/sb_forest-exploration1.ogg"}, - {"op":"add","path":"/musicTrack/night/tracks/-","value":"/music/sb_forest-exploration2.ogg"}, - {"op":"add","path":"/musicTrack/day/tracks/-","value":"/music/forest-loop.ogg"} + [{ + "op": "add", + "path": "/musicTrack/night/tracks/-", + "value": "/music/sb_forest-exploration1.ogg" + }, { + "op": "add", + "path": "/musicTrack/night/tracks/-", + "value": "/music/sb_forest-exploration2.ogg" + }, { + "op": "add", + "path": "/musicTrack/day/tracks/-", + "value": "/music/forest-loop.ogg" + } ], - [ - {"op":"add","path":"/surfacePlaceables/items/-","value":{ - "mode":"floor", - "priority":1, - "variants":1, - "distribution":"/biomes/distributions.config:mainBiomeEncounterDungeon", - "type":"microdungeon", - "microdungeons":["sb_glitchencounter","sb_randomencounter","sb_miniboss"]} - } + [{ + "op": "add", + "path": "/surfacePlaceables/items/-", + "value": { + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:mainBiomeEncounterDungeon", + "type": "microdungeon", + "microdungeons": ["sb_glitchencounter", "sb_randomencounter", "sb_miniboss"] + } + } + ], + + [{ + "op": "add", + "path": "/surfacePlaceables/items/-", + "value": { + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", + "type": "tree", + "treeFoliageHueShiftMax" : 180, + "treeStemHueShiftMax" : 15, + "treeStemList": ["wood"], + "treeFoliageList": ["greenleaves"] + } + } ] -] \ No newline at end of file +] diff --git a/biomes/surface/savannah.biome.patch b/biomes/surface/savannah.biome.patch index ee6d1c1e..90ab263a 100644 --- a/biomes/surface/savannah.biome.patch +++ b/biomes/surface/savannah.biome.patch @@ -20,5 +20,16 @@ "type":"microdungeon", "microdungeons":["sb_glitchencounter","sb_randomencounter","sb_miniboss"]} } + ], + + [ + {"op":"add","path":"/surfacePlaceables/items/-","value":{ + "mode":"floor", + "priority":2, + "variants":1, + "distribution" : "/biomes/distributions.config:scatteredLarge", + "type":"bush", + "bushes":[{"name":"aridskeleton","baseHueShiftMax":0,"modHueShiftMax":0}]} + } ] ] \ No newline at end of file diff --git a/biomes/surface_detached/bones.biome.patch b/biomes/surface_detached/bones.biome.patch new file mode 100644 index 00000000..2373bdad --- /dev/null +++ b/biomes/surface_detached/bones.biome.patch @@ -0,0 +1,14 @@ +[ + [{ + "op": "add", + "path": "/spawnProfile/groups/-", + "value": { + "select": 1, + "pool": [ + [1, "sb_bonebird"] + ] + } + + } + ] +] diff --git a/biomes/surface_detached/swamp.biome.patch b/biomes/surface_detached/swamp.biome.patch new file mode 100644 index 00000000..06af8d78 --- /dev/null +++ b/biomes/surface_detached/swamp.biome.patch @@ -0,0 +1,16 @@ +[ + [ + {"op":"add","path":"/surfacePlaceables/items/-","value":{ + "mode":"floor", + "priority":2, + "variants":3, + "distribution" : "/biomes/distributions.config:scatteredLarge", + "type":"bush", + "bushes":[ + {"name":"swampbush","baseHueShiftMax":0,"modHueShiftMax":0}, + {"name":"swampplant","baseHueShiftMax":0,"modHueShiftMax":0}, + {"name":"swampshrub","baseHueShiftMax":0,"modHueShiftMax":0} + ]} + } + ] +] \ No newline at end of file diff --git a/biomes/underground_detached/bonecaves.biome.patch b/biomes/underground_detached/bonecaves.biome.patch new file mode 100644 index 00000000..868ba00d --- /dev/null +++ b/biomes/underground_detached/bonecaves.biome.patch @@ -0,0 +1,20 @@ +[ + [{ + "op": "add", + "path": "/subBlocks/-", + "value": "ash" + } + ], + [{ + "op": "add", + "path": "/spawnProfile/groups/-", + "value": { + "select": 1, + "pool": [ + [1, "sb_bonebird"] + ] + } + + } + ] +] diff --git a/biomes/underground_detached/sb_crystalcave.biome b/biomes/underground_detached/sb_crystalcave.biome index b86268d3..f55348aa 100644 --- a/biomes/underground_detached/sb_crystalcave.biome +++ b/biomes/underground_detached/sb_crystalcave.biome @@ -1,113 +1,134 @@ { - "name" : "sb_crystalcave", - "friendlyName" : "Crystal Cave", + "name": "sb_crystalcave", + "friendlyName": "Crystal Cave", //No fish because lava - "spawnProfile" : { - "groups" : [ - { - "select" : 4, - "pool" : [ - [ 0.5, "sb_passiveSmallBiped" ], - [ 0.5, "sb_aggroSmallQuadruped" ], - [ 0.5, "sb_aggroSmallBiped" ], - [ 0.5, "sb_passiveSmallQuadruped" ], - [ 1, "sb_aggroLargeQuadruped" ] - ] + "spawnProfile": { + "monsterParameters": { + "statusSettings": { + "stats": { + "lavaImmunity": { + "baseValue": 1 + }, + "fireStatusImmunity": { + "baseValue": 1 + } + } + } + }, + "groups": [{ + "select": 4, + "pool": [ + [0.5, "sb_passiveSmallBiped"], + [0.5, "sb_aggroSmallQuadruped"], + [0.5, "sb_aggroSmallBiped"], + [0.5, "sb_passiveSmallQuadruped"], + [1, "sb_aggroLargeQuadruped"] + ] } ] }, - "mainBlock" : "rock14", - "subBlocks" : ["obsidian", "rock02"], - "ores" : "sb_crystalDepth2", - "parallax" : "/parallax/underground/sb_crystalcave.parallax", - "hueShiftOptions" : [0], + "mainBlock": "rock14", + "subBlocks": ["obsidian", "rock02"], + "ores": "sb_crystalDepth2", + "parallax": "/parallax/underground/sb_crystalcave.parallax", + "hueShiftOptions": [0], - "sky" : { - "topColor" : [182, 204, 255], - "bottomColor" : [224, 239, 255], - "nightTopColor" : [0, 0, 30], - "nightBottomColor" : [0, 0, 0] + "sky": { + "topColor": [182, 204, 255], + "bottomColor": [224, 239, 255], + "nightTopColor": [0, 0, 30], + "nightBottomColor": [0, 0, 0] }, - "ambientNoises" : { - "day" : { - "tracks" : ["/sfx/environmental/crystal_underground.ogg"] + "ambientNoises": { + "day": { + "tracks": ["/sfx/environmental/crystal_underground.ogg"] }, - "night" : { - "tracks" : ["/sfx/environmental/crystal_underground.ogg"] + "night": { + "tracks": ["/sfx/environmental/crystal_underground.ogg"] } }, - "musicTrack" : { - "day" : { - "tracks" : [ "/music/epsilon-indi.ogg", "/music/hymn-to-the-stars.ogg", "/music/procyon.ogg", "/music/stellarformation.ogg", "/music/vast-immortal-suns.ogg", "/music/atlas.ogg", "/music/blue-straggler.ogg", "/music/cygnus-x1.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/m54.ogg", "/music/on-the-beach-at-night.ogg","/music/sb_underground.ogg","/music/sb_via-aurora.ogg","/music/crystal-exploration1.ogg","/music/crystal-exploration2.ogg" ] + "musicTrack": { + "day": { + "tracks": ["/music/epsilon-indi.ogg", "/music/hymn-to-the-stars.ogg", "/music/procyon.ogg", "/music/stellarformation.ogg", "/music/vast-immortal-suns.ogg", "/music/atlas.ogg", "/music/blue-straggler.ogg", "/music/cygnus-x1.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/m54.ogg", "/music/on-the-beach-at-night.ogg", "/music/sb_underground.ogg", "/music/sb_via-aurora.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg"] }, - "night" : { - "tracks" : [ "/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/m54.ogg", "/music/nomads.ogg", "/music/on-the-beach-at-night.ogg","/music/sb_underground.ogg","/music/sb_via-aurora.ogg","/music/crystal-exploration1.ogg","/music/crystal-exploration2.ogg" ] + "night": { + "tracks": ["/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/m54.ogg", "/music/nomads.ogg", "/music/on-the-beach-at-night.ogg", "/music/sb_underground.ogg", "/music/sb_via-aurora.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg"] } }, - "surfacePlaceables" : { - "grassMod" : [ "crystalgrass" ], - "grassModDensity" : 0.9, - "items" : [ - { - "mode" : "floor", - "priority" : 4, - "variants" : 1, - "distribution" : "/biomes/distributions.config:potsRare", + "surfacePlaceables": { + "grassMod": ["crystalgrass"], + "grassModDensity": 0.9, + "items": [{ + "mode": "floor", + "priority": 4, + "variants": 1, + "distribution": "/biomes/distributions.config:potsRare", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [1, "wildcrystalplantseed" ] ], - "parameters" : { "startingStage" : 2 } + "type": "object", + "objectSets": [{ + "pool": [[1, "wildcrystalplantseed"]], + "parameters": { + "startingStage": 2 + } } ] } ] }, - "undergroundPlaceables" : { - "grassMod" : [ "crystalgrass" ], - "grassModDensity" : 0.9, - "items" : [ - { - "mode" : "floor", - "priority" : 4, - "variants" : 1, - "distribution" : "/biomes/distributions.config:potsRare", + "undergroundPlaceables": { + "grassMod": ["crystalgrass"], + "grassModDensity": 0.9, + "items": [{ + "mode": "floor", + "priority": 4, + "variants": 1, + "distribution": "/biomes/distributions.config:potsRare", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [1, "wildcrystalplantseed" ] ], - "parameters" : { "startingStage" : 2 } + "type": "object", + "objectSets": [{ + "pool": [[1, "wildcrystalplantseed"]], + "parameters": { + "startingStage": 2 + } } ] - }, - { - "mode" : "floor", - "priority" : 0.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:minibiomeChests", + }, { + "mode": "floor", + "priority": 0.0, + "variants": 1, + "distribution": "/biomes/distributions.config:minibiomeChests", - "type" : "treasureBox", - "treasureBoxSets" : [ "crystalChest" ] - }, - { - "mode" : "floor", - "priority" : 0.0, - "variants" : 4, - "distribution" : "/biomes/distributions.config:scatteredLarge", + "type": "treasureBox", + "treasureBoxSets": ["crystalChest"] + }, { + "mode": "floor", + "priority": 0.0, + "variants": 4, + "distribution": "/biomes/distributions.config:scatteredLarge", + + "type": "object", + "objectSets": [{ + "pool": [[0.35, "crystalcavebush1"], [0.35, "crystalcavebush2"], [0.35, "crystalcavebush3"], [0.35, "crystalcavebush4"], [0.35, "pillar1"], [0.35, "pillar2"], [0.35, "wormstatue"], [0.35, "altar1"]], + "parameters": {} + } + ] + }, { + "mode": "floor", + "priority": 2, + "variants": 1, + "distribution": "/biomes/distributions.config:scatteredLarge", - "type" : "object", - "objectSets" : [ - { - "pool" : [ [0.35, "crystalcavebush1" ], [0.35, "crystalcavebush2" ], [0.35, "crystalcavebush3" ], [0.35, "crystalcavebush4" ], [0.35, "pillar1" ], [0.35, "pillar2" ], [0.35, "wormstatue" ], [0.35, "altar1" ] ], - "parameters" : { } + "type": "bush", + "bushes": [{ + "name": "crystals", + "baseHueShiftMax": 0, + "modHueShiftMax": 0 } ] } diff --git a/biomes/underground_detached/sb_heck.biome b/biomes/underground_detached/sb_heck.biome index 90933de4..b39064fe 100644 --- a/biomes/underground_detached/sb_heck.biome +++ b/biomes/underground_detached/sb_heck.biome @@ -1,166 +1,166 @@ { - "name" : "sb_heck", - "friendlyName" : "Heck", - "description" : "A Heck biome.", //this string appears in biome data when dumping worlds - - "spawnProfile" : { - "groups" : [ - { - "select" : 1, - "pool" : [ - [ 1.0, "sb_heckblob" ] - ] + "name": "sb_heck", + "friendlyName": "Heck", + "description": "A Heck biome.", //this string appears in biome data when dumping worlds + + "spawnProfile": { + "groups": [{ + "select": 1, + "pool": [ + [1.0, "sb_heckblob"] + ] } ] }, - "mainBlock" : "hellstone", - "subBlocks" : [ "sb_brains", "rock04" ], - "ores" : "depth2", - "parallax" : "/parallax/underground/sb_heck.parallax", - "hueShiftOptions" : [0], - - "sky" : { - "topColor" : [182, 204, 255], - "bottomColor" : [224, 239, 255], - "nightTopColor" : [0, 0, 30], - "nightBottomColor" : [0, 0, 0] + "mainBlock": "hellstone", + "subBlocks": ["sb_brains", "rock04"], + "ores": "depth2", + "parallax": "/parallax/underground/sb_heck.parallax", + "hueShiftOptions": [0], + + "sky": { + "topColor": [182, 204, 255], + "bottomColor": [224, 239, 255], + "nightTopColor": [0, 0, 30], + "nightBottomColor": [0, 0, 0] }, - "ambientNoises" : { - "day" : { - "tracks" : [ "/sfx/environmental/arid_underground.ogg","/sfx/environmental/tentacle_loop2.ogg","/sfx/environmental/aviantemple.ogg" ] + "ambientNoises": { + "day": { + "tracks": ["/sfx/environmental/arid_underground.ogg", "/sfx/environmental/tentacle_loop2.ogg", "/sfx/environmental/aviantemple.ogg"] }, - "night" : { - "tracks" : [ "/sfx/environmental/arid_underground.ogg","/sfx/environmental/tentacle_loop2.ogg","/sfx/environmental/aviantemple.ogg.ogg" ] + "night": { + "tracks": ["/sfx/environmental/arid_underground.ogg", "/sfx/environmental/tentacle_loop2.ogg", "/sfx/environmental/aviantemple.ogg.ogg"] } }, - "musicTrack" : { - "day" : { - "tracks" : [ "/music/epsilon-indi.ogg", "/music/hymn-to-the-stars.ogg", "/music/procyon.ogg", "/music/stellarformation.ogg", "/music/vast-immortal-suns.ogg", "/music/atlas.ogg", "/music/blue-straggler.ogg", "/music/cygnus-x1.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/m54.ogg", "/music/on-the-beach-at-night.ogg","/music/sb_underground.ogg","/music/sb_via-aurora.ogg" ] + "musicTrack": { + "day": { + "tracks": ["/music/epsilon-indi.ogg", "/music/hymn-to-the-stars.ogg", "/music/procyon.ogg", "/music/stellarformation.ogg", "/music/vast-immortal-suns.ogg", "/music/atlas.ogg", "/music/blue-straggler.ogg", "/music/cygnus-x1.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/m54.ogg", "/music/on-the-beach-at-night.ogg", "/music/sb_underground.ogg", "/music/sb_via-aurora.ogg"] }, - "night" : { - "tracks" : [ "/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/m54.ogg", "/music/nomads.ogg", "/music/on-the-beach-at-night.ogg","/music/sb_underground.ogg","/music/sb_via-aurora.ogg" ] + "night": { + "tracks": ["/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/m54.ogg", "/music/nomads.ogg", "/music/on-the-beach-at-night.ogg", "/music/sb_underground.ogg", "/music/sb_via-aurora.ogg"] } }, - - "surfacePlaceables" : { - "grassMod" : [ "heckgrass" ], - "grassModDensity" : 0.1, - - "items" : [ - { - "mode" : "floor", - "priority" : 0.1, - "variants" : 11, - "distribution" : "/biomes/distributions.config:denseSmall", - - "type" : "object", - "objectSets" : [ - { - "pool" : [ - [0.35, "sb_heckbush1" ], - [0.35, "sb_heckbush2" ], - [0.35, "sb_heckbush3" ], - [0.35, "sb_heckbush4" ], - [0.35, "sb_heckbush5" ], - [0.35, "sb_heckbush6" ], - [0.35, "sb_heckbush7" ], - [0.35, "sb_heckbush8" ], - [0.35, "sb_heckbush9" ], - [0.35, "sb_heckbush10" ], - - [0.35, "sb_hecklight1" ], - [0.35, "sb_hecklight2" ] - ], - "parameters" : { } - } - ] - }, - { - "mode" : "floor", - "priority" : 4.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:denseLarge", - - "type" : "grass", - "grasses" : [ "heckflower" ] + "surfacePlaceables": { + "grassMod": ["heckgrass"], + "grassModDensity": 0.1, + + "items": [{ + "mode": "floor", + "priority": 0.1, + "variants": 11, + "distribution": "/biomes/distributions.config:denseSmall", + + "type": "object", + "objectSets": [{ + "pool": [ + [0.35, "sb_heckbush1"], + [0.35, "sb_heckbush2"], + [0.35, "sb_heckbush3"], + [0.35, "sb_heckbush4"], + [0.35, "sb_heckbush5"], + [0.35, "sb_heckbush6"], + [0.35, "sb_heckbush7"], + [0.35, "sb_heckbush8"], + [0.35, "sb_heckbush9"], + [0.35, "sb_heckbush10"], + + [0.35, "sb_hecklight1"], + [0.35, "sb_hecklight2"] + ], + "parameters": {} + } + ] + }, { + "mode": "floor", + "priority": 4.0, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", + + "type": "grass", + "grasses": ["heckflower"] } ] }, - "undergroundPlaceables" : { - "grassMod" : [ "heckgrass" ], - "grassModDensity" : 0.1, - - "items" : [ - { - "mode" : "floor", - "priority" : 0.1, - "variants" : 11, - "distribution" : "/biomes/distributions.config:denseSmall", - - "type" : "object", - "objectSets" : [ - { - "pool" : [ - [0.35, "sb_heckbush1" ], - [0.35, "sb_heckbush2" ], - [0.35, "sb_heckbush3" ], - [0.35, "sb_heckbush4" ], - [0.35, "sb_heckbush5" ], - [0.35, "sb_heckbush6" ], - [0.35, "sb_heckbush7" ], - [0.35, "sb_heckbush8" ], - [0.35, "sb_heckbush9" ], - [0.35, "sb_heckbush10" ], - - [0.35, "sb_hecklight1" ], - [0.35, "sb_hecklight2" ], - - // [0.35, "sb_heckaltar" ], - [0.35, "woodentalllantern" ], - [0.35, "huntingpike1" ], - [0.35, "huntingpike2" ], - [0.35, "huntingpike3" ], - - [0.35, "sb_heckpillar1" ], - [0.35, "sb_heckpillar2" ], - [0.35, "sb_hecksign" ] - ], - "parameters" : { } - } - ] - }, - { - "mode" : "floor", - "priority" : 4.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:denseLarge", - - "type" : "grass", - "grasses" : [ "heckflower" ] - }, - { - "mode" : "floor", - "priority" : 8.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:rare", - - "type" : "treasureBox", - "treasureBoxSets" : [ "sb_heckChest" ] - }, - { - "mode" : "floor", - "priority" : 8.0, - "variants" : 1, - "distribution" : "/biomes/distributions.config:uncommon", - - "type" : "microdungeon", - "microdungeons" : [ "sb_heckmicrodungeons" ] + "undergroundPlaceables": { + "grassMod": ["heckgrass"], + "grassModDensity": 0.1, + + "items": [{ + "mode": "floor", + "priority": 0.1, + "variants": 11, + "distribution": "/biomes/distributions.config:denseSmall", + + "type": "object", + "objectSets": [{ + "pool": [ + [0.35, "sb_heckbush1"], + [0.35, "sb_heckbush2"], + [0.35, "sb_heckbush3"], + [0.35, "sb_heckbush4"], + [0.35, "sb_heckbush5"], + [0.35, "sb_heckbush6"], + [0.35, "sb_heckbush7"], + [0.35, "sb_heckbush8"], + [0.35, "sb_heckbush9"], + [0.35, "sb_heckbush10"], + + [0.35, "sb_hecklight1"], + [0.35, "sb_hecklight2"], + + // [0.35, "sb_heckaltar" ], + [0.35, "woodentalllantern"], + [0.35, "huntingpike1"], + [0.35, "huntingpike2"], + [0.35, "huntingpike3"], + + [0.35, "sb_heckpillar1"], + [0.35, "sb_heckpillar2"], + [0.35, "sb_hecksign"] + ], + "parameters": {} + } + ] + }, { + "mode": "floor", + "priority": 4.0, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", + + "type": "grass", + "grasses": ["heckflower"] + }, { + "mode": "floor", + "priority": 8.0, + "variants": 1, + "distribution": "/biomes/distributions.config:rare", + + "type": "treasureBox", + "treasureBoxSets": ["sb_heckChest"] + }, { + "mode": "floor", + "priority": 8.0, + "variants": 1, + "distribution": "/biomes/distributions.config:uncommon", + + "type": "microdungeon", + "microdungeons": ["sb_heckmicrodungeons"] + }, { + "mode": "ceiling", + "priority": 2.0, + "variants": 1, + "distribution": "/biomes/distributions.config:denseMedium", + + "type": "tree", + "treeFoliageHueShiftMax": 180, + "treeStemHueShiftMax": 180, + "treeStemList": ["podvine"] } ] } -} \ No newline at end of file +} diff --git a/biomes/underground_detached/sb_sulphur.biome b/biomes/underground_detached/sb_sulphur.biome new file mode 100644 index 00000000..1198c0b3 --- /dev/null +++ b/biomes/underground_detached/sb_sulphur.biome @@ -0,0 +1,106 @@ +{ + "name": "sb_sulphur", + "friendlyName": "Sulphuric", + + //No fish because lava + "spawnProfile": { + "monsterParameters": { + "statusSettings": { + "stats": { + "lavaImmunity": { + "baseValue": 1 + }, + "fireStatusImmunity": { + "baseValue": 1 + } + } + } + }, + "groups": [{ + "select": 4, + "pool": [ + [0.5, "sb_passiveSmallBiped"], + [0.5, "sb_aggroSmallQuadruped"], + [0.5, "sb_aggroSmallBiped"], + [0.5, "sb_passiveSmallQuadruped"], + [1, "sb_aggroLargeQuadruped"] + ] + } + ] + }, + + "mainBlock": "rock12", + "subBlocks": ["ash", "rock14"], + "ores": "sb_sulphurDepth3", + "parallax": "/parallax/underground/sb_sulphur.parallax", + "hueShiftOptions": [0], + + "sky": { + "topColor": [182, 204, 255], + "bottomColor": [224, 239, 255], + "nightTopColor": [0, 0, 30], + "nightBottomColor": [0, 0, 0] + }, + + "ambientNoises": { + "day": { + "tracks": ["/sfx/environmental/volcanic_underground.ogg"] + }, + "night": { + "tracks": ["/sfx/environmental/volcanic_underground.ogg"] + } + }, + + "musicTrack": { + "day": { + "tracks": ["/music/epsilon-indi.ogg", "/music/hymn-to-the-stars.ogg", "/music/procyon.ogg", "/music/stellarformation.ogg", "/music/vast-immortal-suns.ogg", "/music/atlas.ogg", "/music/blue-straggler.ogg", "/music/cygnus-x1.ogg", "/music/europa.ogg", "/music/haiku.ogg", "/music/m54.ogg", "/music/on-the-beach-at-night.ogg", "/music/sb_underground.ogg", "/music/sb_via-aurora.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg"] + }, + "night": { + "tracks": ["/music/jupiter.ogg", "/music/arctic-constellation1.ogg", "/music/arctic-constellation2.ogg", "/music/mercury.ogg", "/music/mira.ogg", "/music/procyon.ogg", "/music/tranquility-base.ogg", "/music/psyche.ogg", "/music/accretion-disc.ogg", "/music/cygnus-x1.ogg", "/music/eridanus-supervoid.ogg", "/music/horsehead-nebula.ogg", "/music/large-magellanic-cloud.ogg", "/music/m54.ogg", "/music/nomads.ogg", "/music/on-the-beach-at-night.ogg", "/music/sb_underground.ogg", "/music/sb_via-aurora.ogg", "/music/crystal-exploration1.ogg", "/music/crystal-exploration2.ogg"] + } + }, + + "surfacePlaceables": { + "grassMod": ["charredgrass", "blackash"], + "grassModDensity": 0.9, + "items": [{ + "mode": "floor", + "priority": 4, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", + "type": "grass", + "grasses": ["sulphurplant"] + } + ] + }, + + "undergroundPlaceables": { + "grassMod": ["charredgrass"], + "grassModDensity": 0.9, + "items": [{ + "mode": "floor", + "priority": 4, + "variants": 1, + "distribution": "/biomes/distributions.config:denseLarge", + "type": "grass", + "grasses": ["sulphurplant"] + }, { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:minibiomeChests", + + "type": "treasureBox", + "treasureBoxSets": ["basicChest"] + }, { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:undergroundweaponChests", + + "type": "treasureBox", + "treasureBoxSets": ["weaponChest", "sb_gunChest"] + } + ] + } +} diff --git a/biomes/underground_detached/slimecaves.biome.patch b/biomes/underground_detached/slimecaves.biome.patch index cdea0247..ddaed5c3 100644 --- a/biomes/underground_detached/slimecaves.biome.patch +++ b/biomes/underground_detached/slimecaves.biome.patch @@ -1,27 +1,41 @@ -[ [ - {"op":"test","path":"/undergroundPlaceables/items"}, - {"op":"add","path":"/undergroundPlaceables/items/-","value":{"mode":"floor","priority":0,"variants":1,"distribution":"/biomes/distributions.config:undergroundweaponChests","type":"treasureBox","treasureBoxSets":["sb_gunChest"]}} +[ + //dont add sewage because the cave liquid isn't poisonous anymore + [{ + "op": "test", + "path": "/undergroundPlaceables/items" + }, { + "op": "add", + "path": "/undergroundPlaceables/items/-", + "value": { + "mode": "floor", + "priority": 0, + "variants": 1, + "distribution": "/biomes/distributions.config:undergroundweaponChests", + "type": "treasureBox", + "treasureBoxSets": ["sb_gunChest"] + } + } ], - [{ - "op": "add", - "path": "/undergroundPlaceables/items/-", - "value": { - "mode": "floor", - "priority": 1, - "variants": 1, - "distribution": "/biomes/distributions.config:undergroundChests", - "type": "object", - "objectSets": [ - { - "pool": [ - [ - 1, - "blueprintblob" - ] - ], - "parameters": {} - } - ] - } - }] -] \ No newline at end of file + [{ + "op": "add", + "path": "/undergroundPlaceables/items/-", + "value": { + "mode": "floor", + "priority": 1, + "variants": 1, + "distribution": "/biomes/distributions.config:undergroundChests", + "type": "object", + "objectSets": [{ + "pool": [ + [ + 1, + "blueprintblob" + ] + ], + "parameters": {} + } + ] + } + } + ] +] diff --git a/celestial/system/terrestrial/biomes/sb_tentacle/maskie1.png b/celestial/system/terrestrial/biomes/sb_tentacle/maskie1.png index 88497c9e..c1a5a9b3 100644 Binary files a/celestial/system/terrestrial/biomes/sb_tentacle/maskie1.png and b/celestial/system/terrestrial/biomes/sb_tentacle/maskie1.png differ diff --git a/celestial/system/terrestrial/biomes/sb_tentacle/maskie2.png b/celestial/system/terrestrial/biomes/sb_tentacle/maskie2.png index 0cbe271f..175fbb0e 100644 Binary files a/celestial/system/terrestrial/biomes/sb_tentacle/maskie2.png and b/celestial/system/terrestrial/biomes/sb_tentacle/maskie2.png differ diff --git a/celestial/system/terrestrial/biomes/sb_tentacle/maskie3.png b/celestial/system/terrestrial/biomes/sb_tentacle/maskie3.png index ef80db16..28796780 100644 Binary files a/celestial/system/terrestrial/biomes/sb_tentacle/maskie3.png and b/celestial/system/terrestrial/biomes/sb_tentacle/maskie3.png differ diff --git a/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_l.png b/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_l.png index dbe881a6..31774ded 100644 Binary files a/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_l.png and b/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_l.png differ diff --git a/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_r.png b/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_r.png index 8e926c4e..ca225cda 100644 Binary files a/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_r.png and b/celestial/system/terrestrial/horizon/liquids/sb_tentaclejuice_r.png differ diff --git a/celestial/system/terrestrial/horizon/textures/sb_tentacle_l.png b/celestial/system/terrestrial/horizon/textures/sb_tentacle_l.png index c6df4676..de13f84f 100644 Binary files a/celestial/system/terrestrial/horizon/textures/sb_tentacle_l.png and b/celestial/system/terrestrial/horizon/textures/sb_tentacle_l.png differ diff --git a/celestial/system/terrestrial/horizon/textures/sb_tentacle_r.png b/celestial/system/terrestrial/horizon/textures/sb_tentacle_r.png index cf9fa815..abc98314 100644 Binary files a/celestial/system/terrestrial/horizon/textures/sb_tentacle_r.png and b/celestial/system/terrestrial/horizon/textures/sb_tentacle_r.png differ diff --git a/celestial/system/terrestrial/liquids/sb_tentaclejuice.png b/celestial/system/terrestrial/liquids/sb_tentaclejuice.png index 7c8cfdee..4ee25147 100644 Binary files a/celestial/system/terrestrial/liquids/sb_tentaclejuice.png and b/celestial/system/terrestrial/liquids/sb_tentaclejuice.png differ diff --git a/cinematics/sb_busy5.frames b/cinematics/busy3.frames similarity index 100% rename from cinematics/sb_busy5.frames rename to cinematics/busy3.frames diff --git a/cinematics/loading.cinematic.patch b/cinematics/loading.cinematic.patch index a4ea467a..710a05cb 100644 --- a/cinematics/loading.cinematic.patch +++ b/cinematics/loading.cinematic.patch @@ -1,3 +1,4 @@ +//Unfortunately we can't replace busy3 with its vanilla counterpart (using directives to replace the black background with a black border) because the top corners of the wings aren't suppose to be rounded [ [{ "op": "add", @@ -26,10 +27,7 @@ "keyframes": [{ "timecode": 0, "alpha": 0, - "position": [ - 480, - 220 - ], + "position": [480,220], "zoom": 1, "frame": 0 }, { @@ -58,10 +56,7 @@ "keyframes": [{ "timecode": 0, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -91,7 +86,7 @@ "path": "/panels/-", "value": { "drawables": [{ - "image": "/cinematics/sb_busy5.png:" + "image": "/cinematics/busy3.png:" } ], "animationFrames": 8, @@ -99,10 +94,7 @@ "keyframes": [{ "timecode": 0, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -134,10 +126,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -161,7 +150,7 @@ "path": "/panels/-", "value": { "drawables": [{ - "image": "/cinematics/sb_busy2.png:" + "image": "/cinematics/busy2.png:" } ], "animationFrames": 8, @@ -169,10 +158,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -195,14 +181,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "Wow, you sure do have a lot of content to load, huh?", + "text": "^shadow;Wow, you sure do have a lot of content to load, huh?", "startTime": 330, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -210,10 +193,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 300, - 130 - ], + "position": [300,130], "zoom": 500, "textPercentage": 0 }, { @@ -227,14 +207,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "This is taking awhile. Maybe you should have a cup of tea?", + "text": "^shadow;This is taking awhile. Maybe you should have a cup of tea?", "startTime": 390, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -242,10 +219,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 280, - 100 - ], + "position": [280,100], "zoom": 500, "textPercentage": 0 }, { @@ -259,14 +233,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "Maybe go for a walk?", + "text": "^shadow;Maybe go for a walk?", "startTime": 500, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -274,10 +245,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 400, - 70 - ], + "position": [400,70], "zoom": 500, "textPercentage": 0 }, { @@ -291,14 +259,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "Don't ask me, I wouldn't know.", + "text": "^shadow;Don't ask me, I wouldn't know.", "startTime": 600, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -306,10 +271,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 365, - 40 - ], + "position": [365,40], "zoom": 500, "textPercentage": 0 }, { diff --git a/cinematics/sb_busy.png b/cinematics/sb_busy.png index 4f204697..63d34aed 100644 Binary files a/cinematics/sb_busy.png and b/cinematics/sb_busy.png differ diff --git a/cinematics/sb_busy2.frames b/cinematics/sb_busy2.frames deleted file mode 100644 index 5c5b4881..00000000 --- a/cinematics/sb_busy2.frames +++ /dev/null @@ -1,6 +0,0 @@ -{ - "frameGrid" : { - "size" : [96, 29], - "dimensions" : [8, 1] - } -} diff --git a/cinematics/sb_busy2.png b/cinematics/sb_busy2.png deleted file mode 100644 index 2ea06048..00000000 Binary files a/cinematics/sb_busy2.png and /dev/null differ diff --git a/cinematics/sb_busy3.frames b/cinematics/sb_busy3.frames index c7289410..71ab8065 100644 --- a/cinematics/sb_busy3.frames +++ b/cinematics/sb_busy3.frames @@ -1,6 +1,6 @@ { - "frameGrid" : { - "size" : [46, 28], - "dimensions" : [29, 1] + "frameGrid": { + "size": [46, 28], + "dimensions": [29, 1] } } diff --git a/cinematics/sb_busy3.png b/cinematics/sb_busy3.png index 7aae0ec3..1bfd6547 100644 Binary files a/cinematics/sb_busy3.png and b/cinematics/sb_busy3.png differ diff --git a/cinematics/sb_busy5.png b/cinematics/sb_busy5.png deleted file mode 100644 index 6830d52b..00000000 Binary files a/cinematics/sb_busy5.png and /dev/null differ diff --git a/cinematics/sb_loading.png b/cinematics/sb_loading.png index a03698ec..353665d4 100644 Binary files a/cinematics/sb_loading.png and b/cinematics/sb_loading.png differ diff --git a/cinematics/sb_upgrade/airf.png b/cinematics/sb_upgrade/airf.png index 4c1b369c..d62b4732 100644 Binary files a/cinematics/sb_upgrade/airf.png and b/cinematics/sb_upgrade/airf.png differ diff --git a/cinematics/sb_upgrade/airless.png b/cinematics/sb_upgrade/airless.png index 207f2e47..99f9fbe4 100644 Binary files a/cinematics/sb_upgrade/airless.png and b/cinematics/sb_upgrade/airless.png differ diff --git a/cinematics/sb_upgrade/airm.png b/cinematics/sb_upgrade/airm.png index 3ff3877e..80a080ec 100644 Binary files a/cinematics/sb_upgrade/airm.png and b/cinematics/sb_upgrade/airm.png differ diff --git a/cinematics/sb_upgrade/coldf.png b/cinematics/sb_upgrade/coldf.png index cbca4769..17b54365 100644 Binary files a/cinematics/sb_upgrade/coldf.png and b/cinematics/sb_upgrade/coldf.png differ diff --git a/cinematics/sb_upgrade/coldness.png b/cinematics/sb_upgrade/coldness.png index 7f796bd9..724b9a1b 100644 Binary files a/cinematics/sb_upgrade/coldness.png and b/cinematics/sb_upgrade/coldness.png differ diff --git a/cinematics/sb_upgrade/coldupgrade.png b/cinematics/sb_upgrade/coldupgrade.png index d1c2ae56..776a5f91 100644 Binary files a/cinematics/sb_upgrade/coldupgrade.png and b/cinematics/sb_upgrade/coldupgrade.png differ diff --git a/cinematics/sb_upgrade/heatf.png b/cinematics/sb_upgrade/heatf.png index 99c12ba1..bd315c66 100644 Binary files a/cinematics/sb_upgrade/heatf.png and b/cinematics/sb_upgrade/heatf.png differ diff --git a/cinematics/sb_upgrade/heatm.currency b/cinematics/sb_upgrade/heatm.currency index a5f09ba3..a91e3f79 100644 --- a/cinematics/sb_upgrade/heatm.currency +++ b/cinematics/sb_upgrade/heatm.currency @@ -1,11 +1,11 @@ { - "itemName" : "sb_cinema_heatm", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "cinematicOnPickup" : "/cinematics/sb_upgrade/heatm.cinematic", - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_cinema_heatm", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "cinematicOnPickup": "/cinematics/sb_upgrade/heatm.cinematic", + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/cinematics/sb_upgrade/heatm.png b/cinematics/sb_upgrade/heatm.png index 65bf2c97..3048f089 100644 Binary files a/cinematics/sb_upgrade/heatm.png and b/cinematics/sb_upgrade/heatm.png differ diff --git a/cinematics/sb_upgrade/heatupgrade.png b/cinematics/sb_upgrade/heatupgrade.png index eeba3a56..b56a0d25 100644 Binary files a/cinematics/sb_upgrade/heatupgrade.png and b/cinematics/sb_upgrade/heatupgrade.png differ diff --git a/cinematics/sb_upgrade/hotness.png b/cinematics/sb_upgrade/hotness.png index 49c78976..647b150d 100644 Binary files a/cinematics/sb_upgrade/hotness.png and b/cinematics/sb_upgrade/hotness.png differ diff --git a/cinematics/sb_upgrade/radf.png b/cinematics/sb_upgrade/radf.png index c5ecbac0..d1254b81 100644 Binary files a/cinematics/sb_upgrade/radf.png and b/cinematics/sb_upgrade/radf.png differ diff --git a/cinematics/sb_upgrade/radiationupgrade.png b/cinematics/sb_upgrade/radiationupgrade.png index 15c4760b..c156cfe6 100644 Binary files a/cinematics/sb_upgrade/radiationupgrade.png and b/cinematics/sb_upgrade/radiationupgrade.png differ diff --git a/cinematics/sb_upgrade/radioness.png b/cinematics/sb_upgrade/radioness.png index d7ca99e3..c4555a43 100644 Binary files a/cinematics/sb_upgrade/radioness.png and b/cinematics/sb_upgrade/radioness.png differ diff --git a/cinematics/sb_upgrade/radm.png b/cinematics/sb_upgrade/radm.png index 0a43a61a..ea202f25 100644 Binary files a/cinematics/sb_upgrade/radm.png and b/cinematics/sb_upgrade/radm.png differ diff --git a/cinematics/sb_upgrade/respiratoryupgrade.png b/cinematics/sb_upgrade/respiratoryupgrade.png index 9c8deaec..1cdbbf06 100644 Binary files a/cinematics/sb_upgrade/respiratoryupgrade.png and b/cinematics/sb_upgrade/respiratoryupgrade.png differ diff --git a/cinematics/splash.cinematic.patch b/cinematics/splash.cinematic.patch index 58462ca1..846beb32 100644 --- a/cinematics/splash.cinematic.patch +++ b/cinematics/splash.cinematic.patch @@ -13,6 +13,9 @@ "op": "test", "path": "/betabound:skip", "inverse": true + }, { + "op": "test", + "path": "/audio/0" //This game is cursed. Ok so 1772263578 causes infinite loading unless we do this }, { "op": "add", "path": "/panels/-", @@ -26,10 +29,7 @@ "keyframes": [{ "timecode": 0, "alpha": 0, - "position": [ - 480, - 220 - ], + "position": [480,220], "zoom": 1, "frame": 0 }, { @@ -58,10 +58,7 @@ "keyframes": [{ "timecode": 0, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -91,7 +88,7 @@ "path": "/panels/-", "value": { "drawables": [{ - "image": "/cinematics/sb_busy5.png:" + "image": "/cinematics/busy3.png:" } ], "animationFrames": 8, @@ -99,10 +96,7 @@ "keyframes": [{ "timecode": 0, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -134,10 +128,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -161,7 +152,7 @@ "path": "/panels/-", "value": { "drawables": [{ - "image": "/cinematics/sb_busy2.png:" + "image": "/cinematics/busy2.png:" } ], "animationFrames": 8, @@ -169,10 +160,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 480, - 270 - ], + "position": [480,270], "zoom": 1, "frame": 0 }, { @@ -195,14 +183,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "Wow, you sure do have a lot of content to load, huh?", + "text": "^shadow;Wow, you sure do have a lot of content to load, huh?", "startTime": 334, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -210,10 +195,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 300, - 130 - ], + "position": [300,130], "zoom": 500, "textPercentage": 0 }, { @@ -227,14 +209,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "This is taking awhile. Maybe you should have a cup of tea?", + "text": "^shadow;This is taking awhile. Maybe you should have a cup of tea?", "startTime": 394, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -259,14 +238,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "Maybe go for a walk?", + "text": "^shadow;Maybe go for a walk?", "startTime": 504, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -274,10 +250,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 400, - 70 - ], + "position": [400,70], "zoom": 500, "textPercentage": 0 }, { @@ -291,14 +264,11 @@ "op": "add", "path": "/panels/-", "value": { - "text": "Don't ask me, I wouldn't know.", + "text": "^shadow;Don't ask me, I wouldn't know.", "startTime": 604, "fontSize": 14, "textPosition": { - "position": [ - 0, - 0 - ], + "position": [0,0], "hAnchor": "mid", "vAnchor": "mid", "wrapWidth": 500 @@ -306,10 +276,7 @@ "keyframes": [{ "timecode": 0.5, "alpha": 0, - "position": [ - 365, - 40 - ], + "position": [365,40], "zoom": 500, "textPercentage": 0 }, { diff --git a/codex/sb_aviantombbook.png b/codex/sb_aviantombbook.png index f0c5b15c..8372c923 100644 Binary files a/codex/sb_aviantombbook.png and b/codex/sb_aviantombbook.png differ diff --git a/codex/sb_bosses/bossbook.png b/codex/sb_bosses/bossbook.png index df52b840..6511cb4f 100644 Binary files a/codex/sb_bosses/bossbook.png and b/codex/sb_bosses/bossbook.png differ diff --git a/codex/sb_floranhuntinggroundsbook.png b/codex/sb_floranhuntinggroundsbook.png index 29cb75a9..a28cfee2 100644 Binary files a/codex/sb_floranhuntinggroundsbook.png and b/codex/sb_floranhuntinggroundsbook.png differ diff --git a/codex/sb_floranmission.png b/codex/sb_floranmission.png index dbdeaecc..9a74decb 100644 Binary files a/codex/sb_floranmission.png and b/codex/sb_floranmission.png differ diff --git a/codex/sb_floranvillagebook.png b/codex/sb_floranvillagebook.png index 16fb7aca..cc9b8c61 100644 Binary files a/codex/sb_floranvillagebook.png and b/codex/sb_floranvillagebook.png differ diff --git a/codex/sb_glitchsewerbook.png b/codex/sb_glitchsewerbook.png index 08eb6e92..3eb68a02 100644 Binary files a/codex/sb_glitchsewerbook.png and b/codex/sb_glitchsewerbook.png differ diff --git a/codex/sb_gun.png b/codex/sb_gun.png new file mode 100644 index 00000000..1ea1c911 Binary files /dev/null and b/codex/sb_gun.png differ diff --git a/codex/sb_gunguide.codex b/codex/sb_gunguide.codex new file mode 100644 index 00000000..0ca74892 --- /dev/null +++ b/codex/sb_gunguide.codex @@ -0,0 +1,19 @@ +{ + "id": "sb_gunguide", + "title": "All About Ammo", + "description": "An informational leaflet about ammunition for guns.", + "icon": "sb_gun.png", + "contentPages": [ + "While most guns solely use energy reserves, certain firearms can still use traditional ammunition. They will plainly state 'This weapon can use ammo'. + * 20% damage boost when using any ammo + * 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" + ], + "itemConfig": { + "rarity": "common", + "tooltipKind": "sb_object", + "price": 25 + } +} diff --git a/codex/sb_humanbunkerbook.png b/codex/sb_humanbunkerbook.png index 06942ec7..c180509d 100644 Binary files a/codex/sb_humanbunkerbook.png and b/codex/sb_humanbunkerbook.png differ diff --git a/codex/sb_shroombook.png b/codex/sb_shroombook.png index 2f0f4794..2c7f9d62 100644 Binary files a/codex/sb_shroombook.png and b/codex/sb_shroombook.png differ diff --git a/collections/cooking.collection.patch b/collections/cooking.collection.patch index be21563c..c5bddeb2 100644 --- a/collections/cooking.collection.patch +++ b/collections/cooking.collection.patch @@ -10,7 +10,6 @@ [{"op":"test","path":"/collectables/pizza","inverse":true},{"op":"add","path":"/collectables/pizza","value":{"order":8,"item":"pizza"}}], [{"op":"add","path":"/collectables/sb_poachedavesmingo","value":{"order":9,"item":"sb_poachedavesmingo"}}], [{"op":"add","path":"/collectables/sb_thespecial","value":{"order":10,"item":"sb_thespecial"}}], -[{"op":"add","path":"/collectables/sb_soup","value":{"order":11,"item":"sb_soup"}}], [{"op":"add","path":"/collectables/sb_vegetablesoup","value":{"order":12,"item":"sb_vegetablesoup"}}], [{"op":"add","path":"/collectables/sb_roastpoultry","value":{"order":36.9,"item":"sb_roastpoultry"}}], diff --git a/collections/sb_music.collection b/collections/sb_music.collection index a7066566..0b3befa3 100644 --- a/collections/sb_music.collection +++ b/collections/sb_music.collection @@ -1,6 +1,6 @@ { "name": "sb_music", - "title": "Portable Radio", + "title": "Radio", "type": "generic", "collectables": { @@ -334,6 +334,10 @@ "title": "Underground", "description": "Toby Fox" }, + "sb_weep-not-my-child": { + "icon": "sb_weep-not-my-child", + "title": "Weep Not, My Child" + }, "jukebox": { "icon": "/sfx/objects/jukebox.ogg", diff --git a/cursors/chair.cursor b/cursors/chair.cursor deleted file mode 100644 index 6bbbc5c8..00000000 --- a/cursors/chair.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:chair"} \ No newline at end of file diff --git a/cursors/chest.cursor b/cursors/chest.cursor deleted file mode 100644 index 1f1ffb54..00000000 --- a/cursors/chest.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:chest"} \ No newline at end of file diff --git a/cursors/door.cursor b/cursors/door.cursor deleted file mode 100644 index be290daf..00000000 --- a/cursors/door.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:door"} \ No newline at end of file diff --git a/cursors/empty.cursor b/cursors/empty.cursor deleted file mode 100644 index 5f18e5bf..00000000 --- a/cursors/empty.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:empty"} \ No newline at end of file diff --git a/cursors/fuel.cursor b/cursors/fuel.cursor deleted file mode 100644 index c68d1705..00000000 --- a/cursors/fuel.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:fuel"} \ No newline at end of file diff --git a/cursors/injector.cursor b/cursors/injector.cursor deleted file mode 100644 index aad8a73d..00000000 --- a/cursors/injector.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:injector"} \ No newline at end of file diff --git a/cursors/key.cursor b/cursors/key.cursor deleted file mode 100644 index deb61254..00000000 --- a/cursors/key.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:key"} \ No newline at end of file diff --git a/cursors/light.cursor b/cursors/light.cursor deleted file mode 100644 index 26e0e6dc..00000000 --- a/cursors/light.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:light"} \ No newline at end of file diff --git a/cursors/music.cursor b/cursors/music.cursor deleted file mode 100644 index 0641ed24..00000000 --- a/cursors/music.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:music"} \ No newline at end of file diff --git a/cursors/resize.cursor b/cursors/resize.cursor deleted file mode 100644 index e66981f3..00000000 --- a/cursors/resize.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:resize"} \ No newline at end of file diff --git a/cursors/sb_cursors.frames b/cursors/sb_cursors.frames deleted file mode 100644 index 347844e1..00000000 --- a/cursors/sb_cursors.frames +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameList" : { - "reticle" : [0, 0, 15, 15], - "injector" : [16, 0, 31, 15], - "pointer" : [32, 0, 47, 15], - "tool" : [48, 0, 63, 15], - "inspect" : [0, 16, 16, 31] - } -} \ No newline at end of file diff --git a/cursors/sb_cursors.png b/cursors/sb_cursors.png deleted file mode 100644 index 3ae2f8bd..00000000 Binary files a/cursors/sb_cursors.png and /dev/null differ diff --git a/cursors/sb_injector.cursor b/cursors/sb_injector.cursor deleted file mode 100644 index 74632c49..00000000 --- a/cursors/sb_injector.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/sb_cursors.png:injector"} \ No newline at end of file diff --git a/cursors/sb_reticle.cursor b/cursors/sb_reticle.cursor deleted file mode 100644 index 03090cc5..00000000 --- a/cursors/sb_reticle.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/sb_cursors.png:reticle"} \ No newline at end of file diff --git a/cursors/sb_tool.cursor b/cursors/sb_tool.cursor deleted file mode 100644 index e04c6b3d..00000000 --- a/cursors/sb_tool.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/sb_cursors.png:tool"} \ No newline at end of file diff --git a/cursors/ship.cursor b/cursors/ship.cursor deleted file mode 100644 index bf26f1ab..00000000 --- a/cursors/ship.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:ship"} \ No newline at end of file diff --git a/cursors/sleep.cursor b/cursors/sleep.cursor deleted file mode 100644 index 86e3a5b1..00000000 --- a/cursors/sleep.cursor +++ /dev/null @@ -1 +0,0 @@ -{"offset":[0,0],"image":"/cursors/cursors.png:sleep"} \ No newline at end of file diff --git a/damage/elementaltypes.config.patch b/damage/elementaltypes.config.patch index 8ebddd08..41b20dc0 100644 --- a/damage/elementaltypes.config.patch +++ b/damage/elementaltypes.config.patch @@ -1,30 +1,17 @@ [ - [{ - "op": "add", - "path": "/sb_frozenburning_fire", - "value": { - "resistanceStat": "fireResistance", - "damageNumberParticles": { - "hit": "sb_frozenburning_firedamagenumber", - "stronghit": "sb_frozenburning_firedamagenumberstrong", - "weakhit": "sb_frozenburning_firedamagenumberweak", - "shieldhit": "sb_frozenburning_firedamagenumber", - "kill": "sb_frozenburning_firedamagenumber" - } - } - }], - [{ - "op": "add", - "path": "/sb_frozenburning_ice", - "value": { - "resistanceStat": "iceResistance", - "damageNumberParticles": { - "hit": "sb_frozenburning_icedamagenumber", - "stronghit": "sb_frozenburning_icedamagenumberstrong", - "weakhit": "sb_frozenburning_icedamagenumberweak", - "shieldhit": "sb_frozenburning_icedamagenumber", - "kill": "sb_frozenburning_icedamagenumber" - } - } - }] -] \ No newline at end of file + [{ + "op": "add", + "path": "/sb_frozenburning", + "value": { + "resistanceStat": "fireResistance", + "damageNumberParticles": { + "hit": "sb_frozenburningdamagenumber", + "stronghit": "sb_frozenburningdamagenumberstrong", + "weakhit": "sb_frozenburningdamagenumberweak", + "shieldhit": "sb_frozenburningdamagenumber", + "kill": "sb_frozenburningdamagenumber" + } + } + } + ] +] diff --git a/damage/sb_frozenburning.damage b/damage/sb_frozenburning.damage new file mode 100644 index 00000000..558d8737 --- /dev/null +++ b/damage/sb_frozenburning.damage @@ -0,0 +1,138 @@ +{ + "kind": "sb_frozenburning", + "elementalType": "sb_frozenburning", + "effects": { + "organic": { + "hit": { + "sounds": ["/sfx/projectiles/burning.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + } + ] + ] + }, + "kill": { + "sounds": ["/sfx/projectiles/fireball_spit.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + } + ] + ] + } + }, + "robotic": { + "hit": { + "sounds": ["/sfx/projectiles/burning.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + } + ] + ] + }, + "kill": { + "sounds": ["/sfx/melee/kill_robotic1.ogg", "/sfx/melee/kill_robotic2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + } + ] + ] + } + }, + "wooden": { + "hit": { + "sounds": ["/sfx/projectiles/burning.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + } + ] + ] + }, + "kill": { + "sounds": ["/sfx/melee/kill_wood1.ogg", "/sfx/melee/kill_wood2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.animation", + "size": 1, + "angularVelocity": 0, + "fade": 1, + "destructionTime": 7, + "position": [0, 0], + "initialVelocity": [0, 0], + "finalVelocity": [0, 0], + "approach": [1, 0], + "timeToLive": 0.3, + "layer": "middle" + } + ] + ] + } + } + } +} diff --git a/damage/sb_frozenburning_fire.damage b/damage/sb_frozenburning_fire.damage deleted file mode 100644 index 99e7ad07..00000000 --- a/damage/sb_frozenburning_fire.damage +++ /dev/null @@ -1,144 +0,0 @@ -{ - "kind" : "sb_frozenburning_fire", - "elementalType" : "sb_frozenburning_fire", - "effects" : { - "organic" : { - "hit" : { - "sounds" : [ "/sfx/projectiles/burning.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - }, - "kill" : { - "sounds" : [ "/sfx/projectiles/fireball_spit.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - } - }, - "robotic" : { - "hit" : { - "sounds" : [ "/sfx/projectiles/burning.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_robotic1.ogg", "/sfx/melee/kill_robotic2.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - } - }, - "wooden" : { - "hit" : { - "sounds" : [ "/sfx/projectiles/burning.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_wood1.ogg", "/sfx/melee/kill_wood2.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - } - } - } -} diff --git a/damage/sb_frozenburning_ice.damage b/damage/sb_frozenburning_ice.damage deleted file mode 100644 index f51249d2..00000000 --- a/damage/sb_frozenburning_ice.damage +++ /dev/null @@ -1,144 +0,0 @@ -{ - "kind" : "sb_frozenburning_ice", - "elementalType" : "sb_frozenburning_ice", - "effects" : { - "organic" : { - "hit" : { - "sounds" : [ "/sfx/projectiles/burning.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - }, - "kill" : { - "sounds" : [ "/sfx/projectiles/fireball_spit.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - } - }, - "robotic" : { - "hit" : { - "sounds" : [ "/sfx/projectiles/burning.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_robotic1.ogg", "/sfx/melee/kill_robotic2.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - } - }, - "wooden" : { - "hit" : { - "sounds" : [ "/sfx/projectiles/burning.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - }, - "kill" : { - "sounds" : [ "/sfx/melee/kill_wood1.ogg", "/sfx/melee/kill_wood2.ogg" ], - "particles" : [ - [ - - { - "type" : "animated", - "animation" : "/animations/defaulthitspark/defaulthitspark.animation", - "size" : 1, - "angularVelocity" : 0, - "fade" : 1, - "destructionTime" : 7, - "position" : [0, 0], - "initialVelocity" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [1, 0], - "timeToLive" : 0.3, - "layer" : "middle" - } - ] - ] - } - } - } -} diff --git a/damage/sb_snowball.damage b/damage/sb_snowball.damage new file mode 100644 index 00000000..44f9debb --- /dev/null +++ b/damage/sb_snowball.damage @@ -0,0 +1,182 @@ +{ + //They couldn't have made a `softball` damageType and give that to every throwable, could they? + "kind": "sb_snowball", + "elementalType": "ice", + "effects": { + "organic": { + "hit": { + "sounds": ["/sfx/projectiles/snowball_hit_organic1.ogg", "/sfx/projectiles/snowball_hit_organic2.ogg"], + "particles": [ + [{ + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + }, + "kill": { + "sounds": ["/sfx/projectiles/snowball_hit_organic1.ogg", "/sfx/projectiles/snowball_hit_organic2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + } + }, + "robotic": { + "hit": { + "sounds": ["/sfx/projectiles/snowball_hit_robotic1.ogg", "/sfx/projectiles/snowball_hit_robotic2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + }, + "kill": { + "sounds": ["/sfx/melee/kill_robotic1.ogg", "/sfx/melee/kill_robotic2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + } + }, + "wooden": { + "hit": { + "sounds": ["/sfx/projectiles/snowball_hit_organic1.ogg", "/sfx/projectiles/snowball_hit_organic2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + }, + "kill": { + "sounds": ["/sfx/melee/kill_wood1.ogg", "/sfx/melee/kill_wood2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + } + }, + "stone": { + "hit": { + "sounds": ["/sfx/projectiles/snowball_hit_organic1.ogg", "/sfx/projectiles/snowball_hit_organic2.ogg"], + "particles": [ + [ + { + "type": "animated", + "animation": "/animations/defaulthitspark/defaulthitspark.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" + } + ] + ] + }, + "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/defaulthitspark/defaulthitspark.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" + } + ] + ] + } + } + } +} diff --git a/damage/snowball.damage.patch b/damage/snowball.damage.patch deleted file mode 100644 index 9f6138cf..00000000 --- a/damage/snowball.damage.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","path":"/elementalType","inverse":true},{"op":"add","path":"/elementalType","value":"ice"}]] \ No newline at end of file diff --git a/dialog/sb_friendlyminer.config b/dialog/sb_friendlyminer.config index 3b08c44f..e102e7e7 100644 --- a/dialog/sb_friendlyminer.config +++ b/dialog/sb_friendlyminer.config @@ -1,10 +1,10 @@ { - "converse" : { - "default" : { - "default" : ["I'm a miner! Can you tell?"] + "converse": { + "default": { + "default": ["I'm a miner! Can you tell?"] }, - "apex" : { - "default" : [ + "apex": { + "default": [ "I'm doing some research into nearby planetary ores.", "I'm a miner by trade. Gathering local ores is my skill.", "I used to mine for the Miniknog. I prefer this position.", @@ -12,8 +12,8 @@ "I'm scouting the area for ores. I'll give you some if I find any!" ] }, - "human" : { - "default" : [ + "human": { + "default": [ "I'm surveying the area for ores. I hope I'll find some!", "Always wear a hard hat when you're out mining! Safety first!", "If I find any cool ores in my expeditions, I'll let you know!", @@ -21,8 +21,8 @@ "If I find some ores, I'll give you a share!" ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Floran sssearch for rocksss in ground. Will ssshare, maybe.", "You wantsss some shiny rocksss? Floran can find sssome for you.", "Floran wantsss to find ssshiny rocksss in ground.", @@ -30,8 +30,8 @@ "Floran wantsss to ssstab rocksss with pickaxe! Might ssshare sssome, too." ] }, - "avian" : { - "default" : [ + "avian": { + "default": [ "Have you found any interesting things on your mining journeys?", "If I find anything exciting whilst mining, I'll try to share with you!", "Would you like me to gather some ores for you?", @@ -39,8 +39,8 @@ "My keen eye helps me find ores that no-one else can!" ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Eager. I am excited to search for local ores.", "Friendly. I'm searching for ores, and I'll let you have some if I find any.", "Excited. I have a feeling that I'll find lots of ores!", @@ -48,8 +48,8 @@ "Welcoming. I wish to share some ores with you, once I find some." ] }, - "hylotl" : { - "default" : [ + "hylotl": { + "default": [ "There is an art to gathering materials from the ground beneath us.", "I am venturing for rare ores. I could give you some if I find any extra.", "Your digging tool is quite elegant. Perhaps one day I could find one for myself.", @@ -57,8 +57,8 @@ "I shall share any ores I find with you." ] }, - "novakid" : { - "default" : [ + "novakid": { + "default": [ "I'm the miner 'round these parts. Here's hopin' I strike gold!", "Folks like me don't need to bring torches when we go spelunkin', but we do it anyway so we can find our way back.", "That's a mighty fine Matter Manipulator yer've got there. Betcha I can mine faster, partner!", @@ -67,54 +67,54 @@ ] } }, - "rent" : { - "default" : { - "default" : [ + "rent": { + "default": { + "default": [ "Here's some ore!", "Take this ore!" ] }, - "apex" : { - "default" : [ + "apex": { + "default": [ "I have found some ores for you!", "Here - Take these ores as thanks.", - "Take this ore as thanks for your time." + "Take this ore as thanks for your time." ] }, - "human" : { - "default" : [ + "human": { + "default": [ "I found some ores! Here you go!", "I found some ores! Here's some for you.", "Here's something I found around here. It's for you!" ] }, - "avian" : { - "default" : [ + "avian": { + "default": [ "Kluex has blessed me with finding some useful ores. Take some, as thanks!", "My venturing has paid off! Here are some materials for you.", - "I have found these materials for you. Hopefully they are to your liking." + "I have found these materials for you. Hopefully they are to your liking." ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Floran found ssssome ssshiny rocksss!", "Floran found ssshiny thing!", "Floran found sssome things. You ssshould take!" ] }, - "hylotl" : { - "default" : [ + "hylotl": { + "default": [ "I am feeling altruistic, please take these ores I mined.", "I've stumbled upon some raw materials you might want.", "I hope these ores I mined bring you happiness." ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Pleased. My venture was a success.", "Altruistic. Please take these ores I found.", - "Generous. I found some ores you might be interested in." + "Generous. I found some ores you might be interested in." ] } } -} \ No newline at end of file +} diff --git a/dungeons/human/sb_humanbunker/17.json b/dungeons/human/sb_humanbunker/17.json index 1aefcaf3..f52116a6 100644 --- a/dungeons/human/sb_humanbunker/17.json +++ b/dungeons/human/sb_humanbunker/17.json @@ -521,7 +521,7 @@ { "name":"object", "type":"string", - "value":"sb_coffeemachine" + "value":"coffeemachine" }], "rotation":0, "type":"", diff --git a/dungeons/microdungeons/randomencounter/glitch/sb_farm.json b/dungeons/microdungeons/randomencounter/glitch/sb_farm.json new file mode 100644 index 00000000..0950196b --- /dev/null +++ b/dungeons/microdungeons/randomencounter/glitch/sb_farm.json @@ -0,0 +1,496 @@ +{ "backgroundcolor":"#000000", + "compressionlevel":-1, + "height":44, + "infinite":false, + "layers":[ + { + "compression":"zlib", + "data":"eJzt2G0KgzAMBuAeaifZqbzATqngDy+wPxak9CtfTVoTeGETtmaPnQaPEMLh8Xg8L0pv7XdOwGcgpe1AMdoL+TxeS5W2TcuoZJM6xTyPS5Qlpx6bklPOayWztKhOJS8JsxWcal4SbrP97zBenGYWrSBOvV5cbpJO0P0U8wME8\/2WvKxbUQ2tOKVWWyZSVhA\/Davc9ceSlZQXxKl2rbZmVTKjWlGMLFq1SmJPQWaAEVZcxWmFmZekrDC9PMPllVpReuK2ohq1zDj2FWROwqbHSmJNtxpjFZ\/xvs3qRFjFqvX4vVN6P6NVWNwqd79I7xluNY+VRLStMLNozsuqFceaVKvoNdqqVpatYq5BVldHuNeM54DLafW40zgr7f5n8NLueRYr7X614068Vto9Wolb8Vlp92clvqf4nNwMZ9Uys2aK7SX3W6lzO\/ccK71urReONf6MzpPb", + "encoding":"base64", + "height":44, + "id":1, + "name":"back", + "opacity":0.5, + "type":"tilelayer", + "visible":true, + "width":75, + "x":0, + "y":0 + }, + { + "compression":"zlib", + "data":"eJzt2GEKgzAMBeAealfdyXYMf+yHFxjCCmV0aZq8mFTzIDAc6POzFLGUTCaTyfSyfeftXSRYNmIeze+7hvJpneq0x68cjgvl1PO6ohnK6Z\/XFcwkRiMnymtVN0snjtdKZtZOXK\/obtI1dcxzYiTnjxSNU2tFRWMVyXBVKw8\/7f4UycraS2oU1crKTGMU0coyGqMzrSJEY\/Rr9SJGYiXp0g46iF7odaU1sjSrHWfeKXtDZcZK26P3\/otIr+PsXhJpb7fY7+o33rtZab5tI63Qe7vUBL2uaryes9e6Squ0imZVAtxHWsl6o85vZXVkL\/h3wN7sjEFf8wjKi9N\/9Umn86y8+6\/g5d15FSvvvt6TTlgr745RJq1wVt79ogwn3h0jzGy8+65kNTIb\/e9xf1oXrZUmFs+Oe12qCyIfvvQ7Ag==", + "encoding":"base64", + "height":44, + "id":2, + "name":"front", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":75, + "x":0, + "y":0 + }, + { + "color":"#5555ff", + "draworder":"topdown", + "id":3, + "name":"mods", + "objects":[ + { + "gid":240, + "height":8, + "id":1593, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":88, + "y":264 + }, + { + "gid":240, + "height":8, + "id":1609, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":512, + "y":264 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#ff0000", + "draworder":"topdown", + "id":4, + "name":"objects", + "objects":[ + { + "gid":2147488854, + "height":16, + "id":1580, + "name":"", + "properties":[ + { + "name":"parameters", + "type":"string", + "value":"{\"treasurePools\":[\"sb_farmChestTreasure\"]}" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":248, + "y":240 + }, + { + "gid":2147490124, + "height":24, + "id":1583, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":376, + "y":240 + }, + { + "gid":2147489530, + "height":16, + "id":1587, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":456, + "y":240 + }, + { + "gid":4130, + "height":40, + "id":1594, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":264, + "y":240 + }, + { + "gid":4130, + "height":40, + "id":1595, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":72, + "y":240 + }, + { + "gid":4130, + "height":40, + "id":1597, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":192, + "y":240 + }, + { + "gid":5844, + "height":23, + "id":1598, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":104, + "y":240 + }, + { + "gid":5871, + "height":16, + "id":1600, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":48, + "x":224, + "y":152 + }, + { + "gid":2147489465, + "height":16, + "id":1602, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":48, + "x":120, + "y":240 + }, + { + "gid":2147489530, + "height":16, + "id":1603, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":440, + "y":224 + }, + { + "gid":2147489530, + "height":16, + "id":1604, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":432, + "y":240 + }, + { + "gid":2147486432, + "height":8, + "id":1605, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":152, + "y":224 + }, + { + "gid":4346, + "height":8, + "id":1606, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":136, + "y":224 + }, + { + "gid":4117, + "height":64, + "id":1607, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":56, + "x":488, + "y":240 + }, + { + "gid":4117, + "height":64, + "id":1608, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":56, + "x":336, + "y":240 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#ffff00", + "draworder":"topdown", + "id":5, + "name":"wiring - lights & guns", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#ff0000", + "draworder":"topdown", + "id":6, + "name":"monsters & npcs", + "objects":[ + { + "height":8, + "id":1575, + "name":"", + "properties":[ + { + "name":"monster", + "type":"string", + "value":"largequadruped" + }, + { + "name":"parameters", + "type":"string", + "value":"{\"aggressive\":false}" + }], + "rotation":0, + "type":"", + "visible":false, + "width":8, + "x":416, + "y":216 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#00ffff", + "draworder":"topdown", + "id":7, + "name":"wiring - locked door", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":8, + "name":"outside the map", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":9, + "name":"anchors etc", + "objects":[ + { + "height":72, + "id":1560, + "name":"", + "properties":[ + { + "name":"parameters", + "type":"string", + "value":"{\"locationType\":\"sb.farm\"}" + }, + { + "name":"stagehand", + "type":"string", + "value":"questlocation" + }], + "rotation":0, + "type":"", + "visible":true, + "width":200, + "x":88, + "y":176 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":10, + "name":"items", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }], + "nextlayerid":11, + "nextobjectid":1611, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.10.1", + "tileheight":8, + "tilesets":[ + { + "firstgid":1, + "source":"..\/..\/..\/tilesets\/packed\/materials.json" + }, + { + "firstgid":198, + "source":"..\/..\/..\/tilesets\/packed\/supports.json" + }, + { + "firstgid":235, + "source":"..\/..\/..\/tilesets\/packed\/miscellaneous.json" + }, + { + "firstgid":259, + "source":"..\/..\/..\/tilesets\/packed\/liquids.json" + }, + { + "firstgid":287, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/generic.json" + }, + { + "firstgid":2271, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/breakable.json" + }, + { + "firstgid":2581, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/crafting.json" + }, + { + "firstgid":2661, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/decorative.json" + }, + { + "firstgid":4102, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/door.json" + }, + { + "firstgid":4234, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/light.json" + }, + { + "firstgid":4692, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/pot.json" + }, + { + "firstgid":4989, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/railpoint.json" + }, + { + "firstgid":4994, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/seed.json" + }, + { + "firstgid":5070, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/storage.json" + }, + { + "firstgid":5304, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/teleportmarker.json" + }, + { + "firstgid":5318, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/trap.json" + }, + { + "firstgid":5522, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/wire.json" + }, + { + "firstgid":5744, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/glitch.json" + }, + { + "firstgid":5970, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/novakid.json" + }, + { + "firstgid":6034, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-colonytag\/commerce.json" + }, + { + "firstgid":6192, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-colonytag\/saloon.json" + }, + { + "firstgid":6213, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-type\/loungeable.json" + }, + { + "firstgid":6494, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/furniture.json" + }, + { + "firstgid":6848, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-colonytag\/pretty.json" + }, + { + "firstgid":7327, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/human.json" + }, + { + "firstgid":7615, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-type\/container.json" + }], + "tilewidth":8, + "type":"map", + "version":"1.10", + "width":75 +} \ No newline at end of file diff --git a/dungeons/microdungeons/randomencounter/glitch/sb_glitchencounter.dungeon b/dungeons/microdungeons/randomencounter/glitch/sb_glitchencounter.dungeon index 40bb7a60..60b1f200 100644 --- a/dungeons/microdungeons/randomencounter/glitch/sb_glitchencounter.dungeon +++ b/dungeons/microdungeons/randomencounter/glitch/sb_glitchencounter.dungeon @@ -3,7 +3,7 @@ "name" : "sb_glitchencounter", "species" : "glitch", "rules" : [["maxSpawnCount",[1]]], - "anchor" : [ "glitchtransport" ], + "anchor" : ["glitchtransport","glitchhouse"], "maxRadius" : 1000000, "maxParts" : 1 }, @@ -14,6 +14,12 @@ "rules" : [], "def" : ["tmx","sb_glitchtransport.json"], "chance" : 1 + }, + { + "name" : "glitchhouse", + "rules" : [], + "def" : ["tmx","sb_glitchhouse.json"], + "chance" : 1 } ] } \ No newline at end of file diff --git a/dungeons/microdungeons/randomencounter/glitch/sb_glitchhouse.json b/dungeons/microdungeons/randomencounter/glitch/sb_glitchhouse.json new file mode 100644 index 00000000..deb4cdee --- /dev/null +++ b/dungeons/microdungeons/randomencounter/glitch/sb_glitchhouse.json @@ -0,0 +1,787 @@ +{ "backgroundcolor":"#000000", + "compressionlevel":-1, + "height":68, + "infinite":false, + "layers":[ + { + "compression":"zlib", + "data":"eJzt2bttwzAQBmBN4hVSKI03CODOg3iGdJ4gTTKiBbjwAgmBCDocKL5E3vGkn8BfWLb4+EASEj0NwzAhCIIcKK68d54Hi4aRBSdNL1q0x9+zl2UnnxecdL14cW38GA1fhzW9uBHN\/S8fG+Pq+CpMzr33FSdY5VnV8FozghWsWjntzWqLF6zqOcFqsYrVC6ulSFq9FcaKFX0W\/lRKatux53apeVW6fmrEyryCVbnVlSTW79Bvr4Hv+fU1K9\/9LayeB7V6FljN5WhW2K9gBStdq1ynXC9YLV4pVqXvJzWS037rsz5fXiTuneFcOfy\/hJr1vlgGIadWoevqLtSmNSNNq1pekk6aVjW8YNWnk8s3i3T7lqxuLBasNJxgBau9WpV4wap\/L6tWGl6wghWsYAWr9l6+OiSs5jM6S1bTyv2t+sjPMy1aSa1N6jQatJLcy2an00GstniO\/06aVrWdUq1yvY5kFfrdmBhqlRILXjlOdM5ciMcpcC2U1nuatFVofZX6nNk1K1ZTpO6YVW64kzWrnHnnxlW61qTXoKSXr23fvLpE\/Hzrjn4+ilXMKSV7troRozn8bCEnW61C\/dW2mvcsX0aSVKdWVppOvWat37CKzx9JJ+tW0ul17L05aXlpj7d3Y6k+\/QJDq0\/z", + "encoding":"base64", + "height":68, + "id":1, + "name":"back", + "opacity":0.5, + "type":"tilelayer", + "visible":true, + "width":75, + "x":0, + "y":0 + }, + { + "compression":"zlib", + "data":"eJzt10FuhDAMBVDuRDecoXdh13133GE4FseYxSzmAqNIjWRFCTjEduzUX\/KidBqbR2DoNHk8Hs\/\/y5fy0pLeDla8ep+\/Ba9n5YyaSjKWnaS8nkntRos7qVPMRrA2xRqa+uScqPqPZJXuKVjbxe8xiedwtk7L+mkfrlzNSmEVnyF3rGr6jmCF7dVqp8mKu9cIVlK9WovTSvpajWgFo8EKG0mrNPBd+LdThd4Horjf2zHXTXJf1eZIfpZ6tpcifQ9ikzqFSN2DuWPxeUm1F6ie4UfhOLRq2a8wr5P1tFuVnKBVacbXdD8Yq\/1i9rv9qJ3irLk+FMHMR3GO3Pvp6npTxIoVxglj2BILVq1OVFYYB8xnNDtZtsLOctcpNy9n3qDCd8tCXPD\/EMr192T2918PLq+0F0fBd8ZNqCdlJObtaUXlJenU04rCy610OoV6gP6PDv0tWa2g\/2rEqoeTW7nVqFZ3vNxKv5dVqx5ebuVWbuVWbsXvlVtDymoxZgVtcseoawE9rFrljnFbzcweHFaluBU+mD61M87gb3tZcQTby63wfaADpmKwn7fgVeOU7plSfipnGMXq7P4qZVSr6WJtt8LHspWkV663W+XjVvhYsTqbVyolq1DfhZpBrYiKn+WwkgrXPcF9n7kV3moqHONM7\/NvsZKO1nPX5hSjyWjUaPT5AEc6K9I=", + "encoding":"base64", + "height":68, + "id":2, + "name":"front", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":75, + "x":0, + "y":0 + }, + { + "color":"#5555ff", + "draworder":"topdown", + "id":3, + "name":"mods", + "objects":[ + { + "gid":240, + "height":8, + "id":1593, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":88, + "y":264 + }, + { + "gid":240, + "height":8, + "id":1609, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":512, + "y":248 + }, + { + "gid":240, + "height":8, + "id":1637, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":192, + "y":536 + }, + { + "gid":240, + "height":8, + "id":1638, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":408, + "y":536 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#ff0000", + "draworder":"topdown", + "id":4, + "name":"objects", + "objects":[ + { + "gid":2147488854, + "height":16, + "id":1580, + "name":"", + "properties":[ + { + "name":"parameters", + "type":"string", + "value":"{\"treasurePools\":[\"sb_glitchHouseChestTreasure\"]}" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":232, + "y":200 + }, + { + "gid":4130, + "height":40, + "id":1597, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":464, + "y":240 + }, + { + "gid":2147489519, + "height":16, + "id":1600, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":48, + "x":144, + "y":152 + }, + { + "gid":4130, + "height":40, + "id":1611, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":120, + "y":240 + }, + { + "gid":4139, + "height":40, + "id":1612, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":256, + "y":152 + }, + { + "gid":6341, + "height":24, + "id":1613, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":48, + "x":424, + "y":240 + }, + { + "gid":5873, + "height":16, + "id":1614, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":304, + "y":152 + }, + { + "gid":5875, + "height":8, + "id":1615, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":208, + "y":152 + }, + { + "gid":5874, + "height":16, + "id":1616, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":240, + "y":240 + }, + { + "gid":5884, + "height":16, + "id":1617, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":272, + "y":240 + }, + { + "gid":2147489536, + "height":16, + "id":1618, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":464, + "y":200 + }, + { + "gid":5895, + "height":24, + "id":1619, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":336, + "y":224 + }, + { + "gid":5788, + "height":34, + "id":1620, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":40, + "x":248, + "y":480 + }, + { + "gid":5804, + "height":40, + "id":1621, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":48, + "x":184, + "y":240 + }, + { + "gid":5815, + "height":16, + "id":1622, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":312, + "y":224 + }, + { + "gid":5823, + "height":40, + "id":1623, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":41, + "x":376, + "y":136 + }, + { + "gid":2147489491, + "height":8, + "id":1624, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":64, + "x":232, + "y":208 + }, + { + "gid":2781, + "height":24, + "id":1625, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":24, + "x":232, + "y":144 + }, + { + "gid":3176, + "height":32, + "id":1626, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":32, + "x":144, + "y":192 + }, + { + "gid":3176, + "height":32, + "id":1627, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":32, + "x":144, + "y":112 + }, + { + "gid":3177, + "height":32, + "id":1628, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":32, + "x":448, + "y":112 + }, + { + "gid":3218, + "height":16, + "id":1629, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":328, + "y":128 + }, + { + "gid":6568, + "height":48, + "id":1630, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":60, + "x":320, + "y":152 + }, + { + "gid":3981, + "height":24, + "id":1632, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":280, + "y":192 + }, + { + "gid":5877, + "height":16, + "id":1633, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":32, + "x":424, + "y":152 + }, + { + "gid":2147486418, + "height":8, + "id":1634, + "name":"", + "properties":[ + { + "name":"object", + "type":"string", + "value":"sb_woodenshelf" + }], + "rotation":0, + "type":"", + "visible":true, + "width":32, + "x":440, + "y":208 + }, + { + "gid":5206, + "height":16, + "id":1636, + "name":"", + "properties":[ + { + "name":"parameters", + "type":"string", + "value":"{\"treasurePools\":[\"glitchsewerChestTreasure\"]}" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":240, + "y":488 + }, + { + "gid":4369, + "height":16, + "id":1639, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":288, + "y":456 + }, + { + "gid":4369, + "height":16, + "id":1640, + "name":"", + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":344, + "y":456 + }, + { + "gid":3047, + "height":8, + "id":1643, + "name":"", + "properties":[ + { + "name":"\/\/name", + "type":"string", + "value":"barvent" + }, + { + "name":"object", + "type":"string", + "value":"sb_medievalladder" + }, + { + "name":"parameters", + "type":"string", + "value":"{\"length\":30}" + }], + "rotation":0, + "type":"", + "visible":true, + "width":16, + "x":304, + "y":488 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#ffff00", + "draworder":"topdown", + "id":5, + "name":"wiring - lights & guns", + "objects":[ + { + "height":0, + "id":1635, + "name":"", + "polyline":[ + { + "x":0, + "y":0 + }, + { + "x":40, + "y":32 + }], + "rotation":0, + "type":"", + "visible":true, + "width":0, + "x":272, + "y":112 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#ff0000", + "draworder":"topdown", + "id":6, + "name":"monsters & npcs", + "objects":[ + { + "height":8, + "id":1575, + "name":"", + "properties":[ + { + "name":"monster", + "type":"string", + "value":"pogolem" + }], + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":264, + "y":456 + }, + { + "height":8, + "id":1642, + "name":"", + "properties":[ + { + "name":"npc", + "type":"string", + "value":"glitch" + }, + { + "name":"typeName", + "type":"string", + "value":"executioner" + }], + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":352, + "y":224 + }, + { + "height":8, + "id":1644, + "name":"", + "properties":[ + { + "name":"npc", + "type":"string", + "value":"glitch" + }, + { + "name":"typeName", + "type":"string", + "value":"villager" + }], + "rotation":0, + "type":"", + "visible":true, + "width":8, + "x":200, + "y":128 + }], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "color":"#00ffff", + "draworder":"topdown", + "id":7, + "name":"wiring - locked door", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":8, + "name":"outside the map", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":9, + "name":"anchors etc", + "objects":[ + { + "height":168, + "id":1560, + "name":"", + "properties":[ + { + "name":"parameters", + "type":"string", + "value":"{\"locationType\":\"sb.glitchhouse\"}" + }, + { + "name":"stagehand", + "type":"string", + "value":"questlocation" + }], + "rotation":0, + "type":"", + "visible":true, + "width":336, + "x":144, + "y":80 + }], + "opacity":1, + "type":"objectgroup", + "visible":false, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":10, + "name":"items", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }], + "nextlayerid":11, + "nextobjectid":1645, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.10.1", + "tileheight":8, + "tilesets":[ + { + "firstgid":1, + "source":"..\/..\/..\/tilesets\/packed\/materials.json" + }, + { + "firstgid":198, + "source":"..\/..\/..\/tilesets\/packed\/supports.json" + }, + { + "firstgid":235, + "source":"..\/..\/..\/tilesets\/packed\/miscellaneous.json" + }, + { + "firstgid":259, + "source":"..\/..\/..\/tilesets\/packed\/liquids.json" + }, + { + "firstgid":287, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/generic.json" + }, + { + "firstgid":2271, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/breakable.json" + }, + { + "firstgid":2581, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/crafting.json" + }, + { + "firstgid":2661, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/decorative.json" + }, + { + "firstgid":4102, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/door.json" + }, + { + "firstgid":4234, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/light.json" + }, + { + "firstgid":4692, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/pot.json" + }, + { + "firstgid":4989, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/railpoint.json" + }, + { + "firstgid":4994, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/seed.json" + }, + { + "firstgid":5070, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/storage.json" + }, + { + "firstgid":5304, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/teleportmarker.json" + }, + { + "firstgid":5318, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/trap.json" + }, + { + "firstgid":5522, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/wire.json" + }, + { + "firstgid":5744, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/glitch.json" + }, + { + "firstgid":5970, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/novakid.json" + }, + { + "firstgid":6034, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-colonytag\/commerce.json" + }, + { + "firstgid":6192, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-colonytag\/saloon.json" + }, + { + "firstgid":6213, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-type\/loungeable.json" + }, + { + "firstgid":6494, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-category\/furniture.json" + }, + { + "firstgid":6848, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-colonytag\/pretty.json" + }, + { + "firstgid":7327, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-race\/human.json" + }, + { + "firstgid":7615, + "source":"..\/..\/..\/tilesets\/packed\/objects-by-type\/container.json" + }], + "tilewidth":8, + "type":"map", + "version":"1.10", + "width":75 +} \ No newline at end of file diff --git a/effects/eating.effectsource.patch b/effects/eating.effectsource.patch new file mode 100644 index 00000000..7debb638 --- /dev/null +++ b/effects/eating.effectsource.patch @@ -0,0 +1,19 @@ +[ + [{ + "op": "test", + "path": "/definition/start/sounds/0" + }, { + "op": "add", + "path": "/definition/start/sounds/-", + "value": "/sfx/humanoid/eat1.ogg" + }, { + "op": "add", + "path": "/definition/start/sounds/-", + "value": "/sfx/humanoid/eat2.ogg" + }, { + "op": "add", + "path": "/definition/start/sounds/-", + "value": "/sfx/humanoid/eat4.ogg" + } + ] +] diff --git a/effects/sb_sprayuse.effectsource b/effects/sb_sprayuse.effectsource index db466fe8..87a0a853 100644 --- a/effects/sb_sprayuse.effectsource +++ b/effects/sb_sprayuse.effectsource @@ -1,11 +1,11 @@ { - "kind" : "sb_sprayuse", - "definition" : { - "duration" : 0.05, - "loops" : true, - "start" : { - "sounds" : [ - [ "/sfx/tools/paint_splash.ogg", "/sfx/statuseffects/powerup.ogg" ] + "kind": "sb_sprayuse", + "definition": { + "duration": 0.05, + "loops": true, + "start": { + "sounds": [ + ["/sfx/tools/paint_splash.ogg", "/sfx/statuseffects/powerup.ogg"] ] } } diff --git a/emotes/betabound.emote.png b/emotes/betabound.emote.png index 912a0047..cbe23c03 100644 Binary files a/emotes/betabound.emote.png and b/emotes/betabound.emote.png differ diff --git a/emotes/catlick.emote.png b/emotes/catlick.emote.png index 50e9527a..354afffd 100644 Binary files a/emotes/catlick.emote.png and b/emotes/catlick.emote.png differ diff --git a/events/sb_events.config b/events/sb_events.config index 950846c6..ac8e10b3 100644 --- a/events/sb_events.config +++ b/events/sb_events.config @@ -1,7 +1,7 @@ { - "invalidWorldTypes" : [ + "invalidWorldTypes": [ //vanilla, betabound - "unknown", + "unknown", "ancientgateway", "moon", "barren", @@ -11,97 +11,97 @@ "eden" ], - "generic" : [ + "generic": [ "sb_banditattack", "sb_cultistattack", "sb_ruininvasion", "sb_spacepod", "sb_dropship", "sb_envprobe" -// "sb_cultistscandroid" + // "sb_cultistscandroid" ], - "wanted" : [ + "wanted": [ // Wanted level 1 - [ ], + [], // Wanted level 2 - [ ], + [], // Wanted level 3 - [ "sb_peacekeeperattack" ], + ["sb_peacekeeperattack"], // Wanted level 4 - [ "sb_peacekeeperattack" ] + ["sb_peacekeeperattack"] ], - "bounty" : [ -// "sb_rivalbountyhunter" + "bounty": [ + // "sb_rivalbountyhunter" ], - "eventCooldown" : [480, 1800], //3-600 //180, 900 + "eventCooldown": [480, 1800], //3-600 //180, 900 - "events" : { + "events": { // GENERIC - "sb_banditattack" : { - "location" : "questLocation", - "stagehand" : "sb_banditattack", - "skipChance" : 2 + "sb_banditattack": { + "location": "questLocation", + "stagehand": "sb_banditattack", + "skipChance": 2 }, - "sb_cultistattack" : { - "location" : "questLocation", - "stagehand" : "sb_cultistattack", - "skipChance" : 2 + "sb_cultistattack": { + "location": "questLocation", + "stagehand": "sb_cultistattack", + "skipChance": 2 }, - "sb_ruininvasion" : { - "location" : "surface", - "bounds" : [-5, -4.5, 5, 2.5], - "range" : [10, 15], - "offset" : [1, 1], - "stagehand" : "sb_ruininvasion", - "skipChance" : 2 + "sb_ruininvasion": { + "location": "surface", + "bounds": [-5, -4.5, 5, 2.5], + "range": [10, 15], + "offset": [1, 1], + "stagehand": "sb_ruininvasion", + "skipChance": 2 }, - "sb_spacepod" : { - "location" : "surface", //questLocation", - "stagehand" : "sb_spacepod", - "bounds" : [-5, -4.5, 5, 2.5], - "range" : [10, 15], - "offset" : [1, 1], - "skipChance" : 2 + "sb_spacepod": { + "location": "surface", //questLocation", + "stagehand": "sb_spacepod", + "bounds": [-5, -4.5, 5, 2.5], + "range": [10, 15], + "offset": [1, 1], + "skipChance": 2 }, - "sb_dropship" : { - "location" : "surface", - "bounds" : [-40, 5, 40, 30], - "range" : [10, 15], - "stagehand" : "sb_dropship", - "offset" : [0, 20], - "skipChance" : 3.4 + "sb_dropship": { + "location": "surface", + "bounds": [-40, 5, 40, 30], + "range": [10, 15], + "stagehand": "sb_dropship", + "offset": [0, 20], + "skipChance": 3.4 }, - "sb_envprobe" : { - "location" : "screen", - "bounds" : [-5, 5, 5, 10], - "anchor" : "top", - "stagehand" : "sb_envprobe", - "skipChance" : 4 + "sb_envprobe": { + "location": "screen", + "bounds": [-5, 5, 5, 10], + "anchor": "top", + "stagehand": "sb_envprobe", + "skipChance": 4 }, - "sb_cultistscandroid" : { - "location" : "screen", - "bounds" : [-5, 5, 5, 10], - "anchor" : "top", - "stagehand" : "sb_cultistscandroid" + "sb_cultistscandroid": { + "location": "screen", + "bounds": [-5, 5, 5, 10], + "anchor": "top", + "stagehand": "sb_cultistscandroid" } /* WANTED "sb_peacekeeperattack" : { - "location" : "surface", - "bounds" : [-5, -4.5, 5, 2.5], - "range" : [10, 15], - "stagehand" : "sb_peacekeeperattack" + "location" : "surface", + "bounds" : [-5, -4.5, 5, 2.5], + "range" : [10, 15], + "stagehand" : "sb_peacekeeperattack" }, BOUNTY "sb_rivalbountyhunter" : { - "location" : "surface", - "bounds" : [-5, -4.5, 5, 2.5], - "range" : [10, 15], - "stagehand" : "sb_rivalbountyhunter" + "location" : "surface", + "bounds" : [-5, -4.5, 5, 2.5], + "range" : [10, 15], + "stagehand" : "sb_rivalbountyhunter" }*/ } -} \ No newline at end of file +} diff --git a/humanoid/floran/hair/sb_15.png b/humanoid/floran/hair/sb_15.png new file mode 100644 index 00000000..627c4ffb Binary files /dev/null and b/humanoid/floran/hair/sb_15.png differ diff --git a/humanoid/floran/hair/sb_22.png b/humanoid/floran/hair/sb_22.png new file mode 100644 index 00000000..cb185440 Binary files /dev/null and b/humanoid/floran/hair/sb_22.png differ diff --git a/humanoid/floran/hair/sb_37.png b/humanoid/floran/hair/sb_37.png new file mode 100644 index 00000000..63b9f29d Binary files /dev/null and b/humanoid/floran/hair/sb_37.png differ diff --git a/humanoid/human/hair/sb_fem14.png b/humanoid/human/hair/sb_fem14.png index 0baae61d..208760b8 100644 Binary files a/humanoid/human/hair/sb_fem14.png and b/humanoid/human/hair/sb_fem14.png differ diff --git a/humanoid/human/hair/sb_fem20.png b/humanoid/human/hair/sb_fem20.png index f899c516..867845c2 100644 Binary files a/humanoid/human/hair/sb_fem20.png and b/humanoid/human/hair/sb_fem20.png differ diff --git a/humanoid/human/hair/sb_fem28.png b/humanoid/human/hair/sb_fem28.png index 3fa4fd0f..ba716d9e 100644 Binary files a/humanoid/human/hair/sb_fem28.png and b/humanoid/human/hair/sb_fem28.png differ diff --git a/humanoid/human/hair/sb_fem41.png b/humanoid/human/hair/sb_fem41.png index a104e838..db0889f5 100644 Binary files a/humanoid/human/hair/sb_fem41.png and b/humanoid/human/hair/sb_fem41.png differ diff --git a/humanoid/human/hair/sb_fem5.png b/humanoid/human/hair/sb_fem5.png index 97601c51..4b610312 100644 Binary files a/humanoid/human/hair/sb_fem5.png and b/humanoid/human/hair/sb_fem5.png differ diff --git a/humanoid/human/hair/sb_fem54.png b/humanoid/human/hair/sb_fem54.png index ad721be3..7de959af 100644 Binary files a/humanoid/human/hair/sb_fem54.png and b/humanoid/human/hair/sb_fem54.png differ diff --git a/humanoid/human/hair/sb_fem8.png b/humanoid/human/hair/sb_fem8.png index 51b0bc4d..d7058dab 100644 Binary files a/humanoid/human/hair/sb_fem8.png and b/humanoid/human/hair/sb_fem8.png differ diff --git a/humanoid/novakid/brand/sb_0.png b/humanoid/novakid/brand/sb_0.png index 08d97648..9f39201d 100644 Binary files a/humanoid/novakid/brand/sb_0.png and b/humanoid/novakid/brand/sb_0.png differ diff --git a/interface.config.patch b/interface.config.patch index fc745c55..c0f01d7e 100644 --- a/interface.config.patch +++ b/interface.config.patch @@ -1,20 +1,15 @@ [ -// [{"op":"replace","path":"/newItemAnimation/frames","value":"/interface/sb_inventory/itemoverlay.png:"}, -// {"op":"replace","path":"/newItemAnimation/loops","value":1}, -// {"op":"replace","path":"/newItemAnimation/animationCycle","value":1}, -// {"op":"replace","path":"/newItemAnimation/frameNumber","value":12}], + [ + {"op":"test","path":"/mainBar/collections/open","value":"/interface/collections.png:open"}, + {"op":"replace","path":"/mainBar/collections/open","value":"/interface/collections.png:open?replace;297e17=7721a0;1a510e=611f88"} + ], -[ - {"op":"test","path":"/mainBar/collections/open","value":"/interface/collections.png:open"}, - {"op":"replace","path":"/mainBar/collections/open","value":"/interface/collections.png:open?replace;297e17=7721a0;1a510e=611f88"} -], - -[ - {"op":"test","path":"/mainBar/collections/openHover","value":"/interface/collections.png:openHover"}, - {"op":"replace","path":"/mainBar/collections/openHover","value":"/interface/collections.png:openHover?replace;3ea721=912fca;297e17=7721a0"} -], + [ + {"op":"test","path":"/mainBar/collections/openHover","value":"/interface/collections.png:openHover"}, + {"op":"replace","path":"/mainBar/collections/openHover","value":"/interface/collections.png:openHover?replace;3ea721=912fca;297e17=7721a0"} + ], -[{"op":"test","path":"/statusIconPos/1","value":50},{"op":"replace","path":"/statusIconPos/1","value":53}] + [{"op":"test","path":"/statusIconPos/1","value":50},{"op":"replace","path":"/statusIconPos/1","value":53}] //,[{"op":"test","path":"/statusIconDarkenImage","value":"/interface/statuses/darken.png"},{"op":"replace","path":"/statusIconDarkenImage","value":"/interface/statuses/darken.png?scalenearest=1.4"}], //[{"op":"test","path":"/itemCountRightAnchor/0","value":20},{"op":"replace","path":"/itemCountRightAnchor/0","value":19}] diff --git a/interface/bookmarks/icons/sb_tentacle.png b/interface/bookmarks/icons/sb_tentacle.png index cb06ce56..b7386f2b 100644 Binary files a/interface/bookmarks/icons/sb_tentacle.png and b/interface/bookmarks/icons/sb_tentacle.png differ diff --git a/interface/bookmarks/icons/spacestation_peacekeeper1.png b/interface/bookmarks/icons/spacestation_peacekeeper1.png index a9c14af3..41822749 100644 Binary files a/interface/bookmarks/icons/spacestation_peacekeeper1.png and b/interface/bookmarks/icons/spacestation_peacekeeper1.png differ diff --git a/interface/bookmarks/icons/spacestation_peacekeeper2.png b/interface/bookmarks/icons/spacestation_peacekeeper2.png index a9c14af3..41822749 100644 Binary files a/interface/bookmarks/icons/spacestation_peacekeeper2.png and b/interface/bookmarks/icons/spacestation_peacekeeper2.png differ diff --git a/interface/bookmarks/icons/spacestation_peacekeeper3.png b/interface/bookmarks/icons/spacestation_peacekeeper3.png index 3fa0a375..9b28c062 100644 Binary files a/interface/bookmarks/icons/spacestation_peacekeeper3.png and b/interface/bookmarks/icons/spacestation_peacekeeper3.png differ diff --git a/interface/bookmarks/icons/spacestation_peacekeeper4.png b/interface/bookmarks/icons/spacestation_peacekeeper4.png index 3fa0a375..9b28c062 100644 Binary files a/interface/bookmarks/icons/spacestation_peacekeeper4.png and b/interface/bookmarks/icons/spacestation_peacekeeper4.png differ diff --git a/interface/bookmarks/icons/spacestation_peacekeeper5.png b/interface/bookmarks/icons/spacestation_peacekeeper5.png index f610a950..8bdac1a9 100644 Binary files a/interface/bookmarks/icons/spacestation_peacekeeper5.png and b/interface/bookmarks/icons/spacestation_peacekeeper5.png differ diff --git a/interface/bookmarks/list/sb_edithover.png b/interface/bookmarks/list/sb_edithover.png index 4a76673c..61c2c422 100644 Binary files a/interface/bookmarks/list/sb_edithover.png and b/interface/bookmarks/list/sb_edithover.png differ diff --git a/interface/bookmarks/list/sb_editup.png b/interface/bookmarks/list/sb_editup.png index 2929f46b..0a9c0224 100644 Binary files a/interface/bookmarks/list/sb_editup.png and b/interface/bookmarks/list/sb_editup.png differ diff --git a/interface/chatbubbles/sb_esther.frames b/interface/chatbubbles/sb_esther.frames deleted file mode 100644 index 9121ec55..00000000 --- a/interface/chatbubbles/sb_esther.frames +++ /dev/null @@ -1,43 +0,0 @@ -//iirc adding frames to esther.png caused someone somewhere to crash idk -{ - "frameGrid" : { - "size" : [54, 56], - "dimensions" : [9, 4], - - "names" : [ - [null, "idle", null, "blink"], - [null, "talk.0", "talk.1", null, "yell.0", "yell.1"], - [null, "refuse.0", "refuse.1", "refuse.2", "refuse.3", "refuse.4", "refuse.5", "refuse.6", "refuse.7"], - [null, "unique.0", "unique.1", "unique.2", "unique.3", "unique.4", "unique.5", "unique.6", "unique.7"] - ] - }, - "aliases" : { - "idle.0" : "idle", - "idle.1" : "idle", - "idle.2" : "idle", - "idle.3" : "idle", - "idle.4" : "idle", - "idle.5" : "idle", - "idle.6" : "idle", - "idle.7" : "idle", - "idle.8" : "idle", - "idle.9" : "idle", - "idle.10" : "idle", - "idle.11" : "idle", - "idle.12" : "idle", - "idle.13" : "blink", - "idle.14" : "idle", - "idle.15" : "idle", - "idle.16" : "idle", - "idle.17" : "idle", - "idle.18" : "idle", - "idle.19" : "idle", - "idle.20" : "idle", - "sb_estherBlink.1" : "blink", - "sb_estherBlink.2" : "idle", - "sb_estherTalk.1" : "talk.0", - "sb_estherTalk.2" : "talk.1", - "sb_estherIdle.default" : "idle", - "sb_estherIdle.defaultdefault" : "idle" - } -} \ No newline at end of file diff --git a/interface/chatbubbles/sb_esther.png b/interface/chatbubbles/sb_esther.png deleted file mode 100644 index 5a882bd7..00000000 Binary files a/interface/chatbubbles/sb_esther.png and /dev/null differ diff --git a/interface/cockpit/planets/sb_tentacle.png b/interface/cockpit/planets/sb_tentacle.png index 5f035bb7..e9d39e7b 100644 Binary files a/interface/cockpit/planets/sb_tentacle.png and b/interface/cockpit/planets/sb_tentacle.png differ diff --git a/interface/hellession/recipemaster.config.patch b/interface/hellession/recipemaster.config.patch index 1758286a..36c1bee9 100644 --- a/interface/hellession/recipemaster.config.patch +++ b/interface/hellession/recipemaster.config.patch @@ -66,6 +66,5 @@ ,{"op":"add","path":"/filterNameToFriendly/sb_skyrailtable","value":"Skyrail Crafting Table"} ,{"op":"add","path":"/filterNameToFriendly/sb_portable3dprinter","value":"Portable Pixel Printer"} ,{"op":"add","path":"/filterNameToFriendly/sb_techconsole","value":"Tech Development Console"} -,{"op":"add","path":"/filterNameToFriendly/sb_coffee","value":"Coffee Machine"} ,{"op":"add","path":"/filterNameToFriendly/spawnerstation","value":"Employer's Station"} ]] \ No newline at end of file diff --git a/interface/itemdescriptions/base.itemdescription.patch b/interface/itemdescriptions/base.itemdescription.patch index 70ee06fa..250bad74 100644 --- a/interface/itemdescriptions/base.itemdescription.patch +++ b/interface/itemdescriptions/base.itemdescription.patch @@ -36,7 +36,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/bow.itemdescription.patch b/interface/itemdescriptions/bow.itemdescription.patch index df623905..415661ae 100644 --- a/interface/itemdescriptions/bow.itemdescription.patch +++ b/interface/itemdescriptions/bow.itemdescription.patch @@ -4,7 +4,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/fistweapon.itemdescription.patch b/interface/itemdescriptions/fistweapon.itemdescription.patch index 43807dc0..41c7da97 100644 --- a/interface/itemdescriptions/fistweapon.itemdescription.patch +++ b/interface/itemdescriptions/fistweapon.itemdescription.patch @@ -4,7 +4,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/fossil.itemdescription.patch b/interface/itemdescriptions/fossil.itemdescription.patch index 70ee06fa..250bad74 100644 --- a/interface/itemdescriptions/fossil.itemdescription.patch +++ b/interface/itemdescriptions/fossil.itemdescription.patch @@ -36,7 +36,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/gun.itemdescription.patch b/interface/itemdescriptions/gun.itemdescription.patch index df623905..415661ae 100644 --- a/interface/itemdescriptions/gun.itemdescription.patch +++ b/interface/itemdescriptions/gun.itemdescription.patch @@ -4,7 +4,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_armor.itemdescription b/interface/itemdescriptions/sb_armor.itemdescription index 4f3403cd..7843d39c 100644 --- a/interface/itemdescriptions/sb_armor.itemdescription +++ b/interface/itemdescriptions/sb_armor.itemdescription @@ -12,7 +12,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_armoraugment.itemdescription b/interface/itemdescriptions/sb_armoraugment.itemdescription index 4f3403cd..7843d39c 100644 --- a/interface/itemdescriptions/sb_armoraugment.itemdescription +++ b/interface/itemdescriptions/sb_armoraugment.itemdescription @@ -12,7 +12,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_bow.itemdescription b/interface/itemdescriptions/sb_bow.itemdescription index b4e8ccd7..9d5125b3 100644 --- a/interface/itemdescriptions/sb_bow.itemdescription +++ b/interface/itemdescriptions/sb_bow.itemdescription @@ -76,7 +76,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_fistweapon.itemdescription b/interface/itemdescriptions/sb_fistweapon.itemdescription index 7a4d344a..a2152e44 100644 --- a/interface/itemdescriptions/sb_fistweapon.itemdescription +++ b/interface/itemdescriptions/sb_fistweapon.itemdescription @@ -77,7 +77,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_gun.itemdescription b/interface/itemdescriptions/sb_gun.itemdescription index 9df83c75..23574568 100644 --- a/interface/itemdescriptions/sb_gun.itemdescription +++ b/interface/itemdescriptions/sb_gun.itemdescription @@ -41,7 +41,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_gun2.itemdescription b/interface/itemdescriptions/sb_gun2.itemdescription index 0ce7428b..cd5408e7 100644 --- a/interface/itemdescriptions/sb_gun2.itemdescription +++ b/interface/itemdescriptions/sb_gun2.itemdescription @@ -48,7 +48,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_gun4.itemdescription b/interface/itemdescriptions/sb_gun4.itemdescription index e23a1023..237e49e6 100644 --- a/interface/itemdescriptions/sb_gun4.itemdescription +++ b/interface/itemdescriptions/sb_gun4.itemdescription @@ -48,12 +48,19 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, "wrapWidth": 126 }, + "ammoLabel": { + "type": "label", + "position": [16, 51], + "hAnchor": "left", + "wrapWidth": 126, + "value": "^green;This weapon can use ammo" + }, "altAbilityLabel": { "type": "label", "position": [13.4, 142], diff --git a/interface/itemdescriptions/sb_object.itemdescription b/interface/itemdescriptions/sb_object.itemdescription index 0699df13..59dfd280 100644 --- a/interface/itemdescriptions/sb_object.itemdescription +++ b/interface/itemdescriptions/sb_object.itemdescription @@ -75,7 +75,14 @@ "maxSize": [16, 16], "minSize": [16, 16] }, - //"level2Label":{"type":"label","position":[114,169],"hAnchor":"left","color":"gray","centered":true,"wrapWidth":126}, + "level2Label": { + "type": "label", + "position": [118, 169], + "hAnchor": "left", + "color": "gray", + "centered": true, + "wrapWidth": 126 + }, "foodValueLabel": { "type": "label", "position": [14, 152], diff --git a/interface/itemdescriptions/sb_object4.itemdescription b/interface/itemdescriptions/sb_object4.itemdescription index 09cdf735..99fd73fa 100644 --- a/interface/itemdescriptions/sb_object4.itemdescription +++ b/interface/itemdescriptions/sb_object4.itemdescription @@ -76,6 +76,14 @@ "centered": true, "width": 126 }, + "level2Label": { + "type": "label", + "position": [118, 169], + "hAnchor": "left", + "color": "gray", + "centered": true, + "wrapWidth": 126 + }, "objectImage": { "type": "image", "position": [74, 125], diff --git a/interface/itemdescriptions/sb_object4b.itemdescription b/interface/itemdescriptions/sb_object4b.itemdescription index d3e8672f..92614d1f 100644 --- a/interface/itemdescriptions/sb_object4b.itemdescription +++ b/interface/itemdescriptions/sb_object4b.itemdescription @@ -76,6 +76,14 @@ "centered": true, "width": 126 }, + "level2Label": { + "type": "label", + "position": [118, 169], + "hAnchor": "left", + "color": "gray", + "centered": true, + "wrapWidth": 126 + }, "objectImage": { "type": "image", "position": [74, 125], diff --git a/interface/itemdescriptions/sb_shield.itemdescription b/interface/itemdescriptions/sb_shield.itemdescription index 1763adc3..b71b8e36 100644 --- a/interface/itemdescriptions/sb_shield.itemdescription +++ b/interface/itemdescriptions/sb_shield.itemdescription @@ -98,7 +98,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_staff.itemdescription b/interface/itemdescriptions/sb_staff.itemdescription index 5e8e8621..ead726e7 100644 --- a/interface/itemdescriptions/sb_staff.itemdescription +++ b/interface/itemdescriptions/sb_staff.itemdescription @@ -60,7 +60,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_sword.itemdescription b/interface/itemdescriptions/sb_sword.itemdescription index 05ce84d0..5e435f47 100644 --- a/interface/itemdescriptions/sb_sword.itemdescription +++ b/interface/itemdescriptions/sb_sword.itemdescription @@ -107,7 +107,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_sword2.itemdescription b/interface/itemdescriptions/sb_sword2.itemdescription index 40b1ad76..21888ebf 100644 --- a/interface/itemdescriptions/sb_sword2.itemdescription +++ b/interface/itemdescriptions/sb_sword2.itemdescription @@ -77,7 +77,7 @@ }, "level2Label": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sb_tall.itemdescription b/interface/itemdescriptions/sb_tall.itemdescription deleted file mode 100644 index 2be7f0d2..00000000 --- a/interface/itemdescriptions/sb_tall.itemdescription +++ /dev/null @@ -1,57 +0,0 @@ -{ - "moneyIcon": { - "type": "image", - "position": [102, 30], - "file": "/interface/money.png" - }, - "priceLabel": { - "type": "label", - "position": [115, 30], - "hAnchor": "left", - "value": "0" - }, - "descriptionLabel": { - "type": "label", - "position": [16, 91], - "hAnchor": "left", - "vAnchor": "top", - "wrapWidth": 122 - }, - "objectImage": { - "type": "image", - "position": [74, -90], - "file": "", - "centered": false, - "maxSize": [16, 640], - "minSize": [16, 640] - }, - "title": { - "type": "label", - "position": [35, 179], - "hAnchor": "left", - "value": "" - }, - "subTitle": { - "type": "label", - "position": [35, 169], - "hAnchor": "left", - "color": [185, 181, 178], - "value": "" - }, - "rarityLabel": { - "type": "label", - "position": [12, 30], - "hAnchor": "left", - "centered": true, - "wrapWidth": 126 - }, - "titleIcon": { - "type": "itemslot", - "position": [9, 167], - "callback": "null", - "iconMode": true, - "backingImage": "/interface/inventory/portrait.png", - "showRarity": false, - "showBackingImageWhenFull": true - } -} diff --git a/interface/itemdescriptions/sb_v5.itemdescription b/interface/itemdescriptions/sb_v5.itemdescription index cca54f89..8e173c86 100644 --- a/interface/itemdescriptions/sb_v5.itemdescription +++ b/interface/itemdescriptions/sb_v5.itemdescription @@ -18,6 +18,14 @@ "vAnchor": "top", "wrapWidth": 122 }, + "level2Label": { + "type": "label", + "position": [118, 169], + "hAnchor": "left", + "color": "gray", + "centered": true, + "wrapWidth": 126 + }, "objectImage": { "type": "image", "position": [74, 125], diff --git a/interface/itemdescriptions/shield.itemdescription.patch b/interface/itemdescriptions/shield.itemdescription.patch index db67ab1e..f4c2ae93 100644 --- a/interface/itemdescriptions/shield.itemdescription.patch +++ b/interface/itemdescriptions/shield.itemdescription.patch @@ -4,7 +4,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/itemdescriptions/sword.itemdescription.patch b/interface/itemdescriptions/sword.itemdescription.patch index df623905..415661ae 100644 --- a/interface/itemdescriptions/sword.itemdescription.patch +++ b/interface/itemdescriptions/sword.itemdescription.patch @@ -4,7 +4,7 @@ "path": "/sb_level2Label", "value": { "type": "label", - "position": [114, 169], + "position": [118, 169], "hAnchor": "left", "color": "gray", "centered": true, diff --git a/interface/sb_chests/chestbody.png b/interface/sb_chests/chestbody.png index 16e375c0..ea1ecda8 100644 Binary files a/interface/sb_chests/chestbody.png and b/interface/sb_chests/chestbody.png differ diff --git a/interface/sb_chests/chestfooter.png b/interface/sb_chests/chestfooter.png index 0ec41d2e..f63976ac 100644 Binary files a/interface/sb_chests/chestfooter.png and b/interface/sb_chests/chestfooter.png differ diff --git a/interface/sb_chests/chestheader.png b/interface/sb_chests/chestheader.png index 4aa87093..a298dcb3 100644 Binary files a/interface/sb_chests/chestheader.png and b/interface/sb_chests/chestheader.png differ diff --git a/interface/sb_chests/shine17to24.png b/interface/sb_chests/shine17to24.png index 1f101121..ee72f47a 100644 Binary files a/interface/sb_chests/shine17to24.png and b/interface/sb_chests/shine17to24.png differ diff --git a/interface/sb_chests/shine1to16.png b/interface/sb_chests/shine1to16.png index 8cfc14df..2832e4c7 100644 Binary files a/interface/sb_chests/shine1to16.png and b/interface/sb_chests/shine1to16.png differ diff --git a/interface/sb_chests/shine25to32.png b/interface/sb_chests/shine25to32.png index e0cb7f05..493f43c2 100644 Binary files a/interface/sb_chests/shine25to32.png and b/interface/sb_chests/shine25to32.png differ diff --git a/interface/sb_chests/shine33to40.png b/interface/sb_chests/shine33to40.png index e6b91524..e8a196e0 100644 Binary files a/interface/sb_chests/shine33to40.png and b/interface/sb_chests/shine33to40.png differ diff --git a/interface/sb_chests/shine41to48.png b/interface/sb_chests/shine41to48.png index 059edfc9..96984676 100644 Binary files a/interface/sb_chests/shine41to48.png and b/interface/sb_chests/shine41to48.png differ diff --git a/interface/sb_chests/shine49andup.png b/interface/sb_chests/shine49andup.png index 070e6388..4c3e7926 100644 Binary files a/interface/sb_chests/shine49andup.png and b/interface/sb_chests/shine49andup.png differ diff --git a/interface/sb_crafting/3craftingbody.png b/interface/sb_crafting/3craftingbody.png index a39d91b7..19024aab 100644 Binary files a/interface/sb_crafting/3craftingbody.png and b/interface/sb_crafting/3craftingbody.png differ diff --git a/interface/sb_crafting/amount.png b/interface/sb_crafting/amount.png index 585d3d62..c7a6fe48 100644 Binary files a/interface/sb_crafting/amount.png and b/interface/sb_crafting/amount.png differ diff --git a/interface/sb_crafting/categories.png b/interface/sb_crafting/categories.png index baa3a03a..f0822903 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 7be4ac1b..97c03275 100644 Binary files a/interface/sb_crafting/categoriesselected.png and b/interface/sb_crafting/categoriesselected.png differ diff --git a/interface/sb_crafting/checkboxcheckhover.png b/interface/sb_crafting/checkboxcheckhover.png index 72a7159a..ba2de5da 100644 Binary files a/interface/sb_crafting/checkboxcheckhover.png and b/interface/sb_crafting/checkboxcheckhover.png differ diff --git a/interface/sb_crafting/checkboxnocheck.png b/interface/sb_crafting/checkboxnocheck.png index d0de5e66..1f06281a 100644 Binary files a/interface/sb_crafting/checkboxnocheck.png and b/interface/sb_crafting/checkboxnocheck.png differ diff --git a/interface/sb_crafting/checkboxnocheckhover.png b/interface/sb_crafting/checkboxnocheckhover.png index 2dc20071..24ab8f04 100644 Binary files a/interface/sb_crafting/checkboxnocheckhover.png and b/interface/sb_crafting/checkboxnocheckhover.png differ diff --git a/interface/sb_crafting/craftableselected.png b/interface/sb_crafting/craftableselected.png index fd6020ff..aae20c07 100644 Binary files a/interface/sb_crafting/craftableselected.png and b/interface/sb_crafting/craftableselected.png differ diff --git a/interface/sb_crafting/craftingbody.png b/interface/sb_crafting/craftingbody.png index a4fd2673..c6d61da8 100644 Binary files a/interface/sb_crafting/craftingbody.png and b/interface/sb_crafting/craftingbody.png differ diff --git a/interface/sb_crafting/craftingfooter.png b/interface/sb_crafting/craftingfooter.png index 4379d88a..daba3630 100644 Binary files a/interface/sb_crafting/craftingfooter.png and b/interface/sb_crafting/craftingfooter.png differ diff --git a/interface/sb_crafting/craftingicon.png b/interface/sb_crafting/craftingicon.png index f36ed9da..decd422a 100644 Binary files a/interface/sb_crafting/craftingicon.png and b/interface/sb_crafting/craftingicon.png differ diff --git a/interface/sb_crafting/craftingicons.frames b/interface/sb_crafting/craftingicons.frames index 2d1e7e4a..857efd3f 100644 --- a/interface/sb_crafting/craftingicons.frames +++ b/interface/sb_crafting/craftingicons.frames @@ -1,8 +1,11 @@ -{"frameGrid":{"size":[24,24],"dimensions":[5,5], -"names":[ -["table1","table2","table3","scififurnace","metalwork"], -["scifianvil","manipulatortable","acceleratortable","separatortable","culinaryarts"], -["heartforge","holiday","printingicon","spawnerstation","capturestation"], -["techconsole","researchstation","skyrailtable","skyrailrailtable","music"], -["tech","closedbook","openbook",null,null] -]}} \ No newline at end of file +{ + "frameGrid": { + "size": [24, 24], + "dimensions": [5, 3], + "names": [ + ["table1", "table2", "table3", "culinaryarts", "heartforge"], + ["holiday", "printingicon", "spawnerstation", "techconsole", "researchstation"], + [null, null, "music", "tech", "closedbook"] + ] + } +} diff --git a/interface/sb_crafting/craftingicons.png b/interface/sb_crafting/craftingicons.png index 5562d2c4..c1758c22 100644 Binary files a/interface/sb_crafting/craftingicons.png and b/interface/sb_crafting/craftingicons.png differ diff --git a/interface/sb_crafting/default.frames b/interface/sb_crafting/default.frames index 486255bf..bd82d6ab 100644 --- a/interface/sb_crafting/default.frames +++ b/interface/sb_crafting/default.frames @@ -1,12 +1,17 @@ -{"frameGrid":{"size":[18,19],"dimensions":[6,9], -"names":[ -["empty","other","blocks","armor","weapons","ammo"], -["items","smith","sit","augments","1","2"], -["3","4","all","head","chest","legs"], -["back","craft","bars","ore2","ore","healing"], -["health","energy","energyregen","mobility","swimboost","warmth"], -["glow","thorns","nova","electrified","lowgrav","bouncy"], -["main","side","dessert","snack","drink","condiment"], -["campfire","convert","skyrails","rails","door","light"], -["wire","storage","decorative","instruments","planets","mechs"] -]}} \ No newline at end of file +{ + "frameGrid": { + "size": [18, 19], + "dimensions": [6, 11], + "names": [ + ["empty", "other", "blocks", "weapons", "armor", "smith"], + ["items", "augments", "1", "2", "3", "4"], + ["all", "head", "craft", "mining", "upgrades", "healing"], + ["health", "energy", "energyregen", "runboost", "jumpboost", "rage"], + ["swimboost", "glow", "thorns", "nova", "electrified", "lowgrav"], + ["bouncy", "main", "side", "dessert", "snack", "drink"], + ["condiment", "campfire", "convert", "skyrails", "rails", "door"], + ["light", "wire", "storage", "decorative", "sit", "instruments"], + ["planets", "mechs", null, null, null, null] + ] + } +} diff --git a/interface/sb_crafting/new.png b/interface/sb_crafting/new.png index 1fb7ab60..9362eebd 100644 Binary files a/interface/sb_crafting/new.png and b/interface/sb_crafting/new.png differ diff --git a/interface/sb_crafting/rarities.png b/interface/sb_crafting/rarities.png index c224f4ab..5a30debb 100644 Binary files a/interface/sb_crafting/rarities.png and b/interface/sb_crafting/rarities.png differ diff --git a/interface/sb_crafting/researchbody.png b/interface/sb_crafting/researchbody.png index 64d57cfb..64af50c4 100644 Binary files a/interface/sb_crafting/researchbody.png and b/interface/sb_crafting/researchbody.png differ diff --git a/interface/sb_crafting/shine.png b/interface/sb_crafting/shine.png index 094afe70..171b0e94 100644 Binary files a/interface/sb_crafting/shine.png and b/interface/sb_crafting/shine.png differ diff --git a/interface/sb_crafting/shine2.png b/interface/sb_crafting/shine2.png index df560595..9f17b685 100644 Binary files a/interface/sb_crafting/shine2.png and b/interface/sb_crafting/shine2.png differ diff --git a/interface/sb_crafting/shine3.png b/interface/sb_crafting/shine3.png index 095e612b..3c271b9f 100644 Binary files a/interface/sb_crafting/shine3.png and b/interface/sb_crafting/shine3.png differ diff --git a/interface/sb_crafting/techbody.png b/interface/sb_crafting/techbody.png index a8fc7d17..9a578fe3 100644 Binary files a/interface/sb_crafting/techbody.png and b/interface/sb_crafting/techbody.png differ diff --git a/interface/sb_crafting/x.png b/interface/sb_crafting/x.png index 0deb280c..38ddd562 100644 Binary files a/interface/sb_crafting/x.png and b/interface/sb_crafting/x.png differ diff --git a/interface/sb_crafting/xpress.png b/interface/sb_crafting/xpress.png index af0a4231..f483df14 100644 Binary files a/interface/sb_crafting/xpress.png and b/interface/sb_crafting/xpress.png differ diff --git a/interface/sb_fuel/cleardown.png b/interface/sb_fuel/cleardown.png index 9f756c2a..a59740bb 100644 Binary files a/interface/sb_fuel/cleardown.png and b/interface/sb_fuel/cleardown.png differ diff --git a/interface/sb_fuel/clearup.png b/interface/sb_fuel/clearup.png index 5890070b..d0d1f05b 100644 Binary files a/interface/sb_fuel/clearup.png and b/interface/sb_fuel/clearup.png differ diff --git a/interface/sb_fuel/fuel2down.png b/interface/sb_fuel/fuel2down.png index 851744b5..21e95000 100644 Binary files a/interface/sb_fuel/fuel2down.png and b/interface/sb_fuel/fuel2down.png differ diff --git a/interface/sb_fuel/fuel2up.png b/interface/sb_fuel/fuel2up.png index 4ce1aab7..f44b6714 100644 Binary files a/interface/sb_fuel/fuel2up.png and b/interface/sb_fuel/fuel2up.png differ diff --git a/interface/sb_fuel/fueluibody.png b/interface/sb_fuel/fueluibody.png index 90d03629..22edeb7e 100644 Binary files a/interface/sb_fuel/fueluibody.png and b/interface/sb_fuel/fueluibody.png differ diff --git a/interface/sb_fuel/fueluifooter.png b/interface/sb_fuel/fueluifooter.png index acfeeee7..f78de126 100644 Binary files a/interface/sb_fuel/fueluifooter.png and b/interface/sb_fuel/fueluifooter.png differ diff --git a/interface/sb_fuel/fueluiheader.png b/interface/sb_fuel/fueluiheader.png index 30e2e806..bfc5db90 100644 Binary files a/interface/sb_fuel/fueluiheader.png and b/interface/sb_fuel/fueluiheader.png differ diff --git a/interface/sb_inventory/dot2.png b/interface/sb_inventory/dot2.png deleted file mode 100644 index bddf125e..00000000 Binary files a/interface/sb_inventory/dot2.png and /dev/null differ diff --git a/interface/sb_inventory/empty.png b/interface/sb_inventory/empty.png deleted file mode 100644 index 7fb8d408..00000000 Binary files a/interface/sb_inventory/empty.png and /dev/null differ diff --git a/interface/sb_inventory/gun.png b/interface/sb_inventory/gun.png deleted file mode 100644 index f344e317..00000000 Binary files a/interface/sb_inventory/gun.png and /dev/null differ diff --git a/interface/sb_inventory/portrait.png b/interface/sb_inventory/portrait.png deleted file mode 100644 index 59c8fc5e..00000000 Binary files a/interface/sb_inventory/portrait.png and /dev/null differ diff --git a/interface/sb_inventory/x.png b/interface/sb_inventory/x.png deleted file mode 100644 index 0deb280c..00000000 Binary files a/interface/sb_inventory/x.png and /dev/null differ diff --git a/interface/sb_inventory/xhover.png b/interface/sb_inventory/xhover.png deleted file mode 100644 index 6bad1556..00000000 Binary files a/interface/sb_inventory/xhover.png and /dev/null differ diff --git a/interface/sb_inventory/xpress.png b/interface/sb_inventory/xpress.png deleted file mode 100644 index af0a4231..00000000 Binary files a/interface/sb_inventory/xpress.png and /dev/null differ diff --git a/interface/sb_numbers.png b/interface/sb_numbers.png index fce6793a..e91308c9 100644 Binary files a/interface/sb_numbers.png and b/interface/sb_numbers.png differ diff --git a/interface/sb_objectcrafting/arrow.png b/interface/sb_objectcrafting/arrow.png index 398632f1..08f2c7a8 100644 Binary files a/interface/sb_objectcrafting/arrow.png and b/interface/sb_objectcrafting/arrow.png differ diff --git a/interface/sb_objectcrafting/campfire_body.png b/interface/sb_objectcrafting/campfire_body.png index 966e1ae5..dba938ef 100644 Binary files a/interface/sb_objectcrafting/campfire_body.png and b/interface/sb_objectcrafting/campfire_body.png differ diff --git a/interface/sb_objectcrafting/campfire_footer.png b/interface/sb_objectcrafting/campfire_footer.png index 758edece..85edfb9f 100644 Binary files a/interface/sb_objectcrafting/campfire_footer.png and b/interface/sb_objectcrafting/campfire_footer.png differ diff --git a/interface/sb_objectcrafting/campfire_header.png b/interface/sb_objectcrafting/campfire_header.png index a19b621c..d1755219 100644 Binary files a/interface/sb_objectcrafting/campfire_header.png and b/interface/sb_objectcrafting/campfire_header.png differ diff --git a/interface/sb_objectcrafting/campfire_shine.png b/interface/sb_objectcrafting/campfire_shine.png index 88f364a8..311da490 100644 Binary files a/interface/sb_objectcrafting/campfire_shine.png and b/interface/sb_objectcrafting/campfire_shine.png differ diff --git a/interface/sb_objectcrafting/coffeemachine.config b/interface/sb_objectcrafting/coffeemachine.config index 0c7abc84..5c242bd8 100644 --- a/interface/sb_objectcrafting/coffeemachine.config +++ b/interface/sb_objectcrafting/coffeemachine.config @@ -36,9 +36,9 @@ "close": { "zlevel": 3, "type": "button", - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "callback": "close", "position": [123, 22], "pressedOffset": [0, 0] diff --git a/interface/sb_objectcrafting/coffeemachine_footer.png b/interface/sb_objectcrafting/coffeemachine_footer.png index d972c97e..c3de7bd9 100644 Binary files a/interface/sb_objectcrafting/coffeemachine_footer.png and b/interface/sb_objectcrafting/coffeemachine_footer.png differ diff --git a/interface/sb_objectcrafting/coffeemachine_shine.png b/interface/sb_objectcrafting/coffeemachine_shine.png index 88f364a8..311da490 100644 Binary files a/interface/sb_objectcrafting/coffeemachine_shine.png and b/interface/sb_objectcrafting/coffeemachine_shine.png differ diff --git a/interface/sb_objectcrafting/stonefurnace.config b/interface/sb_objectcrafting/stonefurnace.config index 46cb706c..04e08fc0 100644 --- a/interface/sb_objectcrafting/stonefurnace.config +++ b/interface/sb_objectcrafting/stonefurnace.config @@ -19,7 +19,7 @@ "position": [74, 37], "dimensions": [1, 1], "spacing": [19, 19], - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "outputItemGrid": { "type": "itemgrid", @@ -27,7 +27,7 @@ "position": [110, 37], "dimensions": [1, 1], "spacing": [19, 19], - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "pointer": { "type": "image", @@ -37,9 +37,9 @@ "close": { "zlevel": 3, "type": "button", - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "callback": "close", "position": [123, 22], "pressedOffset": [0, 0] diff --git a/interface/sb_objectcrafting/wrapping.config b/interface/sb_objectcrafting/wrapping.config index c4152470..13c2b360 100644 --- a/interface/sb_objectcrafting/wrapping.config +++ b/interface/sb_objectcrafting/wrapping.config @@ -38,14 +38,14 @@ "position": [20, 55], "dimensions": [7, 1], "spacing": [19, 19], - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "close": { "zlevel": 3, "type": "button", - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "callback": "close", "position": [155, 81], "pressedOffset": [0, 0] diff --git a/interface/sb_objectcrafting/wrapping_body.png b/interface/sb_objectcrafting/wrapping_body.png index c491a6f5..e0124e48 100644 Binary files a/interface/sb_objectcrafting/wrapping_body.png and b/interface/sb_objectcrafting/wrapping_body.png differ diff --git a/interface/sb_objectcrafting/wrapping_footer.png b/interface/sb_objectcrafting/wrapping_footer.png index 42b25389..6cf7bd34 100644 Binary files a/interface/sb_objectcrafting/wrapping_footer.png and b/interface/sb_objectcrafting/wrapping_footer.png differ diff --git a/interface/sb_objectcrafting/wrapping_header.png b/interface/sb_objectcrafting/wrapping_header.png index 2dbe2e5f..f1bcc7b4 100644 Binary files a/interface/sb_objectcrafting/wrapping_header.png and b/interface/sb_objectcrafting/wrapping_header.png differ diff --git a/interface/sb_quests/acceptover.png b/interface/sb_quests/acceptover.png index 78d621c4..f0b11fc7 100644 Binary files a/interface/sb_quests/acceptover.png and b/interface/sb_quests/acceptover.png differ diff --git a/interface/sb_quests/acceptup.png b/interface/sb_quests/acceptup.png index ccf09a8e..2ef77991 100644 Binary files a/interface/sb_quests/acceptup.png and b/interface/sb_quests/acceptup.png differ diff --git a/interface/sb_quests/mainquestgiver.png b/interface/sb_quests/mainquestgiver.png index 97057ac1..47472dae 100644 Binary files a/interface/sb_quests/mainquestgiver.png and b/interface/sb_quests/mainquestgiver.png differ diff --git a/interface/sb_quests/mainquestreceiver.png b/interface/sb_quests/mainquestreceiver.png index 5d21a3b2..754693f8 100644 Binary files a/interface/sb_quests/mainquestreceiver.png and b/interface/sb_quests/mainquestreceiver.png differ diff --git a/interface/sb_quests/money.png b/interface/sb_quests/money.png index b9c1f190..08475d34 100644 Binary files a/interface/sb_quests/money.png and b/interface/sb_quests/money.png differ diff --git a/interface/sb_quests/newquest/body.png b/interface/sb_quests/newquest/body.png index 1e0578f3..9dc1f2fb 100644 Binary files a/interface/sb_quests/newquest/body.png and b/interface/sb_quests/newquest/body.png differ diff --git a/interface/sb_quests/newquest/details.png b/interface/sb_quests/newquest/details.png index fe4d8b75..b35774c0 100644 Binary files a/interface/sb_quests/newquest/details.png and b/interface/sb_quests/newquest/details.png differ diff --git a/interface/sb_quests/newquest/footer.png b/interface/sb_quests/newquest/footer.png index cf943453..e3b44b80 100644 Binary files a/interface/sb_quests/newquest/footer.png and b/interface/sb_quests/newquest/footer.png differ diff --git a/interface/sb_quests/newquest/header.png b/interface/sb_quests/newquest/header.png index a71f0d9b..33e9dde5 100644 Binary files a/interface/sb_quests/newquest/header.png and b/interface/sb_quests/newquest/header.png differ diff --git a/interface/sb_quests/newquest/newquest.png b/interface/sb_quests/newquest/newquest.png index 2233dfce..0fde17cd 100644 Binary files a/interface/sb_quests/newquest/newquest.png and b/interface/sb_quests/newquest/newquest.png differ diff --git a/interface/sb_quests/newquest/rejectover.png b/interface/sb_quests/newquest/rejectover.png index 548870e7..96c43aad 100644 Binary files a/interface/sb_quests/newquest/rejectover.png and b/interface/sb_quests/newquest/rejectover.png differ diff --git a/interface/sb_quests/newquest/rejectup.png b/interface/sb_quests/newquest/rejectup.png index 8bdf2cc3..617fcd4b 100644 Binary files a/interface/sb_quests/newquest/rejectup.png and b/interface/sb_quests/newquest/rejectup.png differ diff --git a/interface/sb_quests/newquest/shine.png b/interface/sb_quests/newquest/shine.png index b285dd29..f4506f64 100644 Binary files a/interface/sb_quests/newquest/shine.png and b/interface/sb_quests/newquest/shine.png differ diff --git a/interface/sb_quests/questcomplete/body.png b/interface/sb_quests/questcomplete/body.png index 1cc8fb04..97284b36 100644 Binary files a/interface/sb_quests/questcomplete/body.png and b/interface/sb_quests/questcomplete/body.png differ diff --git a/interface/sb_quests/questcomplete/details.png b/interface/sb_quests/questcomplete/details.png index 6494627e..9a4683d3 100644 Binary files a/interface/sb_quests/questcomplete/details.png and b/interface/sb_quests/questcomplete/details.png differ diff --git a/interface/sb_quests/questcomplete/footer.png b/interface/sb_quests/questcomplete/footer.png index cf943453..e3b44b80 100644 Binary files a/interface/sb_quests/questcomplete/footer.png and b/interface/sb_quests/questcomplete/footer.png differ diff --git a/interface/sb_quests/questcomplete/header.png b/interface/sb_quests/questcomplete/header.png index a71f0d9b..33e9dde5 100644 Binary files a/interface/sb_quests/questcomplete/header.png and b/interface/sb_quests/questcomplete/header.png differ diff --git a/interface/sb_quests/questcomplete/questcomplete.png b/interface/sb_quests/questcomplete/questcomplete.png index 6ef31261..26a5e7db 100644 Binary files a/interface/sb_quests/questcomplete/questcomplete.png and b/interface/sb_quests/questcomplete/questcomplete.png differ diff --git a/interface/sb_quests/questcomplete/shine.png b/interface/sb_quests/questcomplete/shine.png index 355267e0..dbffc878 100644 Binary files a/interface/sb_quests/questcomplete/shine.png and b/interface/sb_quests/questcomplete/shine.png differ diff --git a/interface/sb_quests/questfailed.png b/interface/sb_quests/questfailed.png index 00c02ea7..f06f5a08 100644 Binary files a/interface/sb_quests/questfailed.png and b/interface/sb_quests/questfailed.png differ diff --git a/interface/sb_quests/sadokayover.png b/interface/sb_quests/sadokayover.png index 7b9d53e9..64df6307 100644 Binary files a/interface/sb_quests/sadokayover.png and b/interface/sb_quests/sadokayover.png differ diff --git a/interface/sb_quests/sadokayup.png b/interface/sb_quests/sadokayup.png index 6d8b0edb..29101859 100644 Binary files a/interface/sb_quests/sadokayup.png and b/interface/sb_quests/sadokayup.png differ diff --git a/interface/sb_tooltips/acidclustergrenade.png b/interface/sb_tooltips/acidclustergrenade.png index e011c41d..783f6887 100644 Binary files a/interface/sb_tooltips/acidclustergrenade.png and b/interface/sb_tooltips/acidclustergrenade.png differ diff --git a/interface/sb_tooltips/acidgrenade.png b/interface/sb_tooltips/acidgrenade.png index 5ef1e835..51e0a8c5 100644 Binary files a/interface/sb_tooltips/acidgrenade.png and b/interface/sb_tooltips/acidgrenade.png differ diff --git a/interface/sb_tooltips/acidspit.png b/interface/sb_tooltips/acidspit.png index 70775cb1..700546d5 100644 Binary files a/interface/sb_tooltips/acidspit.png and b/interface/sb_tooltips/acidspit.png differ diff --git a/interface/sb_tooltips/airburstelectricbullet.png b/interface/sb_tooltips/airburstelectricbullet.png index f7134952..94609bfd 100644 Binary files a/interface/sb_tooltips/airburstelectricbullet.png and b/interface/sb_tooltips/airburstelectricbullet.png differ diff --git a/interface/sb_tooltips/airburstfirebullet.png b/interface/sb_tooltips/airburstfirebullet.png index 5730b7da..866290d1 100644 Binary files a/interface/sb_tooltips/airburstfirebullet.png and b/interface/sb_tooltips/airburstfirebullet.png differ diff --git a/interface/sb_tooltips/airburstpoisonbullet.png b/interface/sb_tooltips/airburstpoisonbullet.png index 9c92517f..dc6ef4eb 100644 Binary files a/interface/sb_tooltips/airburstpoisonbullet.png and b/interface/sb_tooltips/airburstpoisonbullet.png differ diff --git a/interface/sb_tooltips/assetmissing.png b/interface/sb_tooltips/assetmissing.png index be42152f..9190d520 100644 Binary files a/interface/sb_tooltips/assetmissing.png and b/interface/sb_tooltips/assetmissing.png differ diff --git a/interface/sb_tooltips/blueplasmabullet.png b/interface/sb_tooltips/blueplasmabullet.png index dff49e44..b9b90577 100644 Binary files a/interface/sb_tooltips/blueplasmabullet.png and b/interface/sb_tooltips/blueplasmabullet.png differ diff --git a/interface/sb_tooltips/bomb.png b/interface/sb_tooltips/bomb.png index 2786d8cc..866dd3ea 100644 Binary files a/interface/sb_tooltips/bomb.png and b/interface/sb_tooltips/bomb.png differ diff --git a/interface/sb_tooltips/bonechain1.png b/interface/sb_tooltips/bonechain1.png index 59cff078..6a286695 100644 Binary files a/interface/sb_tooltips/bonechain1.png and b/interface/sb_tooltips/bonechain1.png differ diff --git a/interface/sb_tooltips/bonethorn.png b/interface/sb_tooltips/bonethorn.png index 3fb93820..59db930c 100644 Binary files a/interface/sb_tooltips/bonethorn.png and b/interface/sb_tooltips/bonethorn.png differ diff --git a/interface/sb_tooltips/boomblast.png b/interface/sb_tooltips/boomblast.png index 38e35f44..d3f8dfe3 100644 Binary files a/interface/sb_tooltips/boomblast.png and b/interface/sb_tooltips/boomblast.png differ diff --git a/interface/sb_tooltips/bouncyclustergrenade.png b/interface/sb_tooltips/bouncyclustergrenade.png index a3e7e4f3..ccbcaeba 100644 Binary files a/interface/sb_tooltips/bouncyclustergrenade.png and b/interface/sb_tooltips/bouncyclustergrenade.png differ diff --git a/interface/sb_tooltips/bullet-2.png b/interface/sb_tooltips/bullet-2.png index 3791c2ee..a30364d3 100644 Binary files a/interface/sb_tooltips/bullet-2.png and b/interface/sb_tooltips/bullet-2.png differ diff --git a/interface/sb_tooltips/bullet-4.png b/interface/sb_tooltips/bullet-4.png index 27d6e69e..124dabc5 100644 Binary files a/interface/sb_tooltips/bullet-4.png and b/interface/sb_tooltips/bullet-4.png differ diff --git a/interface/sb_tooltips/cellblast.png b/interface/sb_tooltips/cellblast.png index f6e15c40..3e4af60d 100644 Binary files a/interface/sb_tooltips/cellblast.png and b/interface/sb_tooltips/cellblast.png differ diff --git a/interface/sb_tooltips/cellzap1.png b/interface/sb_tooltips/cellzap1.png index 5a615ef9..18f0b7a5 100644 Binary files a/interface/sb_tooltips/cellzap1.png and b/interface/sb_tooltips/cellzap1.png differ diff --git a/interface/sb_tooltips/cellzap2.png b/interface/sb_tooltips/cellzap2.png index 3997fb31..9d2fe7a1 100644 Binary files a/interface/sb_tooltips/cellzap2.png and b/interface/sb_tooltips/cellzap2.png differ diff --git a/interface/sb_tooltips/cellzap3.png b/interface/sb_tooltips/cellzap3.png index 1f49d2b8..930f3585 100644 Binary files a/interface/sb_tooltips/cellzap3.png and b/interface/sb_tooltips/cellzap3.png differ diff --git a/interface/sb_tooltips/cellzap4.png b/interface/sb_tooltips/cellzap4.png index 06325309..0883a723 100644 Binary files a/interface/sb_tooltips/cellzap4.png and b/interface/sb_tooltips/cellzap4.png differ diff --git a/interface/sb_tooltips/cellzap5.png b/interface/sb_tooltips/cellzap5.png index b982c896..371f9210 100644 Binary files a/interface/sb_tooltips/cellzap5.png and b/interface/sb_tooltips/cellzap5.png differ diff --git a/interface/sb_tooltips/clustergrenade.png b/interface/sb_tooltips/clustergrenade.png index 78849353..b63992a4 100644 Binary files a/interface/sb_tooltips/clustergrenade.png and b/interface/sb_tooltips/clustergrenade.png differ diff --git a/interface/sb_tooltips/crystalslide.png b/interface/sb_tooltips/crystalslide.png index 5a799160..05e3ae83 100644 Binary files a/interface/sb_tooltips/crystalslide.png and b/interface/sb_tooltips/crystalslide.png differ diff --git a/interface/sb_tooltips/electric.png b/interface/sb_tooltips/electric.png index f7134952..94609bfd 100644 Binary files a/interface/sb_tooltips/electric.png and b/interface/sb_tooltips/electric.png differ diff --git a/interface/sb_tooltips/electricbolt.png b/interface/sb_tooltips/electricbolt.png index ee7522d9..27830ceb 100644 Binary files a/interface/sb_tooltips/electricbolt.png and b/interface/sb_tooltips/electricbolt.png differ diff --git a/interface/sb_tooltips/electricexplosion.png b/interface/sb_tooltips/electricexplosion.png index 8be4686c..f0689f85 100644 Binary files a/interface/sb_tooltips/electricexplosion.png and b/interface/sb_tooltips/electricexplosion.png differ diff --git a/interface/sb_tooltips/electro.png b/interface/sb_tooltips/electro.png index 7faf2cf1..049e1cf7 100644 Binary files a/interface/sb_tooltips/electro.png and b/interface/sb_tooltips/electro.png differ diff --git a/interface/sb_tooltips/explosivebolt.png b/interface/sb_tooltips/explosivebolt.png index 60b4d37e..7e538ff4 100644 Binary files a/interface/sb_tooltips/explosivebolt.png and b/interface/sb_tooltips/explosivebolt.png differ diff --git a/interface/sb_tooltips/eyeball.png b/interface/sb_tooltips/eyeball.png index bbe1f31e..34a8fe1f 100644 Binary files a/interface/sb_tooltips/eyeball.png and b/interface/sb_tooltips/eyeball.png differ diff --git a/interface/sb_tooltips/fast.png b/interface/sb_tooltips/fast.png index 4fb1c37d..484ae44d 100644 Binary files a/interface/sb_tooltips/fast.png and b/interface/sb_tooltips/fast.png differ diff --git a/interface/sb_tooltips/fire.png b/interface/sb_tooltips/fire.png index 5730b7da..866290d1 100644 Binary files a/interface/sb_tooltips/fire.png and b/interface/sb_tooltips/fire.png differ diff --git a/interface/sb_tooltips/fireball.png b/interface/sb_tooltips/fireball.png index 0c50418d..b2b40cbd 100644 Binary files a/interface/sb_tooltips/fireball.png and b/interface/sb_tooltips/fireball.png differ diff --git a/interface/sb_tooltips/flamearrow.png b/interface/sb_tooltips/flamearrow.png index 37bad080..9305e170 100644 Binary files a/interface/sb_tooltips/flamearrow.png and b/interface/sb_tooltips/flamearrow.png differ diff --git a/interface/sb_tooltips/flamebolt.png b/interface/sb_tooltips/flamebolt.png index 282b152d..e728445d 100644 Binary files a/interface/sb_tooltips/flamebolt.png and b/interface/sb_tooltips/flamebolt.png differ diff --git a/interface/sb_tooltips/flamethrower.png b/interface/sb_tooltips/flamethrower.png index c2f70992..aaa91619 100644 Binary files a/interface/sb_tooltips/flamethrower.png and b/interface/sb_tooltips/flamethrower.png differ diff --git a/interface/sb_tooltips/glassslide.png b/interface/sb_tooltips/glassslide.png index 91aee345..d925377d 100644 Binary files a/interface/sb_tooltips/glassslide.png and b/interface/sb_tooltips/glassslide.png differ diff --git a/interface/sb_tooltips/goldslide.png b/interface/sb_tooltips/goldslide.png index 86e60eaa..bd9a7149 100644 Binary files a/interface/sb_tooltips/goldslide.png and b/interface/sb_tooltips/goldslide.png differ diff --git a/interface/sb_tooltips/gravitybomb.png b/interface/sb_tooltips/gravitybomb.png index 4e583fa2..34837e9f 100644 Binary files a/interface/sb_tooltips/gravitybomb.png and b/interface/sb_tooltips/gravitybomb.png differ diff --git a/interface/sb_tooltips/greenglobe.png b/interface/sb_tooltips/greenglobe.png index d6451e4a..1bab6e4c 100644 Binary files a/interface/sb_tooltips/greenglobe.png and b/interface/sb_tooltips/greenglobe.png differ diff --git a/interface/sb_tooltips/greenplasmabullet.png b/interface/sb_tooltips/greenplasmabullet.png index ad03fbc5..9597019c 100644 Binary files a/interface/sb_tooltips/greenplasmabullet.png and b/interface/sb_tooltips/greenplasmabullet.png differ diff --git a/interface/sb_tooltips/heartarrow.png b/interface/sb_tooltips/heartarrow.png index 815fd056..f81cffe8 100644 Binary files a/interface/sb_tooltips/heartarrow.png and b/interface/sb_tooltips/heartarrow.png differ diff --git a/interface/sb_tooltips/homingrocket.png b/interface/sb_tooltips/homingrocket.png index 52e2f3c9..5d878d76 100644 Binary files a/interface/sb_tooltips/homingrocket.png and b/interface/sb_tooltips/homingrocket.png differ diff --git a/interface/sb_tooltips/icebolt.png b/interface/sb_tooltips/icebolt.png index 6a98e6d4..4020deaf 100644 Binary files a/interface/sb_tooltips/icebolt.png and b/interface/sb_tooltips/icebolt.png differ diff --git a/interface/sb_tooltips/icecrabcanosnowball.png b/interface/sb_tooltips/icecrabcanosnowball.png index f531d8a2..629cdd6c 100644 Binary files a/interface/sb_tooltips/icecrabcanosnowball.png and b/interface/sb_tooltips/icecrabcanosnowball.png differ diff --git a/interface/sb_tooltips/icethrower.png b/interface/sb_tooltips/icethrower.png index 48e4def6..03d00b1a 100644 Binary files a/interface/sb_tooltips/icethrower.png and b/interface/sb_tooltips/icethrower.png differ diff --git a/interface/sb_tooltips/jellybossgoo.png b/interface/sb_tooltips/jellybossgoo.png deleted file mode 100644 index cea8b1fa..00000000 Binary files a/interface/sb_tooltips/jellybossgoo.png and /dev/null differ diff --git a/interface/sb_tooltips/lavaballoon.png b/interface/sb_tooltips/lavaballoon.png deleted file mode 100644 index 3f7a2189..00000000 Binary files a/interface/sb_tooltips/lavaballoon.png and /dev/null differ diff --git a/interface/sb_tooltips/lightball.png b/interface/sb_tooltips/lightball.png index 8dc49e01..238acc75 100644 Binary files a/interface/sb_tooltips/lightball.png and b/interface/sb_tooltips/lightball.png differ diff --git a/interface/sb_tooltips/lightning2.png b/interface/sb_tooltips/lightning2.png index f7134952..94609bfd 100644 Binary files a/interface/sb_tooltips/lightning2.png and b/interface/sb_tooltips/lightning2.png differ diff --git a/interface/sb_tooltips/lightningthrower.png b/interface/sb_tooltips/lightningthrower.png index 85eaf96e..97f14ca9 100644 Binary files a/interface/sb_tooltips/lightningthrower.png and b/interface/sb_tooltips/lightningthrower.png differ diff --git a/interface/sb_tooltips/magentaglobe.png b/interface/sb_tooltips/magentaglobe.png index 856eb719..d940fa48 100644 Binary files a/interface/sb_tooltips/magentaglobe.png and b/interface/sb_tooltips/magentaglobe.png differ diff --git a/interface/sb_tooltips/marioball.png b/interface/sb_tooltips/marioball.png index bc82c0bd..584907b5 100644 Binary files a/interface/sb_tooltips/marioball.png and b/interface/sb_tooltips/marioball.png differ diff --git a/interface/sb_tooltips/needlerthorns.png b/interface/sb_tooltips/needlerthorns.png index 3a41cd58..e3320b23 100644 Binary files a/interface/sb_tooltips/needlerthorns.png and b/interface/sb_tooltips/needlerthorns.png differ diff --git a/interface/sb_tooltips/orangeglobe.png b/interface/sb_tooltips/orangeglobe.png index 569f9bcd..76afe509 100644 Binary files a/interface/sb_tooltips/orangeglobe.png and b/interface/sb_tooltips/orangeglobe.png differ diff --git a/interface/sb_tooltips/pellet.png b/interface/sb_tooltips/pellet.png index d2cb5986..491f1f3d 100644 Binary files a/interface/sb_tooltips/pellet.png and b/interface/sb_tooltips/pellet.png differ diff --git a/interface/sb_tooltips/pig.png b/interface/sb_tooltips/pig.png index bdd1be6e..302fc796 100644 Binary files a/interface/sb_tooltips/pig.png and b/interface/sb_tooltips/pig.png differ diff --git a/interface/sb_tooltips/pinkplasma.png b/interface/sb_tooltips/pinkplasma.png index 3eff5f1d..28563b0e 100644 Binary files a/interface/sb_tooltips/pinkplasma.png and b/interface/sb_tooltips/pinkplasma.png differ diff --git a/interface/sb_tooltips/plasma1.png b/interface/sb_tooltips/plasma1.png index 2f6c4566..c24efcdc 100644 Binary files a/interface/sb_tooltips/plasma1.png and b/interface/sb_tooltips/plasma1.png differ diff --git a/interface/sb_tooltips/plasma2.png b/interface/sb_tooltips/plasma2.png index 6d1d2b0c..287827af 100644 Binary files a/interface/sb_tooltips/plasma2.png and b/interface/sb_tooltips/plasma2.png differ diff --git a/interface/sb_tooltips/plasma3.png b/interface/sb_tooltips/plasma3.png index ea68a02f..9facbaed 100644 Binary files a/interface/sb_tooltips/plasma3.png and b/interface/sb_tooltips/plasma3.png differ diff --git a/interface/sb_tooltips/plasma4.png b/interface/sb_tooltips/plasma4.png index c3f72352..aa38ce0d 100644 Binary files a/interface/sb_tooltips/plasma4.png and b/interface/sb_tooltips/plasma4.png differ diff --git a/interface/sb_tooltips/plasmabouncer.png b/interface/sb_tooltips/plasmabouncer.png index 80006000..9f18bdf3 100644 Binary files a/interface/sb_tooltips/plasmabouncer.png and b/interface/sb_tooltips/plasmabouncer.png differ diff --git a/interface/sb_tooltips/plasmabullet.png b/interface/sb_tooltips/plasmabullet.png index 16456a44..3d5cb576 100644 Binary files a/interface/sb_tooltips/plasmabullet.png and b/interface/sb_tooltips/plasmabullet.png differ diff --git a/interface/sb_tooltips/plasmapulse.png b/interface/sb_tooltips/plasmapulse.png index 5a3ba8f7..8ec8d785 100644 Binary files a/interface/sb_tooltips/plasmapulse.png and b/interface/sb_tooltips/plasmapulse.png differ diff --git a/interface/sb_tooltips/poison.png b/interface/sb_tooltips/poison.png index 9c92517f..dc6ef4eb 100644 Binary files a/interface/sb_tooltips/poison.png and b/interface/sb_tooltips/poison.png differ diff --git a/interface/sb_tooltips/poisonbolt.png b/interface/sb_tooltips/poisonbolt.png index 8ee1cd61..dfa9117f 100644 Binary files a/interface/sb_tooltips/poisonbolt.png and b/interface/sb_tooltips/poisonbolt.png differ diff --git a/interface/sb_tooltips/poisonthrower.png b/interface/sb_tooltips/poisonthrower.png index 9d78bd1d..4f722420 100644 Binary files a/interface/sb_tooltips/poisonthrower.png and b/interface/sb_tooltips/poisonthrower.png differ diff --git a/interface/sb_tooltips/purplearrow.png b/interface/sb_tooltips/purplearrow.png index a9621c09..1ef60d8d 100644 Binary files a/interface/sb_tooltips/purplearrow.png and b/interface/sb_tooltips/purplearrow.png differ diff --git a/interface/sb_tooltips/sb_aegisaltarrow.png b/interface/sb_tooltips/sb_aegisaltarrow.png index ec11ec1a..3c661632 100644 Binary files a/interface/sb_tooltips/sb_aegisaltarrow.png and b/interface/sb_tooltips/sb_aegisaltarrow.png differ diff --git a/interface/sb_tooltips/sb_biolightball.png b/interface/sb_tooltips/sb_biolightball.png index d63ff454..71312473 100644 Binary files a/interface/sb_tooltips/sb_biolightball.png and b/interface/sb_tooltips/sb_biolightball.png differ diff --git a/interface/sb_tooltips/sb_boneswoosh.png b/interface/sb_tooltips/sb_boneswoosh.png index 72e0760d..9dab0ee4 100644 Binary files a/interface/sb_tooltips/sb_boneswoosh.png and b/interface/sb_tooltips/sb_boneswoosh.png differ diff --git a/interface/sb_tooltips/sb_cactislammer.png b/interface/sb_tooltips/sb_cactislammer.png index 40a4a7e2..dfdf651d 100644 Binary files a/interface/sb_tooltips/sb_cactislammer.png and b/interface/sb_tooltips/sb_cactislammer.png differ diff --git a/interface/sb_tooltips/sb_cellblastx.png b/interface/sb_tooltips/sb_cellblastx.png index 35bdec04..742fe484 100644 Binary files a/interface/sb_tooltips/sb_cellblastx.png and b/interface/sb_tooltips/sb_cellblastx.png differ diff --git a/interface/sb_tooltips/sb_coralswoosh.png b/interface/sb_tooltips/sb_coralswoosh.png index bc946bd7..510738d7 100644 Binary files a/interface/sb_tooltips/sb_coralswoosh.png and b/interface/sb_tooltips/sb_coralswoosh.png differ diff --git a/interface/sb_tooltips/sb_coralswooshx.png b/interface/sb_tooltips/sb_coralswooshx.png index fc9a8d47..6856dca7 100644 Binary files a/interface/sb_tooltips/sb_coralswooshx.png and b/interface/sb_tooltips/sb_coralswooshx.png differ diff --git a/interface/sb_tooltips/sb_deadbolt.png b/interface/sb_tooltips/sb_deadbolt.png index 68541944..791c37ab 100644 Binary files a/interface/sb_tooltips/sb_deadbolt.png and b/interface/sb_tooltips/sb_deadbolt.png differ diff --git a/interface/sb_tooltips/sb_fastflame.png b/interface/sb_tooltips/sb_fastflame.png new file mode 100644 index 00000000..2f586799 Binary files /dev/null and b/interface/sb_tooltips/sb_fastflame.png differ diff --git a/interface/sb_tooltips/sb_fireswirl.png b/interface/sb_tooltips/sb_fireswirl.png index d3772dd9..2080741d 100644 Binary files a/interface/sb_tooltips/sb_fireswirl.png and b/interface/sb_tooltips/sb_fireswirl.png differ diff --git a/interface/sb_tooltips/sb_fleshseedspawn.png b/interface/sb_tooltips/sb_fleshseedspawn.png index bf8a5553..3f4a8465 100644 Binary files a/interface/sb_tooltips/sb_fleshseedspawn.png and b/interface/sb_tooltips/sb_fleshseedspawn.png differ diff --git a/interface/sb_tooltips/sb_frozenflamearrow.png b/interface/sb_tooltips/sb_frozenflamearrow.png index 1f5db4d4..8a8b5913 100644 Binary files a/interface/sb_tooltips/sb_frozenflamearrow.png and b/interface/sb_tooltips/sb_frozenflamearrow.png differ diff --git a/interface/sb_tooltips/sb_heckarrow.png b/interface/sb_tooltips/sb_heckarrow.png index 66b5d444..d3a62572 100644 Binary files a/interface/sb_tooltips/sb_heckarrow.png and b/interface/sb_tooltips/sb_heckarrow.png differ diff --git a/interface/sb_tooltips/sb_heckbloodspawn.png b/interface/sb_tooltips/sb_heckbloodspawn.png index e14ffc7b..5160a7ef 100644 Binary files a/interface/sb_tooltips/sb_heckbloodspawn.png and b/interface/sb_tooltips/sb_heckbloodspawn.png differ diff --git a/interface/sb_tooltips/sb_heckbloodspawnx.png b/interface/sb_tooltips/sb_heckbloodspawnx.png index 49a4aa72..3a7391e9 100644 Binary files a/interface/sb_tooltips/sb_heckbloodspawnx.png and b/interface/sb_tooltips/sb_heckbloodspawnx.png differ diff --git a/interface/sb_tooltips/sb_hivebug.png b/interface/sb_tooltips/sb_hivebug.png index ad92b2de..bea3700d 100644 Binary files a/interface/sb_tooltips/sb_hivebug.png and b/interface/sb_tooltips/sb_hivebug.png differ diff --git a/interface/sb_tooltips/sb_hivebugx.png b/interface/sb_tooltips/sb_hivebugx.png index 25c65276..6d39c8bf 100644 Binary files a/interface/sb_tooltips/sb_hivebugx.png and b/interface/sb_tooltips/sb_hivebugx.png differ diff --git a/interface/sb_tooltips/sb_hiveclusterx.png b/interface/sb_tooltips/sb_hiveclusterx.png index da9c966a..9f592608 100644 Binary files a/interface/sb_tooltips/sb_hiveclusterx.png and b/interface/sb_tooltips/sb_hiveclusterx.png differ diff --git a/interface/sb_tooltips/sb_homingbullet.png b/interface/sb_tooltips/sb_homingbullet.png new file mode 100644 index 00000000..a7b325dd Binary files /dev/null and b/interface/sb_tooltips/sb_homingbullet.png differ diff --git a/interface/sb_tooltips/sb_monkeynut.png b/interface/sb_tooltips/sb_monkeynut.png index f0bbd165..93166f3c 100644 Binary files a/interface/sb_tooltips/sb_monkeynut.png and b/interface/sb_tooltips/sb_monkeynut.png differ diff --git a/interface/sb_tooltips/sb_multisporecloudx.png b/interface/sb_tooltips/sb_multisporecloudx.png index bdcc64e4..f7370297 100644 Binary files a/interface/sb_tooltips/sb_multisporecloudx.png and b/interface/sb_tooltips/sb_multisporecloudx.png differ diff --git a/interface/sb_tooltips/sb_plasmacrystal.png b/interface/sb_tooltips/sb_plasmacrystal.png index 71f14b23..06be84fc 100644 Binary files a/interface/sb_tooltips/sb_plasmacrystal.png and b/interface/sb_tooltips/sb_plasmacrystal.png differ diff --git a/interface/sb_tooltips/sb_plasmacrystalx.png b/interface/sb_tooltips/sb_plasmacrystalx.png index 16ab4238..a5a83132 100644 Binary files a/interface/sb_tooltips/sb_plasmacrystalx.png and b/interface/sb_tooltips/sb_plasmacrystalx.png differ diff --git a/interface/sb_tooltips/sb_slingshot.png b/interface/sb_tooltips/sb_slingshot.png index 729c6d2f..1019f6c9 100644 Binary files a/interface/sb_tooltips/sb_slingshot.png and b/interface/sb_tooltips/sb_slingshot.png differ diff --git a/interface/sb_tooltips/sb_starcleaverboom.png b/interface/sb_tooltips/sb_starcleaverboom.png index e8de892b..396d515e 100644 Binary files a/interface/sb_tooltips/sb_starcleaverboom.png and b/interface/sb_tooltips/sb_starcleaverboom.png differ diff --git a/interface/sb_tooltips/sb_twistedspearchain1.png b/interface/sb_tooltips/sb_twistedspearchain1.png index 3cd3c52e..0e6e9ce9 100644 Binary files a/interface/sb_tooltips/sb_twistedspearchain1.png and b/interface/sb_tooltips/sb_twistedspearchain1.png differ diff --git a/interface/sb_tooltips/sb_twistedspearchain2.png b/interface/sb_tooltips/sb_twistedspearchain2.png index 6e4f636c..8a94c9cd 100644 Binary files a/interface/sb_tooltips/sb_twistedspearchain2.png and b/interface/sb_tooltips/sb_twistedspearchain2.png differ diff --git a/interface/sb_tooltips/sb_twistedspearchain3.png b/interface/sb_tooltips/sb_twistedspearchain3.png index a5aa265e..7f8b1e29 100644 Binary files a/interface/sb_tooltips/sb_twistedspearchain3.png and b/interface/sb_tooltips/sb_twistedspearchain3.png differ diff --git a/interface/sb_tooltips/shock.png b/interface/sb_tooltips/shock.png index e8977041..18f31199 100644 Binary files a/interface/sb_tooltips/shock.png and b/interface/sb_tooltips/shock.png differ diff --git a/interface/sb_tooltips/shockbomb.png b/interface/sb_tooltips/shockbomb.png index ed46bf42..f8fbbd11 100644 Binary files a/interface/sb_tooltips/shockbomb.png and b/interface/sb_tooltips/shockbomb.png differ diff --git a/interface/sb_tooltips/shuriken.png b/interface/sb_tooltips/shuriken.png index 9c4b9176..2cfaa75f 100644 Binary files a/interface/sb_tooltips/shuriken.png and b/interface/sb_tooltips/shuriken.png differ diff --git a/interface/sb_tooltips/slimeexplosion.png b/interface/sb_tooltips/slimeexplosion.png index e04893e6..bef45107 100644 Binary files a/interface/sb_tooltips/slimeexplosion.png and b/interface/sb_tooltips/slimeexplosion.png differ diff --git a/interface/sb_tooltips/spikeball.png b/interface/sb_tooltips/spikeball.png index 1f92e10a..108b7b4d 100644 Binary files a/interface/sb_tooltips/spikeball.png and b/interface/sb_tooltips/spikeball.png differ diff --git a/interface/sb_tooltips/spinningplasmabullet.png b/interface/sb_tooltips/spinningplasmabullet.png index e06c10cd..e96a6a07 100644 Binary files a/interface/sb_tooltips/spinningplasmabullet.png and b/interface/sb_tooltips/spinningplasmabullet.png differ diff --git a/interface/sb_tooltips/splitbullet.png b/interface/sb_tooltips/splitbullet.png index 626330e9..b2b4a864 100644 Binary files a/interface/sb_tooltips/splitbullet.png and b/interface/sb_tooltips/splitbullet.png differ diff --git a/interface/sb_tooltips/splitter.png b/interface/sb_tooltips/splitter.png index 12d802da..c155dc28 100644 Binary files a/interface/sb_tooltips/splitter.png and b/interface/sb_tooltips/splitter.png differ diff --git a/interface/sb_tooltips/standardbullet.png b/interface/sb_tooltips/standardbullet.png index 3791c2ee..a30364d3 100644 Binary files a/interface/sb_tooltips/standardbullet.png and b/interface/sb_tooltips/standardbullet.png differ diff --git a/interface/sb_tooltips/starcleaverboom.png b/interface/sb_tooltips/starcleaverboom.png index e8de892b..396d515e 100644 Binary files a/interface/sb_tooltips/starcleaverboom.png and b/interface/sb_tooltips/starcleaverboom.png differ diff --git a/interface/sb_tooltips/stickybullet.png b/interface/sb_tooltips/stickybullet.png index 336eb2aa..0784a9f5 100644 Binary files a/interface/sb_tooltips/stickybullet.png and b/interface/sb_tooltips/stickybullet.png differ diff --git a/interface/sb_tooltips/stickyplasma.png b/interface/sb_tooltips/stickyplasma.png index 8f6dff5c..5d68e40f 100644 Binary files a/interface/sb_tooltips/stickyplasma.png and b/interface/sb_tooltips/stickyplasma.png differ diff --git a/interface/sb_tooltips/teslabolt.png b/interface/sb_tooltips/teslabolt.png index 7affca13..e78dfde8 100644 Binary files a/interface/sb_tooltips/teslabolt.png and b/interface/sb_tooltips/teslabolt.png differ diff --git a/interface/sb_tooltips/teslaboltsmall.png b/interface/sb_tooltips/teslaboltsmall.png index 8bf60d9c..b051fc4d 100644 Binary files a/interface/sb_tooltips/teslaboltsmall.png and b/interface/sb_tooltips/teslaboltsmall.png differ diff --git a/interface/sb_tooltips/throwingbone.png b/interface/sb_tooltips/throwingbone.png index 31c734b9..8686bc46 100644 Binary files a/interface/sb_tooltips/throwingbone.png and b/interface/sb_tooltips/throwingbone.png differ diff --git a/interface/sb_tooltips/trishot.png b/interface/sb_tooltips/trishot.png index 33ece15c..e77cdf72 100644 Binary files a/interface/sb_tooltips/trishot.png and b/interface/sb_tooltips/trishot.png differ diff --git a/interface/sb_tooltips/whiteglobe.png b/interface/sb_tooltips/whiteglobe.png index 7141d6aa..388d9736 100644 Binary files a/interface/sb_tooltips/whiteglobe.png and b/interface/sb_tooltips/whiteglobe.png differ diff --git a/interface/sb_tooltips/woodenbolt.png b/interface/sb_tooltips/woodenbolt.png index b441376e..a26db0d3 100644 Binary files a/interface/sb_tooltips/woodenbolt.png and b/interface/sb_tooltips/woodenbolt.png differ diff --git a/interface/sb_tooltips/yellowplasmabullet.png b/interface/sb_tooltips/yellowplasmabullet.png index 0baa0ea7..cd5cb678 100644 Binary files a/interface/sb_tooltips/yellowplasmabullet.png and b/interface/sb_tooltips/yellowplasmabullet.png differ diff --git a/interface/sb_turret/standingturret.config b/interface/sb_turret/standingturret.config index 1a22b521..4f2aee0e 100644 --- a/interface/sb_turret/standingturret.config +++ b/interface/sb_turret/standingturret.config @@ -9,9 +9,9 @@ "close": { "zlevel": 3, "type": "button", - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "callback": "close", "position": [123, 22], "pressedOffset": [0, 0] @@ -21,7 +21,7 @@ "position": [60, 37], "dimensions": [1, 1], "spacing": [19, 19], - "backingImage": "/interface/sb_inventory/gun.png" + "backingImage": "/interface/inventory/gun.png" } } } diff --git a/interface/sb_turret/turret_body.png b/interface/sb_turret/turret_body.png index 27a11ea7..f837e73d 100644 Binary files a/interface/sb_turret/turret_body.png and b/interface/sb_turret/turret_body.png differ diff --git a/interface/sb_turret/turret_footer.png b/interface/sb_turret/turret_footer.png index 758edece..85edfb9f 100644 Binary files a/interface/sb_turret/turret_footer.png and b/interface/sb_turret/turret_footer.png differ diff --git a/interface/sb_turret/turret_header.png b/interface/sb_turret/turret_header.png index a19b621c..d1755219 100644 Binary files a/interface/sb_turret/turret_header.png and b/interface/sb_turret/turret_header.png differ diff --git a/interface/scripted/cropshipper/cropshippergui.config.patch b/interface/scripted/cropshipper/cropshippergui.config.patch index 29a62dc3..62f040d4 100644 --- a/interface/scripted/cropshipper/cropshippergui.config.patch +++ b/interface/scripted/cropshipper/cropshippergui.config.patch @@ -36,7 +36,6 @@ ,[{"op":"add","path":"/acceptItems/-","value":"sb_alienburger"}] ,[{"op":"add","path":"/acceptItems/-","value":"sb_burrito"}] ,[{"op":"add","path":"/acceptItems/-","value":"sb_hamsandwich"}] -,[{"op":"add","path":"/acceptItems/-","value":"sb_soup"}] ,[{"op":"add","path":"/acceptItems/-","value":"sb_butter"}] ,[{"op":"add","path":"/acceptItems/-","value":"sb_cake"}] ,[{"op":"add","path":"/acceptItems/-","value":"sb_candy"}] diff --git a/interface/scripted/keytrader/keytradergui.config.patch b/interface/scripted/keytrader/keytradergui.config.patch index 573234a1..b8097df5 100644 --- a/interface/scripted/keytrader/keytradergui.config.patch +++ b/interface/scripted/keytrader/keytradergui.config.patch @@ -1 +1,4 @@ -[{"op":"add","path":"/tradeOptions/-","value":["sb_refinedrubium",40]}] \ No newline at end of file +[ +{"op":"add","path":"/tradeOptions/-","value":["leather",10]}, +{"op":"add","path":"/tradeOptions/-","value":["sb_refinedrubium",40]} +] \ No newline at end of file diff --git a/interface/scripted/mmupgrade/mmupgradegui.config.patch b/interface/scripted/mmupgrade/mmupgradegui.config.patch index 8fdb396a..e452d662 100644 --- a/interface/scripted/mmupgrade/mmupgradegui.config.patch +++ b/interface/scripted/mmupgrade/mmupgradegui.config.patch @@ -1,4 +1,5 @@ -[[{ +[ + [{ "op": "test", "path": "/replaced", "inverse": true @@ -159,27 +160,6 @@ "op": "add", "path": "/sb_text", "value": ["Can't remove that. Replace it with a similar item", "Liquid collection enabled", "Liquid collection disabled"] - }, { - "op": "add", - "path": "/gui/sb_generic", - "value": { - "base": "", - "hover": "", - "callback": "null", - "type": "button", - "visible": false - } - }, { - "op": "add", - "path": "/upgrades/sb_generic", - "value": { - "button": "sb_generic", - "prerequisites": ["sb_generic"], - "moduleCost": 1, - "highlight": "powergen", - "icon": "", - "description": "", - "essentialSlot": "" - } } - ]] + ] +] diff --git a/interface/scripted/mmupgrade/mmupgradegui.original.config.patch b/interface/scripted/mmupgrade/mmupgradegui.original.config.patch index 37fbcd13..833e5d16 100644 --- a/interface/scripted/mmupgrade/mmupgradegui.original.config.patch +++ b/interface/scripted/mmupgrade/mmupgradegui.original.config.patch @@ -155,27 +155,5 @@ "op": "add", "path": "/sb_text", "value": ["Can't remove that. Replace it with a similar item", "Liquid collection enabled", "Liquid collection disabled"] - }, { - "op": "add", - "path": "/gui/sb_generic", - "value": { - "base": "", - "hover": "", - "callback": "null", - "type": "button", - "visible": false - } - }, { - "op": "add", - "path": "/upgrades/sb_generic", - "value": { - "button": "sb_generic", - "prerequisites": ["sb_generic"], - "moduleCost": 1, - "highlight": "powergen", - "icon": "", - "description": "", - "essentialSlot": "" - } } ] diff --git a/interface/scripted/mmupgrade/sb_line.png b/interface/scripted/mmupgrade/sb_line.png index 35c4a616..f64bd13f 100644 Binary files a/interface/scripted/mmupgrade/sb_line.png and b/interface/scripted/mmupgrade/sb_line.png differ diff --git a/interface/scripted/mmupgrade/sb_line2.png b/interface/scripted/mmupgrade/sb_line2.png index 4eaf200f..84d6361e 100644 Binary files a/interface/scripted/mmupgrade/sb_line2.png and b/interface/scripted/mmupgrade/sb_line2.png differ diff --git a/interface/scripted/mmupgrade/sb_mmupgradegui.lua b/interface/scripted/mmupgrade/sb_mmupgradegui.lua index e52b0d16..ddb167ea 100644 --- a/interface/scripted/mmupgrade/sb_mmupgradegui.lua +++ b/interface/scripted/mmupgrade/sb_mmupgradegui.lua @@ -1,5 +1,3 @@ -require "/scripts/util.lua" ---what about the status properties? local ini = init or function() end local updateGu = updateGui or function() end local performUpgrad = performUpgrade or function() end @@ -18,72 +16,110 @@ function init() ini() sb_moveGui() end self.sb_defaultDescription = self.defaultDescription or "" - widget.setChecked("btnSbLiquidCollection",player.essentialItem("beamaxe").parameters.canCollectLiquid or false) + sb_statusProperties = {} + for k, v in pairs(self.upgradeConfig) do + if v.setStatusProperties then + for k2, v2 in pairs(v.setStatusProperties) do + if (sb_statusProperties[k2] or 0) < v2 then + sb_statusProperties[k2] = v2 + end + end + end + end end function updateGui() updateGu() - local u = sb_getUpgrades() - sb_setWidgetsVisible({"imgSbLine2","imgSbLine3","imgSbLine4","btnSbLiquidCollection"},u.liquidcollection) - sb_setWidgetsVisible({"btnSbPaintMode","imgSbLine1"},u.paintmode or player.essentialItem("painttool")) - sb_setWidgetsVisible({"btnSbWireMode","imgSbLine0"},u.wiremode or player.essentialItem("wiretool")) - sb_setWidgetsVisible({"btnSbScanMode","imgSbLine6"},player.essentialItem("inspectiontool") ~= nil and player.essentialItem("inspectiontool").name~="inspectionmode") + local upgrades = sb_getUpgrades() + if not sb_mmChecked and contains(upgrades, "sb_generic") then + local mm = player.essentialItem("beamaxe").parameters.upgrades + local u = {} + for i = 1, #mm do + if mm[i] ~= "sb_generic" then + u[#u+1] = mm[i] + end + end + mm = player.essentialItem("beamaxe") + util.mergeTable(mm.parameters, {upgrades=u}) + player.giveEssentialItem("beamaxe", mm) + sb_mmChecked = true + end + widget.setChecked("btnSbLiquidCollection", player.essentialItem("beamaxe").parameters.canCollectLiquid or false) + sb_setWidgetsVisible({"imgSbLine2","imgSbLine3","imgSbLine4","btnSbLiquidCollection"}, contains(upgrades, "liquidcollection")) + sb_setWidgetsVisible({"btnSbPaintMode","imgSbLine1"}, upgrades.paintmode or player.essentialItem("painttool")) + sb_setWidgetsVisible({"btnSbWireMode","imgSbLine0"}, upgrades.wiremode or player.essentialItem("wiretool")) + sb_setWidgetsVisible({"btnSbScanMode","imgSbLine6"}, player.essentialItem("inspectiontool") ~= nil and player.essentialItem("inspectiontool").name ~= "inspectionmode") end -function sb_swap(_,b) +function sb_swap(_, widgetData) self.defaultDescription = self.sb_defaultDescription - local c = player.swapSlotItem() - if c and c.name~="inspectionmode" and (root.itemType(c.name) == b["tool"] or contains(root.itemTags(c.name),b["tag"])) then - player.setSwapSlotItem(player.essentialItem(b["slot"])) - player.giveEssentialItem(b["slot"],c) else sb_text(1) end + local swapSlot = player.swapSlotItem() + if swapSlot and swapSlot.name ~= "inspectionmode" and + (root.itemType(swapSlot.name) == widgetData["tool"] or contains(root.itemTags(swapSlot.name), widgetData["tag"])) + then + player.setSwapSlotItem(player.essentialItem(widgetData["slot"])) + player.giveEssentialItem(widgetData["slot"], swapSlot) + else + sb_text(1) + end end function sb_liquid() local item = player.essentialItem("beamaxe") - local liq = widget.getChecked("btnSbLiquidCollection") - util.mergeTable(item.parameters,{canCollectLiquid=liq}) - player.giveEssentialItem("beamaxe",item) - sb_text(liq and 2 or 3) + local enabled = widget.getChecked("btnSbLiquidCollection") + util.mergeTable(item.parameters, {canCollectLiquid=enabled}) + player.giveEssentialItem("beamaxe", item) + sb_text(enabled and 2 or 3) end function sb_getUpgrades() - local u = {} local mm = player.essentialItem("beamaxe") or {} local mmType = root.itemType(mm.name) if (mmType=="miningtool" or mmType=="currency") then widget.setButtonEnabled("btnUpgrade",false) end - mm = mm.parameters.upgrades or {} - --if not contains(mm,"sb_generic") then mm[#mm+1]="sb_generic" end - for i, v in ipairs(mm) do u[v] = true end - return u + return mm.parameters and mm.parameters.upgrades or {} end function sb_beamaxe() self.defaultDescription = self.sb_defaultDescription local mm = player.swapSlotItem() - if mm ~= nil then + if mm then local mmType = root.itemType(mm.name) - if (not (mmType == "beamminingtool" or mmType == "miningtool" or root.itemHasTag(mm.name,"miningtool"))) then - sb_text(1) return end - else sb_text(1) return end - local u = sb_getUpgrades() or {} - if mm and u ~= {} then - mm.parameters.upgrades = mm.parameters.upgrades or {} - local p = mm.parameters.upgrades - if not contains(p,"sb_generic") then mm.parameters.upgrades[#mm.parameters.upgrades+1]="sb_generic" end - if u.paintmode and not contains(p,"paintmode") then mm.parameters.upgrades[#mm.parameters.upgrades+1]="paintmode" end - if u.wiremode and not contains(p,"wiremode") then mm.parameters.upgrades[#mm.parameters.upgrades+1]="wiremode" end + if (not (mmType == "beamminingtool" or mmType == "miningtool" or root.itemHasTag(mm.name, "miningtool"))) then + sb_text(1) + return + end + else + sb_text(1) + return + end + local swapUpgrades = mm.parameters and mm.parameters.upgrades or {} + local setProperties = {} + status.setStatusProperty("bonusBeamGunRadius", 0) + for i = 0, #swapUpgrades-1 do + local setStatusProperties = self.upgradeConfig[swapUpgrades[#swapUpgrades-i]] + setStatusProperties = setStatusProperties and setStatusProperties.setStatusProperties --to check if it exists + if setStatusProperties then + for k, v in pairs(setStatusProperties) do + if not setProperties[k] then + setProperties[k] = 1 + status.setStatusProperty(k, v) + end + end + end end player.setSwapSlotItem(player.essentialItem("beamaxe")) - player.giveEssentialItem("beamaxe",mm) ---widget.setButtonEnabled("btnUpgrade",(root.itemType(mm.name)~="miningtool" and root.itemType(mm.name)~="currency")) + player.giveEssentialItem("beamaxe", mm) + sb_mmChecked = false end -function performUpgrade(n,d) +function performUpgrade(widgetName, widgetData) local upgrade = self.upgradeConfig[self.selectedUpgrade] if upgrade.setItem then - local a = player.essentialItem(upgrade.essentialSlot) - if a then player.giveItem(a) end + local oldItem = player.essentialItem(upgrade.essentialSlot) + if oldItem then + player.giveItem(oldItem) + end end - return performUpgrad(n,d) + return performUpgrad(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/mmupgrade/sb_mmupgradegui_lua.txt b/interface/scripted/mmupgrade/sb_mmupgradegui_lua.txt new file mode 100644 index 00000000..2979e092 --- /dev/null +++ b/interface/scripted/mmupgrade/sb_mmupgradegui_lua.txt @@ -0,0 +1,36 @@ + + sb_essentialUpgrades = {} + if v.setItem then + sb_essentialUpgrades[#sb_essentialUpgrades+1] = k + end + + for i = 1, #sb_essentialUpgrades do + if contains(currentUpgrades, sb_essentialUpgrades[i]) and not contains(upgrades, sb_essentialUpgrades[i]) then + sb.logInfo("Keeping "..sb_essentialUpgrades[i]) + table.insert(upgrades, sb_essentialUpgrades[i]) + end + end + + + for i = 1, #sb_statusUpgrades do + for k, v in pairs(sb_statusUpgrades[i][2]) do + if type(status.statusProperty(k, 0)) == "number" and type(v) == "number" then + if status.statusProperty(k, 0) > v then + status.setStatusProperty(k, v) + if contains(currentUpgrades, sb_statusUpgrades[i][1]) then + sb.logInfo("Undoing "..sb_statusUpgrades[i][1]) + status.setStatusProperty(k, -v) + end + end + end + end + end + if #upgrades > 0 then + mm.parameters.upgrades = upgrades + end + local currentUpgrades = u + if currentUpgrades then + for k, v in pairs(sb_statusProperties) do + + end + end \ No newline at end of file diff --git a/interface/scripted/mmupgrade/sb_slots.png b/interface/scripted/mmupgrade/sb_slots.png index 2dc30e4e..9cb9c2ec 100644 Binary files a/interface/scripted/mmupgrade/sb_slots.png and b/interface/scripted/mmupgrade/sb_slots.png differ diff --git a/interface/scripted/playerstationconsole/playerstationconsolegui.config.patch b/interface/scripted/playerstationconsole/playerstationconsolegui.config.patch new file mode 100644 index 00000000..7c56fa9a --- /dev/null +++ b/interface/scripted/playerstationconsole/playerstationconsolegui.config.patch @@ -0,0 +1,17 @@ +[ + [{ + "op": "add", + "path": "/scripts/-", + "value": "/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua" + } + ], + [{ + "op": "add", + "path": "/gui/sb_lblGravity", + "value": { + "type": "label", + "position": [175, 0] + } + } + ] +] diff --git a/interface/scripted/playerstationconsole/playerstationconsoleicon.png b/interface/scripted/playerstationconsole/playerstationconsoleicon.png new file mode 100644 index 00000000..60d0b224 Binary files /dev/null and b/interface/scripted/playerstationconsole/playerstationconsoleicon.png differ diff --git a/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua b/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua new file mode 100644 index 00000000..cc804514 --- /dev/null +++ b/interface/scripted/playerstationconsole/sb_playerstationconsolegui.lua @@ -0,0 +1,10 @@ +local sb_init = init or function() end +local sb_update = update or function() end + +function init() sb_init() + widget.setPosition("sb_lblGravity", {widget.getPosition("sb_lblGravity")[1], widget.getPosition("lblGravity")[2]}) +end + +function update(...) sb_update(...) + widget.setText("sb_lblGravity", widget.getSliderValue("sldGravity")) +end \ No newline at end of file diff --git a/interface/scripted/sb_codex/body_blank.png b/interface/scripted/sb_codex/body_blank.png index 695a373f..894da8ce 100644 Binary files a/interface/scripted/sb_codex/body_blank.png and b/interface/scripted/sb_codex/body_blank.png differ diff --git a/interface/scripted/sb_codex/booktitle_bg.png b/interface/scripted/sb_codex/booktitle_bg.png index 903601c2..0a2f4b4e 100644 Binary files a/interface/scripted/sb_codex/booktitle_bg.png and b/interface/scripted/sb_codex/booktitle_bg.png differ diff --git a/interface/scripted/sb_codex/booktitle_selected.png b/interface/scripted/sb_codex/booktitle_selected.png index a5589d45..b2c78813 100644 Binary files a/interface/scripted/sb_codex/booktitle_selected.png and b/interface/scripted/sb_codex/booktitle_selected.png differ diff --git a/interface/scripted/sb_codex/browsebg.png b/interface/scripted/sb_codex/browsebg.png index e69adf82..e0e495ff 100644 Binary files a/interface/scripted/sb_codex/browsebg.png and b/interface/scripted/sb_codex/browsebg.png differ diff --git a/interface/scripted/sb_codex/codex.lua b/interface/scripted/sb_codex/codex.lua index 62242dfa..3cba13db 100644 --- a/interface/scripted/sb_codex/codex.lua +++ b/interface/scripted/sb_codex/codex.lua @@ -135,7 +135,7 @@ end function prepareBooking(i) if isCodex(i) and registerNewCodex(i) then return elseif isCustomCodex(i) and registerNewCustomCodex(i) then return elseif - (root.itemConfig(i).config.sb_copybook or root.itemConfig(i).config.category == "codex" or (i.parameters.interactData and i.parameters.interactAction)) and not isCodex(i) and i.name ~= "sb_customcodex" and registerNewPage(i) then end + (root.itemHasTag(i.name, "sb_copybook") or root.itemConfig(i).config.category == "codex" or (i.parameters.interactData and i.parameters.interactAction)) and not isCodex(i) and i.name ~= "sb_customcodex" and registerNewPage(i) then end end diff --git a/interface/scripted/sb_codex/footer.png b/interface/scripted/sb_codex/footer.png index e6f08e48..28101435 100644 Binary files a/interface/scripted/sb_codex/footer.png and b/interface/scripted/sb_codex/footer.png differ diff --git a/interface/scripted/sb_codex/header.png b/interface/scripted/sb_codex/header.png index 62fad2db..5a7d4695 100644 Binary files a/interface/scripted/sb_codex/header.png and b/interface/scripted/sb_codex/header.png differ diff --git a/interface/scripted/sb_codex/next-hover.png b/interface/scripted/sb_codex/next-hover.png index c84ee468..92d8d43b 100644 Binary files a/interface/scripted/sb_codex/next-hover.png and b/interface/scripted/sb_codex/next-hover.png differ diff --git a/interface/scripted/sb_codex/read.png b/interface/scripted/sb_codex/read.png index 73703a29..d76d8340 100644 Binary files a/interface/scripted/sb_codex/read.png and b/interface/scripted/sb_codex/read.png differ diff --git a/interface/scripted/sb_codex/read_highlight.png b/interface/scripted/sb_codex/read_highlight.png index f84b9b5c..71d20a03 100644 Binary files a/interface/scripted/sb_codex/read_highlight.png and b/interface/scripted/sb_codex/read_highlight.png differ diff --git a/interface/scripted/sb_codex/readselected-hover.png b/interface/scripted/sb_codex/readselected-hover.png index 2c70709b..00ed5425 100644 Binary files a/interface/scripted/sb_codex/readselected-hover.png and b/interface/scripted/sb_codex/readselected-hover.png differ diff --git a/interface/scripted/sb_codex/scrollbg.png b/interface/scripted/sb_codex/scrollbg.png index d04857c5..3d98c2a2 100644 Binary files a/interface/scripted/sb_codex/scrollbg.png and b/interface/scripted/sb_codex/scrollbg.png differ diff --git a/interface/scripted/sb_codex/shine.png b/interface/scripted/sb_codex/shine.png index 1d69da21..33079487 100644 Binary files a/interface/scripted/sb_codex/shine.png and b/interface/scripted/sb_codex/shine.png differ diff --git a/interface/scripted/sb_music/body.png b/interface/scripted/sb_music/body.png index 695a373f..894da8ce 100644 Binary files a/interface/scripted/sb_music/body.png and b/interface/scripted/sb_music/body.png differ diff --git a/interface/scripted/sb_music/footer.png b/interface/scripted/sb_music/footer.png index e6f08e48..28101435 100644 Binary files a/interface/scripted/sb_music/footer.png and b/interface/scripted/sb_music/footer.png differ diff --git a/interface/scripted/sb_music/header.png b/interface/scripted/sb_music/header.png index 62fad2db..5a7d4695 100644 Binary files a/interface/scripted/sb_music/header.png and b/interface/scripted/sb_music/header.png differ diff --git a/interface/scripted/sb_music/scrollbg.png b/interface/scripted/sb_music/scrollbg.png index 049d52c1..346bf2c7 100644 Binary files a/interface/scripted/sb_music/scrollbg.png and b/interface/scripted/sb_music/scrollbg.png differ diff --git a/interface/scripted/sb_music/search.png b/interface/scripted/sb_music/search.png index 474772b7..ae022591 100644 Binary files a/interface/scripted/sb_music/search.png and b/interface/scripted/sb_music/search.png differ diff --git a/interface/scripted/sb_music/shine.png b/interface/scripted/sb_music/shine.png index 1d69da21..fca6392a 100644 Binary files a/interface/scripted/sb_music/shine.png and b/interface/scripted/sb_music/shine.png differ diff --git a/interface/scripted/sb_music/songbackground.png b/interface/scripted/sb_music/songbackground.png index c1f88c68..0e386b71 100644 Binary files a/interface/scripted/sb_music/songbackground.png and b/interface/scripted/sb_music/songbackground.png differ diff --git a/interface/scripted/sb_techselection/accept.png b/interface/scripted/sb_techselection/accept.png index c0f56032..84ab4984 100644 Binary files a/interface/scripted/sb_techselection/accept.png and b/interface/scripted/sb_techselection/accept.png differ diff --git a/interface/scripted/sb_techselection/footer.png b/interface/scripted/sb_techselection/footer.png index 4b321c3e..4756f2f3 100644 Binary files a/interface/scripted/sb_techselection/footer.png and b/interface/scripted/sb_techselection/footer.png differ diff --git a/interface/scripted/sb_techselection/header.png b/interface/scripted/sb_techselection/header.png index 0b946fee..09574951 100644 Binary files a/interface/scripted/sb_techselection/header.png and b/interface/scripted/sb_techselection/header.png differ diff --git a/interface/scripted/sb_techselection/lockinselected.png b/interface/scripted/sb_techselection/lockinselected.png index 458413f4..1d770681 100644 Binary files a/interface/scripted/sb_techselection/lockinselected.png and b/interface/scripted/sb_techselection/lockinselected.png differ diff --git a/interface/scripted/sb_techselection/lockinunselected.png b/interface/scripted/sb_techselection/lockinunselected.png index 5d3af999..39e07e76 100644 Binary files a/interface/scripted/sb_techselection/lockinunselected.png and b/interface/scripted/sb_techselection/lockinunselected.png differ diff --git a/interface/scripted/sb_techselection/prev.png b/interface/scripted/sb_techselection/prev.png deleted file mode 100644 index 469712fd..00000000 Binary files a/interface/scripted/sb_techselection/prev.png and /dev/null differ diff --git a/interface/scripted/sb_techselection/prevdown.png b/interface/scripted/sb_techselection/prevdown.png deleted file mode 100644 index a26d4842..00000000 Binary files a/interface/scripted/sb_techselection/prevdown.png and /dev/null differ diff --git a/interface/scripted/sb_techselection/prevno.png b/interface/scripted/sb_techselection/prevno.png deleted file mode 100644 index f0d80687..00000000 Binary files a/interface/scripted/sb_techselection/prevno.png and /dev/null differ diff --git a/interface/scripted/sb_techselection/prevover.png b/interface/scripted/sb_techselection/prevover.png deleted file mode 100644 index 99c114a9..00000000 Binary files a/interface/scripted/sb_techselection/prevover.png and /dev/null differ diff --git a/interface/scripted/sb_techselection/reset.png b/interface/scripted/sb_techselection/reset.png index ddee191d..687e1c33 100644 Binary files a/interface/scripted/sb_techselection/reset.png and b/interface/scripted/sb_techselection/reset.png differ diff --git a/interface/scripted/sb_techselection/shine.png b/interface/scripted/sb_techselection/shine.png index a4252728..f43ed195 100644 Binary files a/interface/scripted/sb_techselection/shine.png and b/interface/scripted/sb_techselection/shine.png differ diff --git a/interface/scripted/sb_techselection/techselection.config b/interface/scripted/sb_techselection/techselection.config index 73dde1c4..ff00a074 100644 --- a/interface/scripted/sb_techselection/techselection.config +++ b/interface/scripted/sb_techselection/techselection.config @@ -20,12 +20,11 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/scripted/sb_techselection/prev.png", - "hover": "/interface/scripted/sb_techselection/prevover.png", - "press": "/interface/scripted/sb_techselection/prevdown.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [279, 206], - "callback": "openPane", - "data": "/interface/scripted/sb_techstation/techstation.config" + "callback": "close" }, "lblTech": { "type": "label", @@ -123,7 +122,6 @@ }, "description": { "type": "label", - // "value" : "Here you can create specialised ^#0f0;Tech Drives^reset; that allow you to ^orange;swap between the abilities of two Techs^reset; on-the-fly.\nAlternatively, you can select a ^#0f0;single tech^reset; instead of two.", "value": "Here you can create specialised ^#0f0;Tech Drives^reset; that allow you to ^orange;change techs^reset; on-the-fly.\n\nSelect ^orange;one tech to make an Equipper^reset; or ^orange;two for a Swapper.", "position": [148, 162], "wrapWidth": 140, @@ -174,8 +172,7 @@ "accept", "lockin", "techSelected", - "reset", - "openPane" + "reset" ], "cantAffordText": "Not enough ^#0f0;Tech Cards.\n\nUnwanted Tech Swappers/Equippers^reset; can be recycled in a ^orange;Refinery^reset; to receive one ^#0f0;Tech Card.^reset;", diff --git a/interface/scripted/sb_techstation/body.png b/interface/scripted/sb_techstation/body.png deleted file mode 100644 index 319b44df..00000000 Binary files a/interface/scripted/sb_techstation/body.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/button.frames b/interface/scripted/sb_techstation/button.frames deleted file mode 100644 index 77e40edc..00000000 --- a/interface/scripted/sb_techstation/button.frames +++ /dev/null @@ -1,6 +0,0 @@ -{ - "frameGrid" : { - "size" : [129, 18], - "dimensions" : [1,9] - } -} \ No newline at end of file diff --git a/interface/scripted/sb_techstation/button.png b/interface/scripted/sb_techstation/button.png deleted file mode 100644 index 9c29eb5b..00000000 Binary files a/interface/scripted/sb_techstation/button.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/craftablebackground.png b/interface/scripted/sb_techstation/craftablebackground.png deleted file mode 100644 index 58476313..00000000 Binary files a/interface/scripted/sb_techstation/craftablebackground.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/craftableselected.png b/interface/scripted/sb_techstation/craftableselected.png deleted file mode 100644 index 0612fea5..00000000 Binary files a/interface/scripted/sb_techstation/craftableselected.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/footer.png b/interface/scripted/sb_techstation/footer.png deleted file mode 100644 index 1d917299..00000000 Binary files a/interface/scripted/sb_techstation/footer.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/header.png b/interface/scripted/sb_techstation/header.png deleted file mode 100644 index 12eb22f2..00000000 Binary files a/interface/scripted/sb_techstation/header.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/letme3ddown.png b/interface/scripted/sb_techstation/letme3ddown.png deleted file mode 100644 index bc4fdef4..00000000 Binary files a/interface/scripted/sb_techstation/letme3ddown.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/letme3dover.png b/interface/scripted/sb_techstation/letme3dover.png deleted file mode 100644 index eb2655ae..00000000 Binary files a/interface/scripted/sb_techstation/letme3dover.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/letme3dup.png b/interface/scripted/sb_techstation/letme3dup.png deleted file mode 100644 index bca4b60e..00000000 Binary files a/interface/scripted/sb_techstation/letme3dup.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/letmebind.frames b/interface/scripted/sb_techstation/letmebind.frames deleted file mode 100644 index c5aeeb0a..00000000 --- a/interface/scripted/sb_techstation/letmebind.frames +++ /dev/null @@ -1,5 +0,0 @@ -{ - "frameGrid" : { - "size" : [84, 16], - "dimensions" : [1, 3] -}} \ No newline at end of file diff --git a/interface/scripted/sb_techstation/letmebind.png b/interface/scripted/sb_techstation/letmebind.png deleted file mode 100644 index d6b02785..00000000 Binary files a/interface/scripted/sb_techstation/letmebind.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/scanlines.frames b/interface/scripted/sb_techstation/scanlines.frames deleted file mode 100644 index 9bd3a9ff..00000000 --- a/interface/scripted/sb_techstation/scanlines.frames +++ /dev/null @@ -1,6 +0,0 @@ -{ - "frameGrid" : { - "size" : [90, 94], - "dimensions" : [14, 1] - } -} diff --git a/interface/scripted/sb_techstation/scanlines.png b/interface/scripted/sb_techstation/scanlines.png deleted file mode 100644 index 826b6d93..00000000 Binary files a/interface/scripted/sb_techstation/scanlines.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/shine.png b/interface/scripted/sb_techstation/shine.png deleted file mode 100644 index a4252728..00000000 Binary files a/interface/scripted/sb_techstation/shine.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/tabbase.png b/interface/scripted/sb_techstation/tabbase.png deleted file mode 100644 index 0572d903..00000000 Binary files a/interface/scripted/sb_techstation/tabbase.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/tabover.png b/interface/scripted/sb_techstation/tabover.png deleted file mode 100644 index 6e588a48..00000000 Binary files a/interface/scripted/sb_techstation/tabover.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/tabselected.png b/interface/scripted/sb_techstation/tabselected.png deleted file mode 100644 index 87745fcd..00000000 Binary files a/interface/scripted/sb_techstation/tabselected.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/tabselectedover.png b/interface/scripted/sb_techstation/tabselectedover.png deleted file mode 100644 index 87745fcd..00000000 Binary files a/interface/scripted/sb_techstation/tabselectedover.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/techfooter.png b/interface/scripted/sb_techstation/techfooter.png deleted file mode 100644 index 8e31261f..00000000 Binary files a/interface/scripted/sb_techstation/techfooter.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/techheader.png b/interface/scripted/sb_techstation/techheader.png deleted file mode 100644 index 1fdd7167..00000000 Binary files a/interface/scripted/sb_techstation/techheader.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/techstation.config b/interface/scripted/sb_techstation/techstation.config deleted file mode 100644 index 6f520e8d..00000000 --- a/interface/scripted/sb_techstation/techstation.config +++ /dev/null @@ -1,342 +0,0 @@ -{ - "gui": { - "background": { - "zlevel": 0, - "type": "background", - "fileHeader": "/interface/scripted/sb_techstation/header.png", - "fileBody": "/interface/scripted/sb_techstation/body.png", - "fileFooter": "/interface/scripted/sb_techstation/footer.png" - }, - - "windowtitle": { - "type": "title", - "title": "Tech Station", - "subtitle": "Equip and unlock new techs", - "icon": { - "type": "image", - "file": "/interface/sb_crafting/craftingicons.png:tech", - "zlevel": -1 - } - }, - - "techScrollArea": { - "type": "scrollArea", - "rect": [247, 67, 386, 155], - "children": { - "techList": { - "type": "list", - "callback": "techSelected", - "schema": { - "hoverBG": "/interface/scripted/sb_techstation/craftablebackground.png", - "selectedBG": "/interface/scripted/sb_techstation/craftableselected.png", - "unselectedBG": "/interface/scripted/sb_techstation/craftablebackground.png", - "disabledBG": "/interface/scripted/sb_techstation/craftablebackground.png", - "spacing": [0, 1], - "memberSize": [133, 20], - "listTemplate": { - "background": { - "type": "image", - "file": "/interface/scripted/sb_techstation/craftablebackground.png", - "position": [1, 0], - "zlevel": -1 - }, - "techName": { - "type": "label", - "position": [22, 10], - "vAnchor": "mid", - "hAnchor": "left", - "wrapWidth": 104, - "width": 104, - "value": "Replace Me" - }, - "techIcon": { - "type": "image", - "position": [11, 10], - "centered": true, - "scissoring": false, - "size": [16, 16], - "callback": "null" - } - } - } - } - } - }, - - "lblDescription": { - "type": "label", - "position": [112, 167], - "hAnchor": "left", - "vAnchor": "top", - "wrapWidth": 122, - "color": [174, 225, 238, 255], - "value": "Select a slot to modify" - }, - "imgSuit": { - "type": "image", - "position": [10, 78] - }, - "staticImage": { - "type": "image", - "file": "/ai/staticapex.png:1", - "zLevel": -2, - "position": [7, 75] - }, - "scanlineAnimation": { - "type": "image", - "file": "/interface/scripted/sb_techstation/scanlines.png:0", - "zLevel": 5, - "position": [7, 75] - }, - - "techSlotGroup": { - "type": "radioGroup", - "toggleMode": false, - "buttons": [{ - "selected": true, - "baseImage": "/interface/scripted/sb_techstation/tabbase.png", - "hoverImage": "/interface/scripted/sb_techstation/tabover.png", - "baseImageChecked": "/interface/scripted/sb_techstation/tabselected.png", - "hoverImageChecked": "/interface/scripted/sb_techstation/tabselectedover.png", - "pressedOffset": [0, 0], - "position": [247, 160], - "data": "Head" - }, { - "baseImage": "/interface/scripted/sb_techstation/tabbase.png", - "hoverImage": "/interface/scripted/sb_techstation/tabover.png", - "baseImageChecked": "/interface/scripted/sb_techstation/tabselected.png", - "hoverImageChecked": "/interface/scripted/sb_techstation/tabselectedover.png", - "pressedOffset": [0, 0], - "position": [281, 160], - "data": "Body" - }, { - "baseImage": "/interface/scripted/sb_techstation/tabbase.png", - "hoverImage": "/interface/scripted/sb_techstation/tabover.png", - "baseImageChecked": "/interface/scripted/sb_techstation/tabselected.png", - "hoverImageChecked": "/interface/scripted/sb_techstation/tabselectedover.png", - "pressedOffset": [0, 0], - "position": [315, 160], - "data": "Legs" - }, { - "baseImage": "/interface/scripted/sb_techstation/tabbase.png", - "hoverImage": "/interface/scripted/sb_techstation/tabover.png", - "baseImageChecked": "/interface/scripted/sb_techstation/tabselected.png", - "hoverImageChecked": "/interface/scripted/sb_techstation/tabselectedover.png", - "pressedOffset": [0, 0], - "position": [349, 160], - "data": "Suit" - } - ] - }, - - "btnUnequipHead": { - "type": "button", - "base": "/interface/scripted/sb_techstation/unequip.png:normal", - "hover": "/interface/scripted/sb_techstation/unequip.png:highlight", - "pressed": "/interface/scripted/sb_techstation/unequip.png:grayed", - // "disabledImage" : "/interface/scripted/sb_techstation/unequip.png:grayed?brightness=-30", - "pressedOffset": [0, 0], - "position": [248, 155], - "callback": "unequip", - "data": "head" - }, - "btnUnequipBody": { - "type": "button", - "base": "/interface/scripted/sb_techstation/unequip.png:normal", - "hover": "/interface/scripted/sb_techstation/unequip.png:highlight", - "pressed": "/interface/scripted/sb_techstation/unequip.png:grayed", - "pressedOffset": [0, 0], - "position": [282, 155], - "callback": "unequip", - "data": "body" - }, - "btnUnequipLegs": { - "type": "button", - "base": "/interface/scripted/sb_techstation/unequip.png:normal", - "hover": "/interface/scripted/sb_techstation/unequip.png:highlight", - "pressed": "/interface/scripted/sb_techstation/unequip.png:grayed", - "pressedOffset": [0, 0], - "position": [316, 155], - "callback": "unequip", - "data": "legs" - }, - "btnUnequipSuit": { - "type": "button", - "base": "/interface/scripted/sb_techstation/unequip.png:normal", - "hover": "/interface/scripted/sb_techstation/unequip.png:highlight", - "pressed": "/interface/scripted/sb_techstation/unequip.png:grayed", - "pressedOffset": [0, 0], - "position": [350, 155], - "callback": "unequip", - "data": "suit" - }, - "lblTechSlotHead": { - "type": "label", - "position": [260, 165], - "hAnchor": "mid", - "vAnchor": "mid", - "value": "^shadow;HEAD", - "mouseTransparent": true - }, - "lblTechSlotBody": { - "type": "label", - "position": [294, 165], - "hAnchor": "mid", - "vAnchor": "mid", - "value": "^shadow;BODY", - "mouseTransparent": true - }, - "lblTechSlotLeg": { - "type": "label", - "position": [328, 165], - "hAnchor": "mid", - "vAnchor": "mid", - "value": "^shadow;LEG", - "mouseTransparent": true - }, - "lblTechSlotSuit": { - "type": "label", - "position": [362, 165], - "hAnchor": "mid", - "vAnchor": "mid", - "value": "^shadow;SUIT", - "mouseTransparent": true - }, - "techIconHead": { - "type": "image", - "position": [81, 153], - "centered": true, - "mouseTransparent": true - }, - "techIconBody": { - "type": "image", - "position": [81, 125], - "centered": true, - "mouseTransparent": true - }, - "techIconLegs": { - "type": "image", - "position": [81, 97], - "centered": true, - "mouseTransparent": true - }, - "techIconSuit": { - "type": "image", - "position": [20, 88], //[81, 69], - "visible": false, - "centered": true, - "mouseTransparent": true - }, - "imgChipsBackground": { - "type": "image", - "position": [42, 21] - }, - "lblChipsCount": { - "type": "label", - "zlevel": 1, - "color": [0, 187, 0], - "position": [324, 48], - "value": "", - "mouseTransparent": true - }, - "btnEnable": { - "type": "button", - "base": "", - "hover": "", - "pressed": "", - "disabledImage": "", - "pressedOffset": [0, 0], - "position": [252, 43], - "callback": "doEnable" - }, - "letmebind": { - "type": "button", - "base": "/interface/scripted/sb_techstation/letmebind.png:2", - "hover": "/interface/scripted/sb_techstation/letmebind.png:1", - "pressed": "/interface/scripted/sb_techstation/letmebind.png:0", - "disabledImage": "/interface/scripted/sb_techstation/letmebind.png:0?brightness=-30", - "pressedOffset": [0, 0], - "position": [11, 53], - "callback": "openPane", - "data": "/interface/scripted/sb_techselection/techselection.config" - }, - /* - "letme3d" : { - "type" : "button", - "base" : "/interface/scripted/sb_techstation/letme3dup.png", - "hover" : "/interface/scripted/sb_techstation/letme3dover.png", - "pressed" : "/interface/scripted/sb_techstation/letme3ddown.png", - "disabledImage" : "/interface/scripted/sb_techstation/letme3ddown.png?brightness=-30", - "pressedOffset" : [0, 0], - "position" : [11, 38], - "callback" : "openPane", - "data" : "/interface/scripted/sb_3dprinter/3dprinter.config" - },*/ - "close": { - "type": "button", - "base": "/interface/x.png", - "hover": "/interface/xhover.png", - "pressed": "/interface/xpress.png", - "pressedOffset": [0, 0], - "callback": "close", - "position": [371, 183] - } - }, - - "scriptWidgetCallbacks": [ - "unequip", - "doEnable", - "techSelected", - "slotSelected", - "techSlotGroup", - "openPane" - ], - - "scripts": ["/interface/scripted/sb_techstation/techupgradegui.lua"], - "scriptDelta": 4, - - "buttonImages": [{ - "base": "/interface/scripted/sb_techstation/button.png:0", - "hover": "/interface/scripted/sb_techstation/button.png:3", - "pressed": "/interface/scripted/sb_techstation/button.png:6", - "disabledImage": "/interface/scripted/sb_techstation/button.png:0?brightness=-30" - }, { - "base": "/interface/scripted/sb_techstation/button.png:1", - "hover": "/interface/scripted/sb_techstation/button.png:4", - "pressed": "/interface/scripted/sb_techstation/button.png:7", - "disabledImage": "/interface/scripted/sb_techstation/button.png:1?brightness=-30" - }, { - "base": "/interface/scripted/sb_techstation/button.png:2", - "hover": "/interface/scripted/sb_techstation/button.png:5", - "pressed": "/interface/scripted/sb_techstation/button.png:8", - "disabledImage": "/interface/scripted/sb_techstation/button.png:2?brightness=-30" - } - ], - "selectTechDescription": "Here you can augment your body with Tech Drives, Implants, and Nanosuits.\n^orange;Tech Drives^green; and ^orange;Implants^green; will give you unique abilities whilst ^orange;Nanosuits^green; will allow you to survive in otherwise deadly environments.", - - "techLockedIcon": "/interface/scripted/sb_techstation/upgradelocked.png", - "suitImagePath": "/interface/ai/suits/%s-%s.png", - "defaultCost": 5, //TODO: grab from vanilla config before using this - "driveCost": 1, - - "techValues": { - "energyUsage": "Energy Usage: %s", - "energyUsageRate": "Energy Usage Rate: %s", - "energyUsagePerSecond": "Energy Usage Per Second: %s", - - "energyCost": "Energy Cost: %s", - "energyCostRate": "Energy Cost Rate: %s", - "energyCostPerSecond": "Energy Cost Per Second: %s", - - "regenRate": "Regeneration Rate: %s", - "energyCostPerBomb": "Energy Cost (Bomb): %s", - "energyCostPerSmash": "Energy Cost (Smash): %s", - - "shieldDuration": "Shield Duration: %s", - "cooldown": "Cooldown: %s", - "minDamage": "Minimum Damage: %s", - - "statIncrease": "Stat Increase: %s", - "rechargeTime": "Recharge Time: %s" - } -} diff --git a/interface/scripted/sb_techstation/techupgradegui.lua b/interface/scripted/sb_techstation/techupgradegui.lua deleted file mode 100644 index ab3e1be7..00000000 --- a/interface/scripted/sb_techstation/techupgradegui.lua +++ /dev/null @@ -1,334 +0,0 @@ -require "/scripts/util.lua" -require "/scripts/interp.lua" -require "/scripts/sb_assetmissing.lua" - -function init() - sb_techType() - static = {0,0} - techList = "techScrollArea.techList" - ownedImplants = player.getProperty("sb_bioimplants") - self_availableImplants = player.getProperty("sb_availableBioimplants") - if #ownedImplants > 1 then table.sort(ownedImplants,function(a,b) return a 1 then table.sort(self_availableImplants,function(a,b) return a= cost) - else - showUnlockButton = false - end - end - if selectedSlot == "Suit" then - if not contains(ownedImplants, selectedTech) then - showUnlockButton = true - local cost = techCost(selectedTech) - widget.setText("lblChipsCount", string.format("%s/%s", currentChips, cost)) - setButtonEnabled(player.isAdmin() or currentChips >= cost) - else - showUnlockButton = false - end - end - end - updateButtonImage() -end - -function techCost(techName) - if techs[techName] == nil then return defaultCost end - return techs[techName].chipCost or defaultCost -end - -function showDriveCost() - local currentDrives = player.hasCountOfItem("techcard") - widget.setText("lblChipsCount", string.format("%s/%s", currentDrives, driveCost)) - setButtonEnabled(player.isAdmin() or currentDrives >= driveCost) -end - -function populateTechList(slot) - selectedTech = nil - widget.setText("lblChipsCount", "") - widget.setButtonImages("btnEnable", buttonImages[1]) - widget.clearListItems(techList) - - local availableTechs = player.availableTechs() - local enabledTechs = player.enabledTechs() - local disabled = util.filter(util.keys(techs), function(a) return not contains(enabledTechs, a) end) - util.appendLists(enabledTechs, disabled) - availableTechs = enabledTechs - - for _,techName in pairs(availableTechs) do - if not techs[techName] then techs[techName] = root.hasTech(techName) and root.techConfig(techName) end - if root.hasTech(techName) then - local config = techs[techName] - if root.techType(techName) == slot then - local listItem = widget.addListItem(techList) - widget.setText(string.format("%s.%s.techName", techList, listItem), config.shortDescription) - widget.setData(string.format("%s.%s", techList, listItem), techName) - - if contains(player.enabledTechs(), techName) then - widget.setImage(string.format("%s.%s.techIcon", techList, listItem), sb_assetmissing(config.icon,"/interface/sb_tooltips/assetmissing.png")) - else - widget.setImage(string.format("%s.%s.techIcon", techList, listItem), self_techLockedIcon) - end - - if player.getProperty("sb_bioimplant") == techName or player.equippedTech(slot) == techName then - widget.setListSelected(techList, listItem) - widget.setButtonEnabled("btnEnable", true) - widget.setButtonImages("btnEnable", buttonImages[3]) - end - end - end - end -end - -function setSelectedSlot(slot) - selectedSlot = slot - updateEquippedIcons() - widget.setText("lblDescription", selectTechDescription) - - if slot == "Suit" then - widget.clearListItems(techList) - selectedTech = nil - widget.setButtonImages("btnEnable", buttonImages[1]) - widget.setButtonEnabled("btnEnable", false) - equipSuit() - else - populateTechList(slot) - end -end - -function animateSelection(dt) - if static[1] >= 3 then static[1] = 0 else static[1] = static[1] + 1 end - if static[2] >= 13 then static[2] = 0 else static[2] = static[2] + 1 end - widget.setImage("staticImage","/ai/staticapex.png:"..static[1]) - widget.setImage("staticImage","/interface/scripted/sb_techstation/scanlines.png:"..static[2]) -end - -function enableTech(techName) - local cost = techCost(techName) - if player.isAdmin() or player.consumeItem({name = "techcard", count = cost}) then - player.enableTech(techName) - equipTech(techName) - populateTechList(selectedSlot) - end -end - -function enableSuit(techName) - local cost = techCost(techName) - if not contains(ownedImplants, techName) and (player.isAdmin() or player.consumeItem({name = "techcard", count = cost})) then - if #ownedImplants == 0 then ownedImplants = {techName} else ownedImplants[#ownedImplants+1] = techName end - player.setProperty("sb_bioimplants", ownedImplants) - if #ownedImplants > 1 then table.sort(ownedImplants,function(a,b) return a= techCost(techName) - widget.setButtonEnabled("btnEnable", affordable) - end - updateButtonImage() -end - -function equipSuit() - local listItem = widget.getListSelected(techList) - if listItem then setSelectedTech(player.getProperty("sb_bioimplant")) end - widget.clearListItems(techList) - widget.setButtonEnabled("btnEnable", false) - local listedTechs = {} - for i = 1, 2 do - local target2 = i == 1 and #ownedImplants or #self_availableImplants - for implants = 1, target2 do - local target = i == 1 and ownedImplants[implants] or self_availableImplants[implants] - player.makeTechUnavailable(target) - if root.hasTech(target) then - if not contains(listedTechs, target) then - listedTechs[#listedTechs+1] = target - local config = root.techConfig(target) - local listItem = widget.addListItem(techList) - widget.setText(string.format("%s.%s.techName", techList, listItem), config.shortDescription) - widget.setData(string.format("%s.%s", techList, listItem), {target,config.sb_effect}) - widget.setImage(string.format("%s.%s.techIcon", techList, listItem), i==1 and sb_assetmissing(config.icon,"/interface/sb_tooltips/assetmissing.png") or self_techLockedIcon) - if player.getProperty("sb_bioimplant") == config.name then - widget.setListSelected(techList, listItem) - end - end --- else --- sb.logWarn("Could not load tech '"..target.."' of kind 'suit'. Skipping!") - end - end - end -end - -function updateSuitImage() - local tech = player.getProperty("sb_bioimplant") - local icon = "" - if tech and root.hasTech(tech) then - icon = root.techConfig(tech).sb_suitImage or "?replace;73daff=f7d700;27abff=e99400;117ee4=c65d00;1f45d4=8a2400;002b72=430000;001522=230000?saturation=-50" - end - widget.setImage("imgSuit", string.format(imgSuit)..string.format(icon.."?multiply=FFFFFF%2x", math.floor(0.8 * 255))) -end - -function ownsTech(techName) - local ownedTech = player.availableTechs() - for techs_ = 1, #ownedTech do - if ownedTech[techs_] == techName then return true - end - end -end - -function techSelected() - local listItem = widget.getListSelected(techList) - if listItem then - local techName = nil - if selectedSlot == "Suit" then techName = widget.getData(string.format("%s.%s", techList, listItem)) techName = techName[1] else - techName = widget.getData(string.format("%s.%s", techList, listItem)) end - setSelectedTech(techName) - end -end - -function techSlotGroup(button, slot) - setSelectedSlot(slot) -end - -function doEnable() - if selectedTech == nil then return end - - if selectedSlot == "Suit" then - local ownsSuit = contains(ownedImplants, selectedTech) - if ownsSuit then - if player.getProperty("sb_bioimplant") == selectedTech then giveTech() return end - world.sendEntityMessage(player.id(), "sb_implant", widget.getData(string.format("%s.%s", techList, widget.getListSelected(techList)))) - equipSuit() - else - enableSuit(selectedTech) return - end - end - - if (selectedTech) and (selectedSlot ~= "Suit") then - if player.equippedTech(selectedSlot) == selectedTech then giveTech() return - else if contains(player.enabledTechs(), selectedTech) then - equipTech(selectedTech) - else - enableTech(selectedTech) - end - end - end -end - -function giveTech() - if player.isAdmin() or player.consumeItem({name="techcard",count=driveCost}) then - player.giveItem({"sb_tech",1,{techModule=selectedTech}}) - end -end - -function unequip(_,slot) - if slot == "suit" then - world.sendEntityMessage(player.id(),"sb_implant_unequip") - widget.setText("lblDescription", selectTechDescription) - widget.setButtonEnabled("btnEnable", false) - else - local tech = player.equippedTech(slot) - if tech then player.unequipTech(tech) end - end - updateEquippedIcons() - updateSuitImage() -end - -function openPane(_,a) player.interact("ScriptPane",a,pane.sourceEntity()) pane.dismiss() end \ No newline at end of file diff --git a/interface/scripted/sb_techstation/unequip.frames b/interface/scripted/sb_techstation/unequip.frames deleted file mode 100644 index 903aebc0..00000000 --- a/interface/scripted/sb_techstation/unequip.frames +++ /dev/null @@ -1,12 +0,0 @@ -{ - "frameGrid" : { - "size" : [9, 6], - "dimensions" : [3, 1], - "names" : [ - [ "normal", "highlight", "grayed" ] - ] - }, - "aliases" : { - "default" : "normal" - } -} diff --git a/interface/scripted/sb_techstation/unequip.png b/interface/scripted/sb_techstation/unequip.png deleted file mode 100644 index b8bec1b3..00000000 Binary files a/interface/scripted/sb_techstation/unequip.png and /dev/null differ diff --git a/interface/scripted/sb_techstation/upgradelocked.png b/interface/scripted/sb_techstation/upgradelocked.png deleted file mode 100644 index 18633541..00000000 Binary files a/interface/scripted/sb_techstation/upgradelocked.png and /dev/null differ diff --git a/interface/scripted/sbvn/sb_sbvnobject.lua b/interface/scripted/sbvn/sb_sbvnobject.lua new file mode 100644 index 00000000..e597b287 --- /dev/null +++ b/interface/scripted/sbvn/sb_sbvnobject.lua @@ -0,0 +1,10 @@ +local ini = init or function() end +local unini = uninit or function() end + +function init() ini() + storage = config.getParameter("scriptStorage", storage) +end + +function uninit() unini() + object.setConfigParameter("scriptStorage", storage) +end \ No newline at end of file diff --git a/interface/stats/sb_lightningplus.png b/interface/stats/sb_lightningplus.png index 33508abd..dc767eca 100644 Binary files a/interface/stats/sb_lightningplus.png and b/interface/stats/sb_lightningplus.png differ diff --git a/interface/statuses/electricblock.png b/interface/statuses/electricblock.png new file mode 100644 index 00000000..209fad87 Binary files /dev/null and b/interface/statuses/electricblock.png differ diff --git a/interface/statuses/sb_electricblock2.png b/interface/statuses/sb_electricblock2.png deleted file mode 100644 index 833b2181..00000000 Binary files a/interface/statuses/sb_electricblock2.png and /dev/null differ diff --git a/interface/statuses/sb_healblock2.png b/interface/statuses/sb_healblock2.png index ecaa281b..004bea4d 100644 Binary files a/interface/statuses/sb_healblock2.png and b/interface/statuses/sb_healblock2.png differ diff --git a/interface/tooltips/sb_body.png b/interface/tooltips/sb_body.png index a1f3996d..c4c15259 100644 Binary files a/interface/tooltips/sb_body.png and b/interface/tooltips/sb_body.png differ diff --git a/interface/tooltips/sb_bodyaugment.png b/interface/tooltips/sb_bodyaugment.png index d22381cf..c43715f1 100644 Binary files a/interface/tooltips/sb_bodyaugment.png and b/interface/tooltips/sb_bodyaugment.png differ diff --git a/interface/tooltips/sb_bodyobject.png b/interface/tooltips/sb_bodyobject.png index 17a4995c..032a2541 100644 Binary files a/interface/tooltips/sb_bodyobject.png and b/interface/tooltips/sb_bodyobject.png differ diff --git a/interface/tooltips/sb_bodyobject2.png b/interface/tooltips/sb_bodyobject2.png index 5a8162e1..b2070561 100644 Binary files a/interface/tooltips/sb_bodyobject2.png and b/interface/tooltips/sb_bodyobject2.png differ diff --git a/interface/tooltips/sb_bodyobject3.png b/interface/tooltips/sb_bodyobject3.png index c75f2254..b99d4cd4 100644 Binary files a/interface/tooltips/sb_bodyobject3.png and b/interface/tooltips/sb_bodyobject3.png differ diff --git a/interface/tooltips/sb_bodyobject4.png b/interface/tooltips/sb_bodyobject4.png index db92e989..afad100c 100644 Binary files a/interface/tooltips/sb_bodyobject4.png and b/interface/tooltips/sb_bodyobject4.png differ diff --git a/interface/tooltips/sb_bodyobjectextended.png b/interface/tooltips/sb_bodyobjectextended.png index 01351815..ba90d562 100644 Binary files a/interface/tooltips/sb_bodyobjectextended.png and b/interface/tooltips/sb_bodyobjectextended.png differ diff --git a/interface/tooltips/sb_bodyobjecttech2.png b/interface/tooltips/sb_bodyobjecttech2.png index 88e21e64..bd34d08f 100644 Binary files a/interface/tooltips/sb_bodyobjecttech2.png and b/interface/tooltips/sb_bodyobjecttech2.png differ diff --git a/interface/tooltips/sb_bodyobjecttext.png b/interface/tooltips/sb_bodyobjecttext.png index b2668dd5..58397cd8 100644 Binary files a/interface/tooltips/sb_bodyobjecttext.png and b/interface/tooltips/sb_bodyobjecttext.png differ diff --git a/interface/tooltips/sb_food.tooltip b/interface/tooltips/sb_food.tooltip index 52371b1d..78f828c2 100644 --- a/interface/tooltips/sb_food.tooltip +++ b/interface/tooltips/sb_food.tooltip @@ -14,15 +14,15 @@ }, "foodValueLabel": { "type": "label", - "position": [18, 168], - "hAnchor": "left", + "position": [36, 168], + "hAnchor": "mid", "centered": true, "width": 126 }, "foodAmountLabel": { "type": "label", - "position": [18, 168], - "hAnchor": "left", + "position": [36, 168], + "hAnchor": "mid", "centered": true, "width": 126 }, @@ -63,7 +63,7 @@ }, "effectLabel": { "type": "label", - "position": [70, 178], + "position": [67.5, 178], "wrapWidth": 90, "fontSize": 6, "lineSpacing": 1, diff --git a/interface/tooltips/sb_footer.png b/interface/tooltips/sb_footer.png index ffcc3111..86ab1af8 100644 Binary files a/interface/tooltips/sb_footer.png and b/interface/tooltips/sb_footer.png differ diff --git a/interface/tooltips/sb_footer2.png b/interface/tooltips/sb_footer2.png index 6ccc57d3..6cae3941 100644 Binary files a/interface/tooltips/sb_footer2.png and b/interface/tooltips/sb_footer2.png differ diff --git a/interface/tooltips/sb_footer3.png b/interface/tooltips/sb_footer3.png index 8cca9b4d..3d15e3be 100644 Binary files a/interface/tooltips/sb_footer3.png and b/interface/tooltips/sb_footer3.png differ diff --git a/interface/tooltips/sb_footer4.png b/interface/tooltips/sb_footer4.png index 1ca0fa71..63eb2daa 100644 Binary files a/interface/tooltips/sb_footer4.png and b/interface/tooltips/sb_footer4.png differ diff --git a/interface/tooltips/sb_footeraugment.png b/interface/tooltips/sb_footeraugment.png index e924e796..54bf58c8 100644 Binary files a/interface/tooltips/sb_footeraugment.png and b/interface/tooltips/sb_footeraugment.png differ diff --git a/interface/tooltips/sb_footerextended.png b/interface/tooltips/sb_footerextended.png index 252a5d16..ffdc8ea2 100644 Binary files a/interface/tooltips/sb_footerextended.png and b/interface/tooltips/sb_footerextended.png differ diff --git a/interface/tooltips/sb_footertech2.png b/interface/tooltips/sb_footertech2.png index 274a3585..4d0246e0 100644 Binary files a/interface/tooltips/sb_footertech2.png and b/interface/tooltips/sb_footertech2.png differ diff --git a/interface/tooltips/sb_gun4.tooltip b/interface/tooltips/sb_gun4.tooltip index 83177d44..ea664d62 100644 --- a/interface/tooltips/sb_gun4.tooltip +++ b/interface/tooltips/sb_gun4.tooltip @@ -29,7 +29,7 @@ "hAnchor": "left", "vAnchor": "top", "wrapWidth": 126, - "value": "^gray;Craft ammo at an anvil!" + "value": "^green;This weapon can use ammo" }, "altAbilityTitleLabel": { "type": "label", diff --git a/interface/tooltips/sb_header.png b/interface/tooltips/sb_header.png index c480d34f..4d920cf4 100644 Binary files a/interface/tooltips/sb_header.png and b/interface/tooltips/sb_header.png differ diff --git a/interface/tooltips/sb_header2.png b/interface/tooltips/sb_header2.png index 694ec226..c7397557 100644 Binary files a/interface/tooltips/sb_header2.png and b/interface/tooltips/sb_header2.png differ diff --git a/interface/tooltips/sb_header3.png b/interface/tooltips/sb_header3.png index 37836d1c..b197d976 100644 Binary files a/interface/tooltips/sb_header3.png and b/interface/tooltips/sb_header3.png differ diff --git a/interface/tooltips/sb_header4.png b/interface/tooltips/sb_header4.png index abe23118..0edee76d 100644 Binary files a/interface/tooltips/sb_header4.png and b/interface/tooltips/sb_header4.png differ diff --git a/interface/tooltips/sb_object.tooltip b/interface/tooltips/sb_object.tooltip index 913d9e05..59ccb84d 100644 --- a/interface/tooltips/sb_object.tooltip +++ b/interface/tooltips/sb_object.tooltip @@ -16,25 +16,6 @@ "hAnchor": "left", "value": "0" }, - "warmthImage": { - "type": "image", - "position": [18, 108], - "zlevel": 3, - "centered": true, - "file": "" - }, - "augmentIconImage": { - "type": "image", - "position": [18, 108], - "zlevel": 3, - "centered": true, - "file": "" - }, - "augmentNameLabel": { - "type": "label", - "position": [30, 42], - "fontSize": 0 - }, "damageKindImage": { "type": "image", "position": [120, 86], @@ -130,13 +111,13 @@ "hAnchor": "left", "centered": true, "width": 126 + }, + "levelLabel": { + "type": "label", + "position": [130, 135], + "hAnchor": "right", + "color": "gray", + "centered": true, + "wrapWidth": 126 } - /* "levelLabel" : { - "type" : "label", - "position" : [130, 135], - "hAnchor" : "right", - "color" : "gray", - "centered" : true, - "wrapWidth" : 126 - }*/ } diff --git a/interface/tooltips/sb_object4.tooltip b/interface/tooltips/sb_object4.tooltip index da28efd3..25029081 100644 --- a/interface/tooltips/sb_object4.tooltip +++ b/interface/tooltips/sb_object4.tooltip @@ -104,5 +104,13 @@ "hAnchor": "left", "centered": true, "width": 126 + }, + "levelLabel": { + "type": "label", + "position": [130, 145], + "hAnchor": "right", + "color": "gray", + "centered": true, + "wrapWidth": 126 } } diff --git a/interface/tooltips/sb_object4b.tooltip b/interface/tooltips/sb_object4b.tooltip index 9ed3ed8b..25a5f3e3 100644 --- a/interface/tooltips/sb_object4b.tooltip +++ b/interface/tooltips/sb_object4b.tooltip @@ -105,5 +105,13 @@ "hAnchor": "left", "centered": true, "width": 126 + }, + "levelLabel": { + "type": "label", + "position": [130, 145], + "hAnchor": "right", + "color": "gray", + "centered": true, + "wrapWidth": 126 } } diff --git a/interface/tooltips/sb_tall.tooltip b/interface/tooltips/sb_tall.tooltip deleted file mode 100644 index 5de493fe..00000000 --- a/interface/tooltips/sb_tall.tooltip +++ /dev/null @@ -1,43 +0,0 @@ -{ - "background": { - "type": "background", - "fileHeader": "/interface/tooltips/sb_header.png", - "fileBody": "/interface/tooltips/sb_body.png?scalenearest=1;3.2", - "fileFooter": "/interface/tooltips/sb_footer.png" - }, - "objectImage": { - "type": "image", - "position": [67, 88], - "file": "", - "centered": false, - "maxSize": [32, 240], - "minSize": [16, 240] - }, - "descriptionLabel": { - "type": "label", - "position": [12, 78], - "hAnchor": "left", - "vAnchor": "bottom", - "wrapWidth": 124, - "lineSpacing": 1.0, - "value": "" - }, - "priceLabel": { - "type": "label", - "position": [120, 23], - "hAnchor": "left", - "value": "tree" - }, - "moneyIcon": { - "type": "image", - "position": [108, 23], - "file": "/interface/money.png" - }, - "rarityLabel": { - "type": "label", - "position": [7, 23], - "hAnchor": "left", - "centered": true, - "wrapWidth": 126 - } -} diff --git a/interface/tooltips/sb_v5.tooltip b/interface/tooltips/sb_v5.tooltip index bc3d1ba0..31ae8d50 100644 --- a/interface/tooltips/sb_v5.tooltip +++ b/interface/tooltips/sb_v5.tooltip @@ -38,5 +38,13 @@ "centered": true, "maxSize": [70, 45], "minSize": [70, 45] + }, + "levelLabel": { + "type": "label", + "position": [130, 147], + "hAnchor": "right", + "color": "gray", + "centered": true, + "wrapWidth": 126 } } diff --git a/interface/warping/sb_warpbody.png b/interface/warping/sb_warpbody.png index fd3c172e..fe6f794d 100644 Binary files a/interface/warping/sb_warpbody.png and b/interface/warping/sb_warpbody.png differ diff --git a/interface/warping/sb_warpfooter.png b/interface/warping/sb_warpfooter.png index a489ae6a..03683f17 100644 Binary files a/interface/warping/sb_warpfooter.png and b/interface/warping/sb_warpfooter.png differ diff --git a/interface/warping/sb_warpheader.png b/interface/warping/sb_warpheader.png index f79c15c3..db801603 100644 Binary files a/interface/warping/sb_warpheader.png and b/interface/warping/sb_warpheader.png differ diff --git a/interface/wedit/liquidPicker/liquids/sb_alienjuice.png b/interface/wedit/liquidPicker/liquids/sb_alienjuice.png index 43a61e75..d67eaa70 100644 Binary files a/interface/wedit/liquidPicker/liquids/sb_alienjuice.png and b/interface/wedit/liquidPicker/liquids/sb_alienjuice.png differ diff --git a/interface/wedit/liquidPicker/liquids/sb_coffee.png b/interface/wedit/liquidPicker/liquids/sb_coffee.png index a57a70cd..d08879bd 100644 Binary files a/interface/wedit/liquidPicker/liquids/sb_coffee.png and b/interface/wedit/liquidPicker/liquids/sb_coffee.png differ diff --git a/interface/wedit/liquidPicker/liquids/sb_liquidnitrogen.png b/interface/wedit/liquidPicker/liquids/sb_liquidnitrogen.png index 6490519f..c3e5ffbf 100644 Binary files a/interface/wedit/liquidPicker/liquids/sb_liquidnitrogen.png and b/interface/wedit/liquidPicker/liquids/sb_liquidnitrogen.png differ diff --git a/interface/wedit/liquidPicker/liquids/sb_tentaclejuice.png b/interface/wedit/liquidPicker/liquids/sb_tentaclejuice.png index c0b49fa0..7b09928a 100644 Binary files a/interface/wedit/liquidPicker/liquids/sb_tentaclejuice.png and b/interface/wedit/liquidPicker/liquids/sb_tentaclejuice.png differ diff --git a/interface/wedit/materialPicker/materials/sb_brains.png b/interface/wedit/materialPicker/materials/sb_brains.png index 7544d77d..ab9e879a 100644 Binary files a/interface/wedit/materialPicker/materials/sb_brains.png and b/interface/wedit/materialPicker/materials/sb_brains.png differ diff --git a/interface/wedit/materialPicker/materials/sb_chain.png b/interface/wedit/materialPicker/materials/sb_chain.png index 9157a0a7..38a45fca 100644 Binary files a/interface/wedit/materialPicker/materials/sb_chain.png and b/interface/wedit/materialPicker/materials/sb_chain.png differ diff --git a/interface/wedit/materialPicker/materials/sb_concrete.png b/interface/wedit/materialPicker/materials/sb_concrete.png index f19112b9..eb3b3ee7 100644 Binary files a/interface/wedit/materialPicker/materials/sb_concrete.png and b/interface/wedit/materialPicker/materials/sb_concrete.png differ diff --git a/interface/wedit/materialPicker/materials/skyrail_asc.png b/interface/wedit/materialPicker/materials/skyrail_asc.png index 55379fca..30b081e0 100644 Binary files a/interface/wedit/materialPicker/materials/skyrail_asc.png and b/interface/wedit/materialPicker/materials/skyrail_asc.png differ diff --git a/interface/wedit/materialPicker/materials/skyrail_diodel.png b/interface/wedit/materialPicker/materials/skyrail_diodel.png index ca0a68b3..dd32b087 100644 Binary files a/interface/wedit/materialPicker/materials/skyrail_diodel.png and b/interface/wedit/materialPicker/materials/skyrail_diodel.png differ diff --git a/interface/wedit/materialPicker/materials/skyrailboost.png b/interface/wedit/materialPicker/materials/skyrailboost.png index 3e56b0f0..4f643884 100644 Binary files a/interface/wedit/materialPicker/materials/skyrailboost.png and b/interface/wedit/materialPicker/materials/skyrailboost.png differ diff --git a/interface/wedit/materialPicker/materials/skyrailbreak.png b/interface/wedit/materialPicker/materials/skyrailbreak.png index 642bd893..dd4c563d 100644 Binary files a/interface/wedit/materialPicker/materials/skyrailbreak.png and b/interface/wedit/materialPicker/materials/skyrailbreak.png differ diff --git a/interface/wedit/materialPicker/materials/skyrailplatform.png b/interface/wedit/materialPicker/materials/skyrailplatform.png index c47dbf14..ba59e47c 100644 Binary files a/interface/wedit/materialPicker/materials/skyrailplatform.png and b/interface/wedit/materialPicker/materials/skyrailplatform.png differ diff --git a/interface/wedit/matmodPicker/mods/platinum.png b/interface/wedit/matmodPicker/mods/platinum.png index b6692a3f..dbe2bdaf 100644 Binary files a/interface/wedit/matmodPicker/mods/platinum.png and b/interface/wedit/matmodPicker/mods/platinum.png differ diff --git a/interface/wedit/matmodPicker/mods/sb_cerulium.png b/interface/wedit/matmodPicker/mods/sb_cerulium.png index 13558932..e8fa1546 100644 Binary files a/interface/wedit/matmodPicker/mods/sb_cerulium.png and b/interface/wedit/matmodPicker/mods/sb_cerulium.png differ diff --git a/interface/wedit/matmodPicker/mods/sb_fossil.png b/interface/wedit/matmodPicker/mods/sb_fossil.png index 055bf170..18947ab1 100644 Binary files a/interface/wedit/matmodPicker/mods/sb_fossil.png and b/interface/wedit/matmodPicker/mods/sb_fossil.png differ diff --git a/interface/wedit/matmodPicker/mods/sb_rubium.png b/interface/wedit/matmodPicker/mods/sb_rubium.png index 69e7241e..955219bb 100644 Binary files a/interface/wedit/matmodPicker/mods/sb_rubium.png and b/interface/wedit/matmodPicker/mods/sb_rubium.png differ diff --git a/interface/windowconfig/crafting.config.patch b/interface/windowconfig/crafting.config.patch index 8d444ca6..9aa87487 100644 --- a/interface/windowconfig/crafting.config.patch +++ b/interface/windowconfig/crafting.config.patch @@ -171,15 +171,15 @@ }, { "op": "replace", "path": "/paneLayout/close/pressed", - "value": "/interface/sb_inventory/xpress.png" + "value": "/interface/xpress.png" }, { "op": "replace", "path": "/paneLayout/close/base", - "value": "/interface/sb_inventory/x.png" + "value": "/interface/x.png" }, { "op": "replace", "path": "/paneLayout/close/hover", - "value": "/interface/sb_inventory/xhover.png" + "value": "/interface/xhover.png" }, //{"op":"remove","path":"/paneLayout/windowtitle/icon/file"}, { @@ -353,7 +353,7 @@ "baseImage": "/interface/sb_crafting/categories.png:smith", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:smith", "data": { - "filter": ["sb_tools", "tools", "sb_stations"] + "filter": ["sb_tools", "tools", "mining", "sb_stations"] } } }, { diff --git a/interface/windowconfig/craftingmerchant.config.patch b/interface/windowconfig/craftingmerchant.config.patch index f73b97d7..6cc20952 100644 --- a/interface/windowconfig/craftingmerchant.config.patch +++ b/interface/windowconfig/craftingmerchant.config.patch @@ -1,4 +1,5 @@ -[[{ +[ + [{ "op": "test", "path": "/paneLayout/scrollArea/children/itemList/schema/listTemplate/itemName/wrapWidth", "value": 116 @@ -7,4 +8,5 @@ "path": "/paneLayout/scrollArea/children/itemList/schema/listTemplate/itemName/wrapWidth", "value": 126 } - ]] + ] +] diff --git a/interface/windowconfig/playerinventory.config.patch b/interface/windowconfig/playerinventory.config.patch index a7e46320..5e598268 100644 --- a/interface/windowconfig/playerinventory.config.patch +++ b/interface/windowconfig/playerinventory.config.patch @@ -48,120 +48,5 @@ "path": "/paneLayout/mainItemGrid/showDurability", "value": true } - ], - - [{ - "op": "test", - "path": "/paneLayout/newGeneralItems/position/0", - "value": 30 - }, { - "op": "test", - "path": "/paneLayout/newGeneralItems/position/1", - "value": 112 - }, { - "op": "test", - "path": "/paneLayout/newGeneralItems/file", - "value": "/interface/inventory/dot.png" - }, { - "op": "replace", - "path": "/paneLayout/newGeneralItems/file", - "value": "/interface/sb_inventory/dot2.png" - }, { - "op": "replace", - "path": "/paneLayout/newGeneralItems/position/0", - "value": 11 - } - ], - - [{ - "op": "test", - "path": "/paneLayout/newTileItems/position/0", - "value": 57 - }, { - "op": "test", - "path": "/paneLayout/newTileItems/position/1", - "value": 112 - }, { - "op": "test", - "path": "/paneLayout/newTileItems/file", - "value": "/interface/inventory/dot.png" - }, { - "op": "replace", - "path": "/paneLayout/newTileItems/file", - "value": "/interface/sb_inventory/dot2.png" - }, { - "op": "replace", - "path": "/paneLayout/newTileItems/position/0", - "value": 38 - } - ], - - [{ - "op": "test", - "path": "/paneLayout/newObjectItems/position/0", - "value": 84 - }, { - "op": "test", - "path": "/paneLayout/newObjectItems/position/1", - "value": 112 - }, { - "op": "test", - "path": "/paneLayout/newObjectItems/file", - "value": "/interface/inventory/dot.png" - }, { - "op": "replace", - "path": "/paneLayout/newObjectItems/file", - "value": "/interface/sb_inventory/dot2.png" - }, { - "op": "replace", - "path": "/paneLayout/newObjectItems/position/0", - "value": 65 - } - ], - - [{ - "op": "test", - "path": "/paneLayout/newReagentItems/position/0", - "value": 111 - }, { - "op": "test", - "path": "/paneLayout/newReagentItems/position/1", - "value": 112 - }, { - "op": "test", - "path": "/paneLayout/newReagentItems/file", - "value": "/interface/inventory/dot.png" - }, { - "op": "replace", - "path": "/paneLayout/newReagentItems/file", - "value": "/interface/sb_inventory/dot2.png" - }, { - "op": "replace", - "path": "/paneLayout/newReagentItems/position/0", - "value": 92 - } - ], - - [{ - "op": "test", - "path": "/paneLayout/newFoodItems/position/0", - "value": 138 - }, { - "op": "test", - "path": "/paneLayout/newFoodItems/position/1", - "value": 112 - }, { - "op": "test", - "path": "/paneLayout/newFoodItems/file", - "value": "/interface/inventory/dot.png" - }, { - "op": "replace", - "path": "/paneLayout/newFoodItems/file", - "value": "/interface/sb_inventory/dot2.png" - }, { - "op": "replace", - "path": "/paneLayout/newFoodItems/position/0", - "value": 119 - } ] ] diff --git a/interface/windowconfig/sb_crafting.config b/interface/windowconfig/sb_crafting.config index a1d4e904..410a751d 100644 --- a/interface/windowconfig/sb_crafting.config +++ b/interface/windowconfig/sb_crafting.config @@ -10,9 +10,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { @@ -196,7 +196,7 @@ "toggleMode": true, "buttons": [{ "pressedOffset": [0, -1], - "position": [39, 44], + "position": [19, 44], "baseImage": "/interface/sb_crafting/categories.png:armor", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:armor", "data": { @@ -204,15 +204,31 @@ } }, { "pressedOffset": [0, -1], - "position": [59, 44], + "position": [39, 44], "baseImage": "/interface/sb_crafting/categories.png:smith", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:smith", "data": { - "filter": ["sb_tools", "sb_mining", "tools"] + "filter": ["sb_tools", "tools"] + } + }, { + "pressedOffset": [0, -1], + "position": [59, 44], + "baseImage": "/interface/sb_crafting/categories.png:mining", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:mining", + "data": { + "filter": ["mining"] } }, { "pressedOffset": [0, -1], "position": [79, 44], + "baseImage": "/interface/sb_crafting/categories.png:upgrades", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:upgrades", + "data": { + "filter": ["upgrades"] + } + }, { + "pressedOffset": [0, -1], + "position": [99, 44], "baseImage": "/interface/sb_crafting/categories.png:craft", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:craft", "data": { @@ -220,7 +236,7 @@ } }, { "pressedOffset": [0, -1], - "position": [99, 44], + "position": [119, 44], "baseImage": "/interface/sb_crafting/categories.png:instruments", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:instruments", "data": { @@ -228,7 +244,7 @@ } }, { "pressedOffset": [0, -1], - "position": [119, 44], + "position": [139, 44], "baseImage": "/interface/sb_crafting/categories.png:other", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:other", "data": { diff --git a/interface/windowconfig/sb_craftingfood.config b/interface/windowconfig/sb_craftingfood.config index 137bd1a0..7562984d 100644 --- a/interface/windowconfig/sb_craftingfood.config +++ b/interface/windowconfig/sb_craftingfood.config @@ -11,15 +11,15 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 299] }, "windowtitle": { "type": "title", - "title": "COOKING TABLE", - "subtitle": "^#b9b5b2;For making something tasty.", + "title": "COOKING STATION", + "subtitle": "^#b9b5b2;For preparing something tasty.", "icon": { "type": "image", "file": "/interface/sb_crafting/craftingicons.png:culinaryarts", @@ -187,40 +187,61 @@ "type": "radioGroup", "toggleMode": true, "buttons": [{ - "position": [50, 81], + "position": [20, 81], "baseImage": "/interface/sb_crafting/categories.png:main", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:main", "data": { "filter": ["sb_entree", "mains"] } }, { - "position": [70, 81], + "position": [40, 81], "baseImage": "/interface/sb_crafting/categories.png:side", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:side", "data": { "filter": ["sb_side", "sides"] } }, { - "position": [90, 81], + "position": [60, 81], "baseImage": "/interface/sb_crafting/categories.png:dessert", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:dessert", "data": { - "filter": ["sb_dessert", "desserts", "snacks"] + "filter": ["sb_dessert", "desserts"] } }, { - "position": [110, 81], + "position": [80, 81], + "baseImage": "/interface/sb_crafting/categories.png:snack", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:snack", + "data": { + "filter": ["snacks"] + } + }, { + "position": [100, 81], "baseImage": "/interface/sb_crafting/categories.png:drink", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:drink", "data": { "filter": ["sb_drink", "drinks"] } + }, { + "position": [120, 81], + "baseImage": "/interface/sb_crafting/categories.png:condiment", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:condiment", + "data": { + "filter": ["sb_condiments", "condiments"] + } + }, { + "position": [140, 81], + "baseImage": "/interface/sb_crafting/categories.png:campfire", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:campfire", + "data": { + "filter": ["campfire"] + } }, { "pressedOffset": [0, -1], "position": [8, 61], "baseImage": "/interface/sb_crafting/categories.png:healing", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:healing", "data": { - "filter": ["sb_cooking_healing"] + "filter": ["sb_healing"] } }, { "pressedOffset": [0, -1], @@ -228,7 +249,7 @@ "baseImage": "/interface/sb_crafting/categories.png:health", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:health", "data": { - "filter": ["sb_cooking_health"] + "filter": ["sb_health"] } }, { "pressedOffset": [0, -1], @@ -236,7 +257,7 @@ "baseImage": "/interface/sb_crafting/categories.png:energy", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:energy", "data": { - "filter": ["sb_cooking_energy"] + "filter": ["sb_energy"] } }, { "pressedOffset": [0, -1], @@ -244,15 +265,15 @@ "baseImage": "/interface/sb_crafting/categories.png:energyregen", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:energyregen", "data": { - "filter": ["sb_cooking_energyregen"] + "filter": ["sb_energyregen"] } }, { "pressedOffset": [0, -1], "position": [80, 61], - "baseImage": "/interface/sb_crafting/categories.png:weapons", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:weapons", + "baseImage": "/interface/sb_crafting/categories.png:rage", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:rage", "data": { - "filter": ["sb_cooking_power"] + "filter": ["sb_rage"] } }, { "pressedOffset": [0, -1], @@ -260,23 +281,23 @@ "baseImage": "/interface/sb_crafting/categories.png:armor", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:armor", "data": { - "filter": ["sb_cooking_protection"] + "filter": ["sb_protection"] } }, { "pressedOffset": [0, -1], "position": [116, 61], - "baseImage": "/interface/sb_crafting/categories.png:mobility", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:mobility", + "baseImage": "/interface/sb_crafting/categories.png:runboost", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:runboost", "data": { - "filter": ["sb_cooking_mobility"] + "filter": ["sb_runboost"] } }, { "pressedOffset": [0, -1], "position": [134, 61], - "baseImage": "/interface/sb_crafting/categories.png:warmth", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:warmth", + "baseImage": "/interface/sb_crafting/categories.png:jumpboost", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:jumpboost", "data": { - "filter": ["sb_cooking_warmth"] + "filter": ["sb_jumpboost"] } }, { "pressedOffset": [0, -1], @@ -284,7 +305,7 @@ "baseImage": "/interface/sb_crafting/categories.png:swimboost", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:swimboost", "data": { - "filter": ["sb_cooking_swimboost"] + "filter": ["sb_swimboost"] } }, { "pressedOffset": [0, -1], @@ -292,15 +313,55 @@ "baseImage": "/interface/sb_crafting/categories.png:glow", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:glow", "data": { - "filter": ["sb_cooking_glow"] + "filter": ["sb_glow"] } }, { "pressedOffset": [0, -1], "position": [26, 41], + "baseImage": "/interface/sb_crafting/categories.png:thorns", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:thorns", + "data": { + "filter": ["sb_thorns"] + } + }, { + "pressedOffset": [0, -1], + "position": [44, 41], + "baseImage": "/interface/sb_crafting/categories.png:nova", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:nova", + "data": { + "filter": ["sb_nova"] + } + }, { + "pressedOffset": [0, -1], + "position": [62, 41], + "baseImage": "/interface/sb_crafting/categories.png:electrified", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:electrified", + "data": { + "filter": ["sb_electrified"] + } + }, { + "pressedOffset": [0, -1], + "position": [80, 41], + "baseImage": "/interface/sb_crafting/categories.png:lowgrav", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:lowgrav", + "data": { + "filter": ["sb_lowgrav"] + } + }, { + "pressedOffset": [0, -1], + "position": [98, 41], + "baseImage": "/interface/sb_crafting/categories.png:bouncy", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:bouncy", + "data": { + "filter": ["sb_bouncy"] + } + }, { + "pressedOffset": [0, -1], + "position": [116, 41], "baseImage": "/interface/sb_crafting/categories.png:other", "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:other", "data": { - "filter": ["sb_cooking_other"] + "filter": ["sb_other", "sb_cooking_other"]//cooking_other for snowballs } } ] diff --git a/interface/windowconfig/sb_craftingfood2.config b/interface/windowconfig/sb_craftingfood2.config deleted file mode 100644 index b1487b32..00000000 --- a/interface/windowconfig/sb_craftingfood2.config +++ /dev/null @@ -1,403 +0,0 @@ -{ - "craftingSound": "/sfx/interface/crafting_cooking.ogg", - "disableTimer": true, - "paneLayout": { - "background": { - "type": "background", - "fileHeader": "/interface/sb_crafting/craftingheader.png", - "fileBody": "/interface/sb_crafting/cookingbody.png", - "fileFooter": "/interface/sb_crafting/craftingfooter.png" - }, - "close": { - "type": "button", - "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", - "position": [321, 299] - }, - "windowtitle": { - "type": "title", - "title": "COOKING STATION", - "subtitle": "^#b9b5b2;For preparing something tasty.", - "icon": { - "type": "image", - "file": "/interface/sb_crafting/craftingicons.png:culinaryarts", - "zlevel": -1 - } - }, - "bgShine": { - "type": "image", - "file": "/interface/sb_crafting/shine3.png", - "position": [-15, 18], - "zlevel": -10 - }, - "lblSchematics": { - "type": "label", - "position": [88, 279], - "hAnchor": "mid", - "value": "RECIPES" - }, - "lblProductTitle": { - "type": "label", - "position": [265, 279], - "hAnchor": "mid", - "value": "DISH" - }, - "spinCount": { - "type": "spinner", - "leftBase": "/interface/sb_crafting/pick.png:0", - "leftHover": "/interface/sb_crafting/pick.png:2", - "rightBase": "/interface/sb_crafting/pick.png:1", - "rightHover": "/interface/sb_crafting/pick.png:3", - "pressedOffset": [0, 0], - "position": [219, 45], - "upOffset": 34 - }, - "lblAmountInput": { - "type": "image", - "file": "/interface/sb_crafting/amount.png", - "position": [225, 45], - "zlevel": 3 - }, - "tbSpinCount": { - "type": "textbox", - "position": [229, 46], - "textAlign": "center", - "maxWidth": 18, - "zlevel": 3.1, - "regex": "x?\\d{0,4}", - "hint": "" - }, - "btnCraft": { - "type": "button", - "base": "/interface/button.png", - "hover": "/interface/buttonhover.png", - "position": [271, 43], - "caption": "Prepare" - }, - "btnStopCraft": { - "type": "button", - "base": "/interface/buttonactive.png", - "hover": "/interface/buttonactivehover.png", - "position": [271, 43], - "caption": "Stop" - }, - "imgCraftBg": { - "type": "image", - "file": "/interface/crafting/craftbg.png", - "position": [196, 40], - "zlevel": -5 - }, - "currentRecipeIcon": { - "type": "itemslot", - "callback": "null", - "position": [197, 41] - }, - "btnFilterHaveMaterials": { - "type": "button", - "base": "/interface/sb_crafting/checkboxnocheck.png", - "baseImageChecked": "/interface/sb_crafting/checkboxcheck.png", - "pressedOffset": [0, 0], - "checkable": true, - "checked": false, - "position": [26, 120] - }, - "lblProduct": { - "type": "label", - "position": [51, 119], - "hAnchor": "left", - "value": "INGREDIENTS AVAILABLE" - }, - "scrollArea": { - "type": "scrollArea", - "rect": [5, 130, 174, 266], - "children": { - "itemList": { - "type": "list", - "schema": { - "selectedBG": "/interface/crafting/craftableselected2.png", - "unselectedBG": "/interface/crafting/craftablebackground.png", - "spacing": [0, 1], - "memberSize": [156, 20], - "listTemplate": { - "background": { - "type": "image", - "file": "/interface/crafting/craftablebackground.png", - "position": [0, 0], - "zlevel": -1 - }, - "itemName": { - "type": "label", - "position": [21, 10], - "size": [156, 80], - "vAnchor": "mid", - "hAnchor": "left", - "wrapWidth": 96, - "value": "" - }, - "itemIcon": { - "type": "itemslot", - "position": [1, 1], - "callback": "null" - }, - "newIcon": { - "type": "image", - "position": [117, 5], - "file": "/interface/crafting/new.png" - }, - "moneyIcon": { - "type": "image", - "position": [122, 1], - "hAnchor": "left", - "file": "/interface/money.png" - }, - "priceLabel": { - "type": "label", - "position": [134, 1], - "hAnchor": "left", - "value": "0" - }, - "notcraftableoverlay": { - "type": "image", - "file": "/interface/crafting/notcraftableoverlay.png", - "position": [0, 0], - "zlevel": 1 - } - } - } - } - } - }, - "description": { - "type": "widget", - "position": [190, 86], - "size": [140, 320] - }, - "filter": { - "type": "textbox", - "position": [56, 104], - "hint": "Search", - "maxWidth": 70, - "escapeKey": "close", - "enterKey": "filter", - "focus": true - }, - "categories": { - "type": "radioGroup", - "toggleMode": true, - "buttons": [{ - "position": [20, 81], - "baseImage": "/interface/sb_crafting/categories.png:main", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:main", - "data": { - "filter": ["sb_entree", "mains"] - } - }, { - "position": [40, 81], - "baseImage": "/interface/sb_crafting/categories.png:side", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:side", - "data": { - "filter": ["sb_side", "sides"] - } - }, { - "position": [60, 81], - "baseImage": "/interface/sb_crafting/categories.png:dessert", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:dessert", - "data": { - "filter": ["sb_dessert", "desserts"] - } - }, { - "position": [80, 81], - "baseImage": "/interface/sb_crafting/categories.png:snack", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:snack", - "data": { - "filter": ["snacks"] - } - }, { - "position": [100, 81], - "baseImage": "/interface/sb_crafting/categories.png:drink", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:drink", - "data": { - "filter": ["sb_drink", "drinks"] - } - }, { - "position": [120, 81], - "baseImage": "/interface/sb_crafting/categories.png:condiment", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:condiment", - "data": { - "filter": ["sb_condiments", "condiments"] - } - }, { - "position": [140, 81], - "baseImage": "/interface/sb_crafting/categories.png:campfire", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:campfire", - "data": { - "filter": ["campfire"] - } - }, { - "pressedOffset": [0, -1], - "position": [8, 61], - "baseImage": "/interface/sb_crafting/categories.png:healing", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:healing", - "data": { - "filter": ["sb_healing"] - } - }, { - "pressedOffset": [0, -1], - "position": [26, 61], - "baseImage": "/interface/sb_crafting/categories.png:health", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:health", - "data": { - "filter": ["sb_health"] - } - }, { - "pressedOffset": [0, -1], - "position": [44, 61], - "baseImage": "/interface/sb_crafting/categories.png:energy", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:energy", - "data": { - "filter": ["sb_energy"] - } - }, { - "pressedOffset": [0, -1], - "position": [62, 61], - "baseImage": "/interface/sb_crafting/categories.png:energyregen", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:energyregen", - "data": { - "filter": ["sb_energyregen"] - } - }, { - "pressedOffset": [0, -1], - "position": [80, 61], - "baseImage": "/interface/sb_crafting/categories.png:weapons", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:weapons", - "data": { - "filter": ["sb_power"] - } - }, { - "pressedOffset": [0, -1], - "position": [98, 61], - "baseImage": "/interface/sb_crafting/categories.png:armor", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:armor", - "data": { - "filter": ["sb_protection"] - } - }, { - "pressedOffset": [0, -1], - "position": [116, 61], - "baseImage": "/interface/sb_crafting/categories.png:mobility", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:mobility", - "data": { - "filter": ["sb_mobility"] - } - }, { - "pressedOffset": [0, -1], - "position": [134, 61], - "baseImage": "/interface/sb_crafting/categories.png:swimboost", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:swimboost", - "data": { - "filter": ["sb_swimboost"] - } - }, { - "pressedOffset": [0, -1], - "position": [152, 61], - "baseImage": "/interface/sb_crafting/categories.png:glow", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:glow", - "data": { - "filter": ["sb_glow"] - } - }, { - "pressedOffset": [0, -1], - "position": [8, 41], - "baseImage": "/interface/sb_crafting/categories.png:thorns", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:thorns", - "data": { - "filter": ["sb_thorns"] - } - }, { - "pressedOffset": [0, -1], - "position": [26, 41], - "baseImage": "/interface/sb_crafting/categories.png:nova", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:nova", - "data": { - "filter": ["sb_nova"] - } - }, { - "pressedOffset": [0, -1], - "position": [44, 41], - "baseImage": "/interface/sb_crafting/categories.png:electrified", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:electrified", - "data": { - "filter": ["sb_electrified"] - } - }, { - "pressedOffset": [0, -1], - "position": [62, 41], - "baseImage": "/interface/sb_crafting/categories.png:lowgrav", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:lowgrav", - "data": { - "filter": ["sb_lowgrav"] - } - }, { - "pressedOffset": [0, -1], - "position": [80, 41], - "baseImage": "/interface/sb_crafting/categories.png:bouncy", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:bouncy", - "data": { - "filter": ["sb_bouncy"] - } - }, { - "pressedOffset": [0, -1], - "position": [98, 41], - "baseImage": "/interface/sb_crafting/categories.png:other", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:other", - "data": { - "filter": ["sb_other", "sb_cooking_other"]//cooking_other for snowballs - } - } - ] - }, - "rarities": { - "type": "radioGroup", - "toggleMode": true, - "buttons": [{ - "position": [8, 267], - "baseImage": "/interface/sb_crafting/rarities.png:0", - "baseImageChecked": "/interface/sb_crafting/rarities.png:5", - "data": { - "rarity": ["common"] - } - }, { - "position": [14, 267], - "baseImage": "/interface/sb_crafting/rarities.png:1", - "baseImageChecked": "/interface/sb_crafting/rarities.png:6", - "data": { - "rarity": ["uncommon"] - } - }, { - "position": [20, 267], - "baseImage": "/interface/sb_crafting/rarities.png:2", - "baseImageChecked": "/interface/sb_crafting/rarities.png:7", - "data": { - "rarity": ["rare"] - } - }, { - "position": [26, 267], - "baseImage": "/interface/sb_crafting/rarities.png:3", - "baseImageChecked": "/interface/sb_crafting/rarities.png:8", - "data": { - "rarity": ["legendary"] - } - }, { - "position": [32, 267], - "baseImage": "/interface/sb_crafting/rarities.png:4", - "baseImageChecked": "/interface/sb_crafting/rarities.png:9", - "data": { - "rarity": ["essential"] - } - } - ] - } - } -} diff --git a/interface/windowconfig/sb_craftingfurniture.config b/interface/windowconfig/sb_craftingfurniture.config index 925cda3e..2db2de02 100644 --- a/interface/windowconfig/sb_craftingfurniture.config +++ b/interface/windowconfig/sb_craftingfurniture.config @@ -10,9 +10,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { diff --git a/interface/windowconfig/sb_craftingnocategories.config b/interface/windowconfig/sb_craftingnocategories.config index 01a98211..ff298059 100644 --- a/interface/windowconfig/sb_craftingnocategories.config +++ b/interface/windowconfig/sb_craftingnocategories.config @@ -10,9 +10,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { diff --git a/interface/windowconfig/sb_craftingresearch.config b/interface/windowconfig/sb_craftingresearch.config index bcbf3b79..e51e93d3 100644 --- a/interface/windowconfig/sb_craftingresearch.config +++ b/interface/windowconfig/sb_craftingresearch.config @@ -9,9 +9,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { diff --git a/interface/windowconfig/sb_craftingresearch.lua b/interface/windowconfig/sb_craftingresearch.lua index 3bbb529c..030e613d 100644 --- a/interface/windowconfig/sb_craftingresearch.lua +++ b/interface/windowconfig/sb_craftingresearch.lua @@ -31,10 +31,10 @@ function populateList() --We've already checked if the item exists widget.setData(listItem, {output.itemName, recipe.input[2]}) local recipeData = root.recipesForItem(output.itemName:sub(1,-8))[1].output if player.blueprintKnown({recipeData.name, recipeData.count, recipeData.parameters}) then --recipesForItem for recipes with parameters, ie frost spear - local newIcon = listItem..".newIcon" - local oldPos = widget.getPosition(newIcon) - widget.setImage(newIcon, ownedIcon) - widget.setPosition(newIcon, {oldPos[1]+(newIconOffset),oldPos[2]}) + local newIcon = listItem..".newIcon" + local oldPos = widget.getPosition(newIcon) + widget.setImage(newIcon, ownedIcon) + widget.setPosition(newIcon, {oldPos[1]+(newIconOffset),oldPos[2]}) end end end @@ -88,7 +88,7 @@ function itemSelected() end function formatIcon(icon, directory) - if type(icon) ~= "string" then return (#icon == 1 and formatIcon(icon[1].image, directory) or "/interface/x.png") end + 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 end diff --git a/interface/windowconfig/sb_craftingtechconsole.config b/interface/windowconfig/sb_craftingtechconsole.config index f7dee1f5..62c670c8 100644 --- a/interface/windowconfig/sb_craftingtechconsole.config +++ b/interface/windowconfig/sb_craftingtechconsole.config @@ -10,9 +10,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { diff --git a/interface/windowconfig/sb_newquest.config b/interface/windowconfig/sb_newquest.config index 4bf5c6c5..ff5dab94 100644 --- a/interface/windowconfig/sb_newquest.config +++ b/interface/windowconfig/sb_newquest.config @@ -12,9 +12,9 @@ }, "close": { "type": "button", - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "press": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "press": "/interface/xpress.png", "position": [261, 247] }, "windowtitle": { @@ -25,7 +25,7 @@ "icon": { "type": "image", "file": "/interface/quests/quest.png", - //"file" : "/interface/sb_inventory/portrait.png?multiply=0000", + //"file" : "/interface/inventory/portrait.png?multiply=0000", "position": [0, 0], "zlevel": 4 } @@ -69,7 +69,7 @@ "dimensions": [5, 1], "spacing": [22, 19], "callback": "null", - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "portraitImage": { diff --git a/interface/windowconfig/sb_newquestnorewards.config b/interface/windowconfig/sb_newquestnorewards.config index c5eb8507..f68267f1 100644 --- a/interface/windowconfig/sb_newquestnorewards.config +++ b/interface/windowconfig/sb_newquestnorewards.config @@ -12,9 +12,9 @@ }, "close": { "type": "button", - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "press": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "press": "/interface/xpress.png", "position": [261, 247] }, "windowtitle": { @@ -68,7 +68,7 @@ "dimensions": [5, 1], "spacing": [22, 19], "callback": "null", - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "portraitImage": { "visible": false, diff --git a/interface/windowconfig/sb_portable3dprinter.config b/interface/windowconfig/sb_portable3dprinter.config index 405af2d4..a405d982 100644 --- a/interface/windowconfig/sb_portable3dprinter.config +++ b/interface/windowconfig/sb_portable3dprinter.config @@ -11,9 +11,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { diff --git a/interface/windowconfig/sb_questcomplete.config b/interface/windowconfig/sb_questcomplete.config index 0b87f21e..1454dd32 100644 --- a/interface/windowconfig/sb_questcomplete.config +++ b/interface/windowconfig/sb_questcomplete.config @@ -42,7 +42,7 @@ "dimensions": [5, 1], "spacing": [22, 19], "callback": "null", - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "labelMoney": { "type": "label", diff --git a/interface/windowconfig/sb_questfailed.config b/interface/windowconfig/sb_questfailed.config index 0ccafeea..0508c49a 100644 --- a/interface/windowconfig/sb_questfailed.config +++ b/interface/windowconfig/sb_questfailed.config @@ -19,7 +19,7 @@ "position": [0, 254], "icon": { "type": "image", - "file": "/interface/sb_inventory/portrait.png", + "file": "/interface/inventory/portrait.png", "position": [0, 0], "zlevel": 4 } @@ -72,7 +72,7 @@ "dimensions": [5, 1], "spacing": [22, 19], "callback": "null", - "backingImage": "/interface/sb_inventory/empty.png" + "backingImage": "/interface/inventory/empty.png" }, "lblQuestTitle": { "type": "label", diff --git a/interface/windowconfig/sb_railcrafting.config b/interface/windowconfig/sb_railcrafting.config new file mode 100644 index 00000000..9b595255 --- /dev/null +++ b/interface/windowconfig/sb_railcrafting.config @@ -0,0 +1,260 @@ +{ + "paneLayout": { + "background": { + "type": "background", + "fileHeader": "/interface/sb_crafting/craftingheader.png", + "fileBody": "/interface/sb_crafting/craftingbody.png", + "fileFooter": "/interface/sb_crafting/craftingfooter.png" + }, + "close": { + "type": "button", + "pressedOffset": [0, 0], + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", + "position": [321, 263] + }, + "windowtitle": { + "type": "title", + "position": [-5, 252], + "icon": { + "type": "image", + "position": [0, -20], + "zlevel": -1 + } + }, + "bgShine": { + "type": "image", + "file": "/interface/sb_crafting/shine.png", + "position": [-15, 0], + "zlevel": -10 + }, + "lblSchematics": { + "type": "label", + "position": [88, 243], + "hAnchor": "mid", + "value": "SCHEMATICS" + }, + "lblProducttitle": { + "type": "label", + "position": [265, 243], + "hAnchor": "mid", + "value": "PRODUCT" + }, + "spinCount": { + "type": "spinner", + "leftBase": "/interface/sb_crafting/pick.png:0", + "leftHover": "/interface/sb_crafting/pick.png:2", + "rightBase": "/interface/sb_crafting/pick.png:1", + "rightHover": "/interface/sb_crafting/pick.png:3", + "pressedOffset": [0, 0], + "position": [219, 45], + "upOffset": 34 + }, + "lblAmountInput": { + "type": "image", + "file": "/interface/sb_crafting/amount.png", + "position": [225, 45], + "zlevel": 3 + }, + "tbSpinCount": { + "type": "textbox", + "position": [229, 46], + "textAlign": "center", + "maxWidth": 18, + "zlevel": 3.1, + "regex": "x?\\d{0,4}", + "hint": "" + }, + "btnCraft": { + "type": "button", + "base": "/interface/button.png", + "hover": "/interface/buttonhover.png", + "position": [271, 43], + "caption": "Craft" + }, + "btnStopCraft": { + "type": "button", + "base": "/interface/buttonactive.png", + "hover": "/interface/buttonactivehover.png", + "position": [271, 43], + "caption": "Stop" + }, + "imgCraftBg": { + "type": "image", + "file": "/interface/crafting/craftbg.png", + "position": [196, 40], + "zlevel": -5 + }, + "currentRecipeIcon": { + "type": "itemslot", + "callback": "null", + "position": [197, 41] + }, + "btnFilterHaveMaterials": { + "type": "button", + "base": "/interface/sb_crafting/checkboxnocheck.png", + "baseImageChecked": "/interface/sb_crafting/checkboxcheck.png", + "pressedOffset": [0, 0], + "checkable": true, + "checked": false, + "position": [26, 84] + }, + "lblProduct": { + "type": "label", + "position": [51, 83], + "hAnchor": "left", + "value": "MATERIALS AVAILABLE" + }, + + "scrollArea": { + "type": "scrollArea", + "rect": [5, 94, 174, 230], + "children": { + "itemList": { + "type": "list", + "schema": { + "selectedBG": "/interface/crafting/craftableselected2.png", + "unselectedBG": "/interface/crafting/craftablebackground.png", + "spacing": [0, 1], + "memberSize": [156, 20], + "listTemplate": { + "background": { + "type": "image", + "file": "/interface/crafting/craftablebackground.png", + "position": [0, 0], + "zlevel": -1 + }, + "itemName": { + "type": "label", + "position": [21, 10], + "size": [156, 80], + "vAnchor": "mid", + "hAnchor": "left", + "wrapWidth": 96, + "value": "" + }, + "itemIcon": { + "type": "itemslot", + "position": [1, 1], + "callback": "null" + }, + "level": { + "type": "label", + "position": [138, 9], + "hAnchor": "mid", + "value": "" + }, + "newIcon": { + "type": "image", + "position": [117, 5], + "file": "/interface/crafting/new.png" + }, + "moneyIcon": { + "type": "image", + "position": [122, 1], + "hAnchor": "left", + "file": "/interface/money.png" + }, + "priceLabel": { + "type": "label", + "position": [134, 1], + "hAnchor": "left", + "value": "0" + }, + "notcraftableoverlay": { + "type": "image", + "file": "/interface/crafting/notcraftableoverlay.png", + "position": [0, 0], + "zlevel": 1 + } + } + } + } + } + }, + "description": { + "type": "widget", + "position": [190, 50], + "size": [140, 320] + }, + "filter": { + "type": "textbox", + "position": [56, 68], + "hint": "Search", + "maxWidth": 70, + "escapeKey": "close", + "enterKey": "filter", + "focus": true + }, + "categories": { + "type": "radioGroup", + "toggleMode": true, + "buttons": [{ + "position": [59, 44], + "baseImage": "/interface/sb_crafting/categories.png:convert", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:convert", + "data": { + "filter": ["sb_convert"] + } + }, { + "selected": true, + "position": [78, 44], + "baseImage": "/interface/sb_crafting/categories.png:rails", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:rails", + "data": { + "filter": ["rails", "rail"] + } + }, { + "position": [97, 44], + "baseImage": "/interface/sb_crafting/categories.png:skyrails", + "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:skyrails", + "data": { + "filter": ["sb_skyrails"] + } + } + ] + }, + "rarities": { + "type": "radioGroup", + "toggleMode": true, + "buttons": [{ + "position": [8, 231], + "baseImage": "/interface/sb_crafting/rarities.png:0", + "baseImageChecked": "/interface/sb_crafting/rarities.png:5", + "data": { + "rarity": ["common"] + } + }, { + "position": [14, 231], + "baseImage": "/interface/sb_crafting/rarities.png:1", + "baseImageChecked": "/interface/sb_crafting/rarities.png:6", + "data": { + "rarity": ["uncommon"] + } + }, { + "position": [20, 231], + "baseImage": "/interface/sb_crafting/rarities.png:2", + "baseImageChecked": "/interface/sb_crafting/rarities.png:7", + "data": { + "rarity": ["rare"] + } + }, { + "position": [26, 231], + "baseImage": "/interface/sb_crafting/rarities.png:3", + "baseImageChecked": "/interface/sb_crafting/rarities.png:8", + "data": { + "rarity": ["legendary"] + } + }, { + "position": [32, 231], + "baseImage": "/interface/sb_crafting/rarities.png:4", + "baseImageChecked": "/interface/sb_crafting/rarities.png:9", + "data": { + "rarity": ["essential"] + } + } + ] + } + } +} diff --git a/interface/windowconfig/sb_skyrailcrafting.config b/interface/windowconfig/sb_skyrailcrafting.config deleted file mode 100644 index 254fce4d..00000000 --- a/interface/windowconfig/sb_skyrailcrafting.config +++ /dev/null @@ -1,294 +0,0 @@ -{ - "disableTimer": true, - "paneLayout": { - "background": { - "type": "background", - "fileHeader": "/interface/sb_crafting/craftingheader.png", - "fileBody": "/interface/sb_crafting/craftingbody.png", - "fileFooter": "/interface/sb_crafting/craftingfooter.png" - }, - "close": { - "type": "button", - "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", - "position": [321, 263] - }, - "windowtitle": { - "type": "title", - "position": [-5, 252], - "icon": { - "type": "image", - "position": [0, -20], - "zlevel": -1 - } - }, - "bgShine": { - "type": "image", - "file": "/interface/sb_crafting/shine.png", - "position": [-15, 0], - "zlevel": -10 - }, - "lblSchematics": { - "type": "label", - "position": [88, 243], - "hAnchor": "mid", - "value": "SCHEMATICS" - }, - "lblProducttitle": { - "type": "label", - "position": [265, 243], - "hAnchor": "mid", - "value": "PRODUCT" - }, - "spinCount": { - "type": "spinner", - "leftBase": "/interface/sb_crafting/pick.png:0", - "leftHover": "/interface/sb_crafting/pick.png:2", - "rightBase": "/interface/sb_crafting/pick.png:1", - "rightHover": "/interface/sb_crafting/pick.png:3", - "pressedOffset": [0, 0], - "position": [219, 45], - "upOffset": 34 - }, - "lblAmountInput": { - "type": "image", - "file": "/interface/sb_crafting/amount.png", - "position": [225, 45], - "zlevel": 3 - }, - "tbSpinCount": { - "type": "textbox", - "position": [229, 46], - "textAlign": "center", - "maxWidth": 18, - "zlevel": 3.1, - "regex": "x?\\d{0,4}", - "hint": "" - }, - "btnCraft": { - "type": "button", - "base": "/interface/button.png", - "hover": "/interface/buttonhover.png", - "position": [271, 43], - "caption": "Craft" - }, - "btnStopCraft": { - "type": "button", - "base": "/interface/buttonactive.png", - "hover": "/interface/buttonactivehover.png", - "position": [271, 43], - "caption": "Stop" - }, - "imgCraftBg": { - "type": "image", - "file": "/interface/crafting/craftbg.png", - "position": [196, 40], - "zlevel": -5 - }, - "currentRecipeIcon": { - "type": "itemslot", - "callback": "null", - "position": [197, 41] - }, - "btnFilterHaveMaterials": { - "type": "button", - "base": "/interface/sb_crafting/checkboxnocheck.png", - "baseImageChecked": "/interface/sb_crafting/checkboxcheck.png", - "pressedOffset": [0, 0], - "checkable": true, - "checked": false, - "position": [26, 84] - }, - "lblProduct": { - "type": "label", - "position": [51, 83], - "hAnchor": "left", - "value": "MATERIALS AVAILABLE" - }, - - "scrollArea": { - "type": "scrollArea", - "rect": [5, 94, 174, 230], - "children": { - "itemList": { - "type": "list", - "schema": { - "selectedBG": "/interface/crafting/craftableselected2.png", - "unselectedBG": "/interface/crafting/craftablebackground.png", - "spacing": [0, 1], - "memberSize": [156, 20], - "listTemplate": { - "background": { - "type": "image", - "file": "/interface/crafting/craftablebackground.png", - "position": [0, 0], - "zlevel": -1 - }, - "itemName": { - "type": "label", - "position": [21, 10], - "size": [156, 80], - "vAnchor": "mid", - "hAnchor": "left", - "wrapWidth": 96, - "value": "" - }, - "itemIcon": { - "type": "itemslot", - "position": [1, 1], - "callback": "null" - }, - "level": { - "type": "label", - "position": [138, 9], - "hAnchor": "mid", - "value": "" - }, - "newIcon": { - "type": "image", - "position": [117, 5], - "file": "/interface/crafting/new.png" - }, - "moneyIcon": { - "type": "image", - "position": [122, 1], - "hAnchor": "left", - "file": "/interface/money.png" - }, - "priceLabel": { - "type": "label", - "position": [134, 1], - "hAnchor": "left", - "value": "0" - }, - "notcraftableoverlay": { - "type": "image", - "file": "/interface/crafting/notcraftableoverlay.png", - "position": [0, 0], - "zlevel": 1 - } - } - } - } - } - }, - "description": { - "type": "widget", - "position": [190, 50], - "size": [140, 320] - }, - "filter": { - "type": "textbox", - "position": [56, 68], - "hint": "Search", - "maxWidth": 70, - "escapeKey": "close", - "enterKey": "filter", - "focus": true - }, - "categories": { - "type": "radioGroup", - "toggleMode": true, - "buttons": [{ - "position": [59, 44], - "baseImage": "/interface/sb_crafting/categories.png:convert", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:convert", - "data": { - "filter": ["sb_convert"] - } - }, { - "selected": true, - "position": [78, 44], - "baseImage": "/interface/sb_crafting/categories.png:skyrails", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:skyrails", - "data": { - "filter": ["sb_skyrails"] - } - }, { - "position": [97, 44], - "baseImage": "/interface/sb_crafting/categories.png:rails", - "baseImageChecked": "/interface/sb_crafting/categoriesselected.png:rails", - "data": { - "filter": ["rails", "rail"] - } - } - ] - }, - "rarities": { - "type": "radioGroup", - "toggleMode": true, - "buttons": [{ - "position": [8, 231], - "baseImage": "/interface/sb_crafting/rarities.png:0", - "baseImageChecked": "/interface/sb_crafting/rarities.png:5", - "data": { - "rarity": ["common"] - } - }, { - "position": [14, 231], - "baseImage": "/interface/sb_crafting/rarities.png:1", - "baseImageChecked": "/interface/sb_crafting/rarities.png:6", - "data": { - "rarity": ["uncommon"] - } - }, { - "position": [20, 231], - "baseImage": "/interface/sb_crafting/rarities.png:2", - "baseImageChecked": "/interface/sb_crafting/rarities.png:7", - "data": { - "rarity": ["rare"] - } - }, { - "position": [26, 231], - "baseImage": "/interface/sb_crafting/rarities.png:3", - "baseImageChecked": "/interface/sb_crafting/rarities.png:8", - "data": { - "rarity": ["legendary"] - } - }, { - "position": [32, 231], - "baseImage": "/interface/sb_crafting/rarities.png:4", - "baseImageChecked": "/interface/sb_crafting/rarities.png:9", - "data": { - "rarity": ["essential"] - } - } - ] - } - }, - "tooltip": { - "panefeature": { - "type": "panefeature" - }, - "itemList": { - "position": [2, 3], - "type": "list", - "schema": { - "spacing": [0, 0], - "memberSize": [125, 25], - "listTemplate": { - "itemName": { - "type": "label", - "position": [22, 10], - "hAnchor": "left", - "wrapWidth": 116, - "value": "Golden Moustache" - }, - "itemIcon": { - "type": "itemslot", - "position": [1, 1], - "callback": "null" - }, - "count": { - "type": "label", - "position": [118, 0], - "hAnchor": "right", - "value": "19/99" - } - } - } - } - } -} diff --git a/interface/windowconfig/sb_spawnerstation.config b/interface/windowconfig/sb_spawnerstation.config index 5c4a04a6..5538d422 100644 --- a/interface/windowconfig/sb_spawnerstation.config +++ b/interface/windowconfig/sb_spawnerstation.config @@ -11,9 +11,9 @@ "close": { "type": "button", "pressedOffset": [0, 0], - "base": "/interface/sb_inventory/x.png", - "hover": "/interface/sb_inventory/xhover.png", - "pressed": "/interface/sb_inventory/xpress.png", + "base": "/interface/x.png", + "hover": "/interface/xhover.png", + "pressed": "/interface/xpress.png", "position": [321, 263] }, "windowtitle": { diff --git a/interface/windowconfig/vendingmachine.config.patch b/interface/windowconfig/vendingmachine.config.patch new file mode 100644 index 00000000..6c7d1dff --- /dev/null +++ b/interface/windowconfig/vendingmachine.config.patch @@ -0,0 +1,22 @@ +[ + [{ + "op": "test", + "path": "/paneLayout/bgShine/mouseTransparent", + "inverse": true + }, { + "op": "add", + "path": "/paneLayout/bgShine/mouseTransparent", + "value": true + } + ], + [{ + "op": "test", + "path": "/paneLayout/bgShine/position/1", + "value": -12 + }, { + "op": "replace", + "path": "/paneLayout/bgShine/position/1", + "value": -19 + } + ] +] diff --git a/items/active/shields/images/sb_giantflower.png b/items/active/shields/images/sb_giantflower.png index 4edf826b..521056a6 100644 Binary files a/items/active/shields/images/sb_giantflower.png and b/items/active/shields/images/sb_giantflower.png differ diff --git a/items/active/shields/images/sb_glitchlord.png b/items/active/shields/images/sb_glitchlord.png index c3304d8b..91940aab 100644 Binary files a/items/active/shields/images/sb_glitchlord.png and b/items/active/shields/images/sb_glitchlord.png differ diff --git a/items/active/starbound/bows/aegisaltbowfull.png b/items/active/starbound/bows/aegisaltbowfull.png index 48255865..86205591 100644 Binary files a/items/active/starbound/bows/aegisaltbowfull.png and b/items/active/starbound/bows/aegisaltbowfull.png differ diff --git a/items/active/starbound/bows/aegisaltbowicon.png b/items/active/starbound/bows/aegisaltbowicon.png index 618c038a..9331acee 100644 Binary files a/items/active/starbound/bows/aegisaltbowicon.png and b/items/active/starbound/bows/aegisaltbowicon.png differ diff --git a/items/active/starbound/bows/feroziumbowfull.png b/items/active/starbound/bows/feroziumbowfull.png index 4ecfefd9..9f7a20f9 100644 Binary files a/items/active/starbound/bows/feroziumbowfull.png and b/items/active/starbound/bows/feroziumbowfull.png differ diff --git a/items/active/starbound/bows/feroziumbowicon.png b/items/active/starbound/bows/feroziumbowicon.png index 1e667b65..3990b68c 100644 Binary files a/items/active/starbound/bows/feroziumbowicon.png and b/items/active/starbound/bows/feroziumbowicon.png differ diff --git a/items/active/starbound/bows/firebow.png b/items/active/starbound/bows/firebow.png index 963e9ed6..0abef583 100644 Binary files a/items/active/starbound/bows/firebow.png and b/items/active/starbound/bows/firebow.png differ diff --git a/items/active/starbound/bows/firebowfull.png b/items/active/starbound/bows/firebowfull.png index a071bf02..12f660b3 100644 Binary files a/items/active/starbound/bows/firebowfull.png and b/items/active/starbound/bows/firebowfull.png differ diff --git a/items/active/starbound/bows/firebowicon.png b/items/active/starbound/bows/firebowicon.png index ccb2ae4a..d027453a 100644 Binary files a/items/active/starbound/bows/firebowicon.png and b/items/active/starbound/bows/firebowicon.png differ diff --git a/items/active/starbound/bows/frozenfirebow.png b/items/active/starbound/bows/frozenfirebow.png index e9adfa5c..17d74f15 100644 Binary files a/items/active/starbound/bows/frozenfirebow.png and b/items/active/starbound/bows/frozenfirebow.png differ diff --git a/items/active/starbound/bows/frozenfirebowfull.png b/items/active/starbound/bows/frozenfirebowfull.png index d99cc83d..08621115 100644 Binary files a/items/active/starbound/bows/frozenfirebowfull.png and b/items/active/starbound/bows/frozenfirebowfull.png differ diff --git a/items/active/starbound/bows/frozenfirebowicon.png b/items/active/starbound/bows/frozenfirebowicon.png index 8f2d5b6b..e89932b8 100644 Binary files a/items/active/starbound/bows/frozenfirebowicon.png and b/items/active/starbound/bows/frozenfirebowicon.png differ diff --git a/items/active/starbound/bows/heartstringbowfull.png b/items/active/starbound/bows/heartstringbowfull.png index 38adc849..146839ca 100644 Binary files a/items/active/starbound/bows/heartstringbowfull.png and b/items/active/starbound/bows/heartstringbowfull.png differ diff --git a/items/active/starbound/bows/heartstringbowicon.png b/items/active/starbound/bows/heartstringbowicon.png index da52ac04..1e9595e0 100644 Binary files a/items/active/starbound/bows/heartstringbowicon.png and b/items/active/starbound/bows/heartstringbowicon.png differ diff --git a/items/active/starbound/bows/slingshot.png b/items/active/starbound/bows/slingshot.png index 20d00efc..de1cd909 100644 Binary files a/items/active/starbound/bows/slingshot.png and b/items/active/starbound/bows/slingshot.png differ diff --git a/items/active/starbound/bows/slingshotfull.png b/items/active/starbound/bows/slingshotfull.png index 7d296522..060f0564 100644 Binary files a/items/active/starbound/bows/slingshotfull.png and b/items/active/starbound/bows/slingshotfull.png differ diff --git a/items/active/starbound/effect.lua b/items/active/starbound/buffs/effect.lua similarity index 100% rename from items/active/starbound/effect.lua rename to items/active/starbound/buffs/effect.lua diff --git a/items/active/starbound/buffs/light2energy.activeitem b/items/active/starbound/buffs/light2energy.activeitem new file mode 100644 index 00000000..675fea89 --- /dev/null +++ b/items/active/starbound/buffs/light2energy.activeitem @@ -0,0 +1,14 @@ +{ + "itemName": "sb_light2energy", + "inventoryIcon": "light2energy.png", + "largeImage": "light2energy.png", + "rarity": "legendary", + "maxStack": 1, + "price": 3000, + "description": "A large toxic flower which converts light into energy when held.", + "shortdescription": "Toxic Flower", + "tooltipKind": "sb_tool", + "category": "tool", + "effects": ["sb_light2energy192"], + "scripts": ["effect.lua"] +} diff --git a/items/active/starbound/light2energy.png b/items/active/starbound/buffs/light2energy.png similarity index 100% rename from items/active/starbound/light2energy.png rename to items/active/starbound/buffs/light2energy.png diff --git a/items/active/starbound/parachute.png b/items/active/starbound/buffs/parachute.png similarity index 100% rename from items/active/starbound/parachute.png rename to items/active/starbound/buffs/parachute.png diff --git a/items/active/starbound/buffs/parachutepack.activeitem b/items/active/starbound/buffs/parachutepack.activeitem new file mode 100644 index 00000000..4275dccd --- /dev/null +++ b/items/active/starbound/buffs/parachutepack.activeitem @@ -0,0 +1,14 @@ +{ + "itemName": "sb_parachutepack", + "inventoryIcon": "parachute.png", + "largeImage": "parachute.png", + "rarity": "legendary", + "maxStack": 1, + "price": 3000, + "description": "An automatic parachute. No more free-falling!", + "shortdescription": "Handheld Parachute", + "tooltipKind": "sb_tool", + "category": "tool", + "effects": ["sb_glide"], + "scripts": ["effect.lua"] +} diff --git a/items/active/starbound/buffs/spaceairtank.activeitem b/items/active/starbound/buffs/spaceairtank.activeitem new file mode 100644 index 00000000..84393b8d --- /dev/null +++ b/items/active/starbound/buffs/spaceairtank.activeitem @@ -0,0 +1,14 @@ +{ + "itemName": "sb_spaceairtank", + "inventoryIcon": "spaceairtank.png", + "largeImage": "spaceairtank.png", + "rarity": "legendary", + "maxStack": 1, + "price": 3000, + "description": "This device creates a breathable field of oxygen around the wearer when held.", + "shortdescription": "Survival System", + "tooltipKind": "sb_tool", + "category": "tool", + "effects": ["sb_breathprotectiontech"], + "scripts": ["effect.lua"] +} diff --git a/items/active/starbound/buffs/spaceairtank.png b/items/active/starbound/buffs/spaceairtank.png new file mode 100644 index 00000000..8f081b0b Binary files /dev/null and b/items/active/starbound/buffs/spaceairtank.png differ diff --git a/items/active/starbound/busters/buster.png b/items/active/starbound/busters/buster.png index d774a959..457d2309 100644 Binary files a/items/active/starbound/busters/buster.png and b/items/active/starbound/busters/buster.png differ diff --git a/items/active/starbound/busters/bustericon.png b/items/active/starbound/busters/bustericon.png index 717a1c76..304fa8bf 100644 Binary files a/items/active/starbound/busters/bustericon.png and b/items/active/starbound/busters/bustericon.png differ diff --git a/items/active/starbound/busters/eyeblaster.png b/items/active/starbound/busters/eyeblaster.png index f7a8af33..c905b18f 100644 Binary files a/items/active/starbound/busters/eyeblaster.png and b/items/active/starbound/busters/eyeblaster.png differ diff --git a/items/active/starbound/feed/electric.activeitem b/items/active/starbound/feed/electric.activeitem index 17cfc884..13cc4e35 100644 --- a/items/active/starbound/feed/electric.activeitem +++ b/items/active/starbound/feed/electric.activeitem @@ -1,13 +1,14 @@ { - "itemName" : "sb_electricfluffalofeed", - "rarity" : "uncommon", - "category" : "farmBeastFeed", - "price" : 250, - "inventoryIcon" : "electric.png", - "description" : "Feed this to a fluffalo calf to raise an Electric Fluffalo - a good source of static cells.", - "tooltipKind" : "sb_object", - "shortdescription" : "Electric Eggplant", - "feedType" : "electric", - "radioMessagesOnPickup" : ["sb_pickupfarmbeastfeed"], - "scripts" : ["feed.lua"] -} \ No newline at end of file + "itemName": "sb_electricfluffalofeed", + "rarity": "uncommon", + "category": "farmBeastFeed", + "price": 250, + "inventoryIcon": "electric.png", + "description": "Feed this to an electric fluffalo calf to accelerate its growth, or to any other calf to change its element.", + "tooltipKind": "sb_object4", + "shortdescription": "Electric Eggplant", + "feedType": "electric", + "radioMessagesOnPickup": ["sb_pickupfarmbeastfeed"], + "animation": "feed.animation", + "scripts": ["feed.lua"] +} diff --git a/items/active/starbound/feed/electric.png b/items/active/starbound/feed/electric.png index 4a8b2a95..b5e6e9ac 100644 Binary files a/items/active/starbound/feed/electric.png and b/items/active/starbound/feed/electric.png differ diff --git a/items/active/starbound/feed/feed.activeitem b/items/active/starbound/feed/feed.activeitem index 78e3069e..e14ec6ac 100644 --- a/items/active/starbound/feed/feed.activeitem +++ b/items/active/starbound/feed/feed.activeitem @@ -1,12 +1,13 @@ { - "itemName" : "sb_fluffalofeed", - "rarity" : "uncommon", - "category" : "farmBeastFeed", - "price" : 250, - "inventoryIcon" : "feed.png", - "description" : "Feed this to a fluffalo calf to raise a common Fluffalo - a good source of plant fibre.", //"Feed this to a fluffalo calf to help it mature.", - "tooltipKind" : "sb_object", - "shortdescription" : "Ordinary Acorn", - "radioMessagesOnPickup" : ["sb_pickupfarmbeastfeed"], - "scripts" : ["feed.lua"] -} \ No newline at end of file + "itemName": "sb_fluffalofeed", + "rarity": "uncommon", + "category": "farmBeastFeed", + "price": 250, + "inventoryIcon": "feed.png", + "description": "Feed this to an unattuned fluffalo calf to accelerate its growth, or to any other calf to remove its element.", + "tooltipKind": "sb_object4", + "shortdescription": "Ordinary Acorn", + "radioMessagesOnPickup": ["sb_pickupfarmbeastfeed"], + "animation": "feed.animation", + "scripts": ["feed.lua"] +} diff --git a/items/active/starbound/feed/feed.animation b/items/active/starbound/feed/feed.animation new file mode 100644 index 00000000..dea13237 --- /dev/null +++ b/items/active/starbound/feed/feed.animation @@ -0,0 +1 @@ +{"sounds":{"eat":["/sfx/humanoid/eat1.ogg","/sfx/humanoid/eat2.ogg","/sfx/humanoid/eat3.ogg","/sfx/humanoid/eat4.ogg"]}} diff --git a/items/active/starbound/feed/feed.lua b/items/active/starbound/feed/feed.lua index ca516997..5d318bce 100644 --- a/items/active/starbound/feed/feed.lua +++ b/items/active/starbound/feed/feed.lua @@ -1,23 +1,32 @@ -function init() - feed = config.getParameter("feedType","") - range = config.getParameter("interactRadius",root.assetJson("/player.config:interactRadius") or 5) - promised = false +require "/scripts/activeitem/sb_swing.lua" +local updat = update +function init() swingInit() + feed = config.getParameter("feedType", "") + range = config.getParameter("interactRadius", root.assetJson("/player.config:interactRadius")) end -function activate() +function swingAction() local target = world.monsterQuery(activeItem.ownerAimPosition(), 0)[1] - if checkTargetRadius(target) then - i = world.sendEntityMessage(target,"sb_feedFluffalo",feed) + if checkTargetRadius(target) and not promised then + i = world.sendEntityMessage(target, "sb_feedFluffalo", feed) promised = true end end -function update() if promised then if i:finished() and i:result() == true then item.consume(1) promised = false end end end +function update(dt, fireMode, shiftHeld) updat(dt, fireMode, shiftHeld) + if promised then + if i:finished() and i:result() == true then + item.consume(1) + animator.playSound("eat") + promised = nil + end + end +end function checkTargetRadius(target) if target and world.entityExists(target) then local pos = mcontroller.position() local targetPosition = world.entityPosition(target) - return (world.magnitude(pos, targetPosition) <= range and not world.lineCollision(pos, targetPosition)) + return player.isAdmin() or (world.magnitude(pos, targetPosition) <= range and not world.lineCollision(pos, targetPosition)) end end \ No newline at end of file diff --git a/items/active/starbound/feed/feed.png b/items/active/starbound/feed/feed.png index 02c808eb..357b65f9 100644 Binary files a/items/active/starbound/feed/feed.png and b/items/active/starbound/feed/feed.png differ diff --git a/items/active/starbound/feed/fire.activeitem b/items/active/starbound/feed/fire.activeitem index 344b730b..bdbee895 100644 --- a/items/active/starbound/feed/fire.activeitem +++ b/items/active/starbound/feed/fire.activeitem @@ -1,13 +1,14 @@ { - "itemName" : "sb_firefluffalofeed", - "rarity" : "uncommon", - "category" : "farmBeastFeed", - "price" : 250, - "inventoryIcon" : "fire.png", - "description" : "Feed this to a fluffalo calf to raise a Fire Fluffalo - a good source of scorched cores.", - "tooltipKind" : "sb_object", - "shortdescription" : "Blazing Berry", - "feedType" : "fire", - "radioMessagesOnPickup" : ["sb_pickupfarmbeastfeed"], - "scripts" : ["feed.lua"] -} \ No newline at end of file + "itemName": "sb_firefluffalofeed", + "rarity": "uncommon", + "category": "farmBeastFeed", + "price": 250, + "inventoryIcon": "fire.png", + "description": "Feed this to a fire fluffalo calf to accelerate its growth, or to any other calf to change its element.", + "tooltipKind": "sb_object4", + "shortdescription": "Blazing Berry", + "feedType": "fire", + "radioMessagesOnPickup": ["sb_pickupfarmbeastfeed"], + "animation": "feed.animation", + "scripts": ["feed.lua"] +} diff --git a/items/active/starbound/feed/fire.png b/items/active/starbound/feed/fire.png index d5b06c5f..109ca47f 100644 Binary files a/items/active/starbound/feed/fire.png and b/items/active/starbound/feed/fire.png differ diff --git a/items/active/starbound/feed/ice.activeitem b/items/active/starbound/feed/ice.activeitem index a9a41623..b9793ae8 100644 --- a/items/active/starbound/feed/ice.activeitem +++ b/items/active/starbound/feed/ice.activeitem @@ -1,13 +1,14 @@ { - "itemName" : "sb_icefluffalofeed", - "rarity" : "uncommon", - "category" : "farmBeastFeed", - "price" : 250, - "inventoryIcon" : "ice.png", - "description" : "Feed this to a fluffalo calf to raise an Ice Fluffalo - a good source of cryonic extract.", - "tooltipKind" : "sb_object", - "shortdescription" : "Frosty Fig", - "feedType" : "ice", - "radioMessagesOnPickup" : ["sb_pickupfarmbeastfeed"], - "scripts" : ["feed.lua"] -} \ No newline at end of file + "itemName": "sb_icefluffalofeed", + "rarity": "uncommon", + "category": "farmBeastFeed", + "price": 250, + "inventoryIcon": "ice.png", + "description": "Feed this to an ice fluffalo calf to accelerate its growth, or to any other calf to change its element.", + "tooltipKind": "sb_object4", + "shortdescription": "Frosty Fig", + "feedType": "ice", + "radioMessagesOnPickup": ["sb_pickupfarmbeastfeed"], + "animation": "feed.animation", + "scripts": ["feed.lua"] +} diff --git a/items/active/starbound/feed/ice.png b/items/active/starbound/feed/ice.png index 5f159d52..820216ed 100644 Binary files a/items/active/starbound/feed/ice.png and b/items/active/starbound/feed/ice.png differ diff --git a/items/active/starbound/feed/poison.activeitem b/items/active/starbound/feed/poison.activeitem index 789a6c98..daf2a994 100644 --- a/items/active/starbound/feed/poison.activeitem +++ b/items/active/starbound/feed/poison.activeitem @@ -1,13 +1,14 @@ { - "itemName" : "sb_poisonfluffalofeed", - "rarity" : "uncommon", - "category" : "farmBeastFeed", - "price" : 250, - "inventoryIcon" : "poison.png", - "description" : "Feed this to a fluffalo calf to raise a Poison Fluffalo - a source of venom samples.", - "tooltipKind" : "sb_object", - "shortdescription" : "Poison Pear", - "feedType" : "poison", - "radioMessagesOnPickup" : ["sb_pickupfarmbeastfeed"], - "scripts" : ["feed.lua"] -} \ No newline at end of file + "itemName": "sb_poisonfluffalofeed", + "rarity": "uncommon", + "category": "farmBeastFeed", + "price": 250, + "inventoryIcon": "poison.png", + "description": "Feed this to a poison fluffalo calf to accelerate its growth, or to any other calf to change its element.", + "tooltipKind": "sb_object4", + "shortdescription": "Poison Pear", + "feedType": "poison", + "radioMessagesOnPickup": ["sb_pickupfarmbeastfeed"], + "animation": "feed.animation", + "scripts": ["feed.lua"] +} diff --git a/items/active/starbound/feed/poison.png b/items/active/starbound/feed/poison.png index dc48258f..142266c0 100644 Binary files a/items/active/starbound/feed/poison.png and b/items/active/starbound/feed/poison.png differ diff --git a/items/active/starbound/gps.activeitem b/items/active/starbound/gps.activeitem deleted file mode 100644 index 25fc8628..00000000 --- a/items/active/starbound/gps.activeitem +++ /dev/null @@ -1,16 +0,0 @@ -{ - "itemName" : "sb_gps", - "inventoryIcon" : "gps.png", - "rarity" : "rare", - "maxStack" : 1, - "price" : 200, - "description" : "The global positioning system displays your horizontal and vertical position.", - "shortdescription" : "Global Positioning System", - "tooltipKind" : "sb_tool", - "largeImage" : "gps.png", - "category" : "tool", - "scriptDelta" : 1, - "itemTags" : ["sb_info"], - "animationScripts" : ["gps.lua"], - "scripts" : ["gps2.lua"] -} \ No newline at end of file diff --git a/items/active/starbound/gps.lua b/items/active/starbound/gps.lua deleted file mode 100644 index 7d449514..00000000 --- a/items/active/starbound/gps.lua +++ /dev/null @@ -1,20 +0,0 @@ -function init() - h = animationConfig.animationParameter("hand") == "alt" and 3 or 2 -end - -function update(dt) - localAnimator.clearDrawables() - local c = animationConfig.animationParameter("c"); c={tostring(math.floor(c[1])),tostring(math.floor(c[2]))} - local pos = activeItemAnimation.ownerPosition(); pos[2]=pos[2]+h - k = 1 - for i = 1, 2 do - for j = 1, #c[i] do - localAnimator.addDrawable({image="/interface/sb_numbers.png:"..c[i]:sub(j,j),fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") - k=k+1 - end - if i == 1 then - localAnimator.addDrawable({image="/interface/sb_numbers.png:13",fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") - k=k+1 - end - end -end \ No newline at end of file diff --git a/items/active/starbound/gps.png b/items/active/starbound/gps.png deleted file mode 100644 index 4d92d655..00000000 Binary files a/items/active/starbound/gps.png and /dev/null differ diff --git a/items/active/starbound/gps/gps.activeitem b/items/active/starbound/gps/gps.activeitem new file mode 100644 index 00000000..70f3cb34 --- /dev/null +++ b/items/active/starbound/gps/gps.activeitem @@ -0,0 +1,16 @@ +{ + "itemName": "sb_gps", + "inventoryIcon": "gps.png", + "rarity": "rare", + "maxStack": 1, + "price": 200, + "description": "This handy device displays your horizontal and vertical position.", + "shortdescription": "Global Positioning System", + "tooltipKind": "sb_tool", + "largeImage": "gps.png", + "category": "tool", + "scriptDelta": 1, + "itemTags": ["sb_info"], + "animationScripts": ["gps.lua"], + "scripts": ["gps2.lua"] +} diff --git a/items/active/starbound/gps/gps.lua b/items/active/starbound/gps/gps.lua new file mode 100644 index 00000000..77b73e0e --- /dev/null +++ b/items/active/starbound/gps/gps.lua @@ -0,0 +1,20 @@ +function init() + h = animationConfig.animationParameter("hand") == "alt" and 3 or 2 +end + +function update(dt) + localAnimator.clearDrawables() + local c = animationConfig.animationParameter("c"); c={tostring(math.floor(c[1])),tostring(math.floor(c[2]))} + local pos = activeItemAnimation.ownerPosition(); pos[2]=pos[2]+h + local k = 1 + for i = 1, 2 do + for j = 1, #c[i] do + localAnimator.addDrawable({image="/interface/sb_numbers.png:"..c[i]:sub(j,j).."?replace;000=0000?border;1;333;0000",fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") + k=k+1 + end + if i == 1 then + localAnimator.addDrawable({image="/interface/sb_numbers.png:13?replace;000=0000?border;1;333;0000",fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") + k=k+1 + end + end +end \ No newline at end of file diff --git a/items/active/starbound/gps/gps.png b/items/active/starbound/gps/gps.png new file mode 100644 index 00000000..62a03cf1 Binary files /dev/null and b/items/active/starbound/gps/gps.png differ diff --git a/items/active/starbound/gps2.lua b/items/active/starbound/gps/gps2.lua similarity index 100% rename from items/active/starbound/gps2.lua rename to items/active/starbound/gps/gps2.lua diff --git a/items/active/starbound/grapple/grapple.png b/items/active/starbound/grapple/grapple.png index 0d992053..e39d6338 100644 Binary files a/items/active/starbound/grapple/grapple.png and b/items/active/starbound/grapple/grapple.png differ diff --git a/items/active/starbound/guns/aegisaltpistol.activeitem b/items/active/starbound/guns/aegisaltpistol.activeitem index a7f0a502..39db046f 100644 --- a/items/active/starbound/guns/aegisaltpistol.activeitem +++ b/items/active/starbound/guns/aegisaltpistol.activeitem @@ -27,7 +27,7 @@ }, "scripts": ["/items/active/weapons/ranged/gun.lua"], "baseOffset": [0.6, 0.15], - "muzzleOffset": [2, 0.4], + "muzzleOffset": [1.75, 0.3], "twoHanded": false, "level": 5, diff --git a/items/active/starbound/guns/aegisaltpistol.png b/items/active/starbound/guns/aegisaltpistol.png index babefed1..9d39aaad 100644 Binary files a/items/active/starbound/guns/aegisaltpistol.png and b/items/active/starbound/guns/aegisaltpistol.png differ diff --git a/items/active/starbound/guns/aegisaltrifle.activeitem b/items/active/starbound/guns/aegisaltrifle.activeitem index 77b87005..cd051812 100644 --- a/items/active/starbound/guns/aegisaltrifle.activeitem +++ b/items/active/starbound/guns/aegisaltrifle.activeitem @@ -29,8 +29,8 @@ } }, - "baseOffset": [0.5, 0], - "muzzleOffset": [2.075, 0.235], + "baseOffset": [0.5, 0.25], + "muzzleOffset": [2.25, 0.235], "scripts": ["/items/active/weapons/ranged/gun.lua"], "elementalType": "physical", "primaryAbilityType": "sb_gun2", diff --git a/items/active/starbound/guns/aegisaltrifle.png b/items/active/starbound/guns/aegisaltrifle.png index 519afcfe..c74bcf85 100644 Binary files a/items/active/starbound/guns/aegisaltrifle.png and b/items/active/starbound/guns/aegisaltrifle.png differ diff --git a/items/active/starbound/guns/aegisaltshotgun.png b/items/active/starbound/guns/aegisaltshotgun.png index ac016e49..1f651244 100644 Binary files a/items/active/starbound/guns/aegisaltshotgun.png and b/items/active/starbound/guns/aegisaltshotgun.png differ diff --git a/items/active/starbound/guns/alienlaser.activeitem b/items/active/starbound/guns/alienlaser.activeitem index 366a2372..c16a83c0 100644 --- a/items/active/starbound/guns/alienlaser.activeitem +++ b/items/active/starbound/guns/alienlaser.activeitem @@ -6,10 +6,9 @@ "tooltipKind": "sb_gun2", "tooltipFields": { "damageKindImage": "/projectiles/guns/plasmabullets/fireplasma/icon.png", - "damageKindBImage": "/projectiles/guns/plasmabullets/electricplasma/icon.png", + "damageKindBImage": "/projectiles/guns/plasmabullets/electricplasma/icon.png" // "damageKindImage" : "/interface/elements/fire.png", - // "damageKindBImage" : "/interface/elements/electric.png", - "subtitle": "Alien Gun" + // "damageKindBImage" : "/interface/elements/electric.png" }, "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], "category": "pistol", diff --git a/items/active/starbound/guns/alienlaserfb.png b/items/active/starbound/guns/alienlaserfb.png index a9fa619b..65dd8b35 100644 Binary files a/items/active/starbound/guns/alienlaserfb.png and b/items/active/starbound/guns/alienlaserfb.png differ diff --git a/items/active/starbound/guns/ammo.lua b/items/active/starbound/guns/ammo.lua index 0b972b2f..9faf2fe1 100644 --- a/items/active/starbound/guns/ammo.lua +++ b/items/active/starbound/guns/ammo.lua @@ -8,22 +8,28 @@ end function update(dt) if animationParameter("npc") then script.setUpdateDelta(0) clearDrawables() return end + local showPlus = false local ammo = animationParameter("ammo",0) + local totalAmmo = animationParameter("totalAmmo",0) local name = animationParameter("name","standardbullet") if name then name = sb_assetmissing("/interface/sb_tooltips/"..name..".png", "/interface/sb_tooltips/assetmissing.png") end clearDrawables() if ammo > 0 then local pos = ownerPosition() - pos[2]=pos[2]+animationParameter("hand",3) + pos[2]=pos[2]+animationParameter("hand",2) if name then addDrawable({image=name.."?scalenearest=1",scale=0.75,fullbright=true,position={pos[1]+(1/1.6),pos[2]}},"overlay") end - pos[1]=pos[1]+1 - ammo = tostring(ammo) - if #ammo > 4 then - ammo = "9999" - addDrawable({image="/interface/sb_numbers.png:12",fullbright=true,position={pos[1]+(5/1.6),pos[2]}},"overlay") + pos[1]=pos[1]+1.13 + local bigStack = ammo > 9999 + if (totalAmmo > tonumber(ammo)) or bigStack then + ammo = math.min(9999, ammo) + showPlus = true end + ammo = tostring(ammo) for i = 1, #ammo do - addDrawable({image="/interface/sb_numbers.png:"..ammo:sub(i,i),fullbright=true,position={pos[1]+(i/1.6),pos[2]}},"overlay") + addDrawable({image="/interface/sb_numbers.png:"..ammo:sub(i,i).."?replace;000=0000?border;1;333;0000",fullbright=true,position={pos[1]+(i/1.6),pos[2]}},"overlay") + end + if showPlus then + addDrawable({image="/interface/sb_numbers.png:12?replace;000=0000?border;1;333;0000",color=bigStack and "yellow" or "white",fullbright=true,position={pos[1]+((#ammo+1)/1.6),pos[2]}},"overlay") end end end diff --git a/items/active/starbound/guns/ammogunfire.lua b/items/active/starbound/guns/ammogunfire.lua index 470909ac..0ae0bf04 100644 --- a/items/active/starbound/guns/ammogunfire.lua +++ b/items/active/starbound/guns/ammogunfire.lua @@ -23,7 +23,7 @@ end function sb_AmmoGunFire:updateAmmo(shiftHeld) local h = activeItem.hand()=="alt" and "primary" or "alt" local a = world.entityHandItem(activeItem.ownerEntityId(),h) - activeItem.setScriptedAnimationParameter("hand",a and root.itemHasTag(a,"sb_info") and h=="alt" and 2 or 3) + activeItem.setScriptedAnimationParameter("hand",a and root.itemHasTag(a,"sb_info") and h=="primary" and 3 or 2) --and how does this interact with two-handed items? just 'primary'? --not ideal to have this in update, but switching from an infoitem to two guns shows ammo counter twice projectileType = sb_AmmoGunFire:checkAmmo() @@ -33,8 +33,9 @@ function sb_AmmoGunFire:updateAmmo(shiftHeld) else self.power = 0 end - ammoCount = player.hasCountOfItem("sb_ammo") + ammoCount = projectileType and projectileType.count or 0 self.usingAmmo = shiftHeld and ammoCount > 0 + activeItem.setScriptedAnimationParameter("totalAmmo",self.usingAmmo and player.hasCountOfItem("sb_ammo") or 0) activeItem.setScriptedAnimationParameter("ammo",self.usingAmmo and ammoCount or 0) activeItem.setScriptedAnimationParameter("name",self.projectileType) end diff --git a/items/active/starbound/guns/blowgun.png b/items/active/starbound/guns/blowgun.png index 94cc4bf9..3cd4c597 100644 Binary files a/items/active/starbound/guns/blowgun.png and b/items/active/starbound/guns/blowgun.png differ diff --git a/items/active/starbound/guns/randomgenerated/bonenames.config b/items/active/starbound/guns/bonenames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/bonenames.config rename to items/active/starbound/guns/bonenames.config diff --git a/items/active/starbound/guns/randomgenerated/bonepistol.activeitem b/items/active/starbound/guns/bonepistol.activeitem similarity index 76% rename from items/active/starbound/guns/randomgenerated/bonepistol.activeitem rename to items/active/starbound/guns/bonepistol.activeitem index deb2bfe6..d0fce7de 100644 --- a/items/active/starbound/guns/randomgenerated/bonepistol.activeitem +++ b/items/active/starbound/guns/bonepistol.activeitem @@ -2,7 +2,7 @@ "itemName": "sb_bonepistol", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [1.8, 0], + "muzzleOffset": [1.25, 0.2], "tooltipKind": "sb_gun2", "category": "pistol", "twoHanded": false, @@ -21,11 +21,19 @@ "inventoryIcon": "bonepistol.png", "animationParts": { "muzzleFlash": "/animations/sb/muzzleflash/bulletmuzzle4/bulletmuzzle4.png", - "middle": "bonepistol.png" + "middle": "bonepistol.png", + "barrel": "", + "butt": "" }, "animationCustom": { "animatedParts": { "parts": { + "muzzleFlash": { + "properties": { + "offset": [1.25, 0] + + } + }, "middle": { "properties": { "offset": [0.25, 0.1] @@ -39,12 +47,9 @@ }, "elementalType": "physical", - + "primaryAbilityType": "sb_gun", "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", "projectileType": ["bonethorn", "throwingbone"], - "fireTime": [0.3, 1.1], "baseDps": [5.7, 6.2], "energyUsage": [6.5, 11], @@ -53,23 +58,13 @@ "knockbackRange": [0, 6] }, "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": false, - - "allowRotate": true, - "allowFlip": true + "fire": { + "duration": 0.05, + "recoil": true }, - "fire": {}, "cooldown": { - "duration": 0.15, "armRotation": 10, - "weaponRotation": 10, - "twoHanded": false, - - "allowRotate": false, - "allowFlip": false + "weaponRotation": 10 } } }, diff --git a/items/active/starbound/guns/bonepistol.png b/items/active/starbound/guns/bonepistol.png new file mode 100644 index 00000000..faffddb2 Binary files /dev/null and b/items/active/starbound/guns/bonepistol.png differ diff --git a/items/active/starbound/guns/randomgenerated/bonerifle.activeitem b/items/active/starbound/guns/bonerifle.activeitem similarity index 96% rename from items/active/starbound/guns/randomgenerated/bonerifle.activeitem rename to items/active/starbound/guns/bonerifle.activeitem index 6e4a4777..e9eef286 100644 --- a/items/active/starbound/guns/randomgenerated/bonerifle.activeitem +++ b/items/active/starbound/guns/bonerifle.activeitem @@ -23,7 +23,9 @@ "animationParts": { // "muzzleFlash" : "/animations/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png", "muzzleFlash": "/animations/sb/muzzleflash/bulletmuzzle4/bulletmuzzle4.png", - "middle": "bonerifle.png" + "middle": "bonerifle.png", + "barrel": "", + "butt": "" }, "animationCustom": { "sounds": { diff --git a/items/active/starbound/guns/bonerifle.png b/items/active/starbound/guns/bonerifle.png new file mode 100644 index 00000000..7834b56f Binary files /dev/null and b/items/active/starbound/guns/bonerifle.png differ diff --git a/items/active/starbound/guns/boneshotgun.activeitem b/items/active/starbound/guns/boneshotgun.activeitem new file mode 100644 index 00000000..827df1ae --- /dev/null +++ b/items/active/starbound/guns/boneshotgun.activeitem @@ -0,0 +1,64 @@ +{ + "itemName": "sb_boneshotgun", + "maxStack": 1, + "rarity": "rare", + "muzzleOffset": [2, 0.25], + "baseOffset": [-1.25, 0.25], + "tooltipKind": "sb_gun2", + "category": "shotgun", + "twoHanded": true, + "sb_waBan": true, + "price": 620, + "paletteSwaps": "", + "level": 1, + "description": "A shotgun made of bone. An entirely organic firearm.", + "shortdescription": "Bone Shotgun", + "tooltipFields": { + "subtitle": "Bone Shotgun" + }, + "itemTags": ["weapon", "ranged", "shotgun", "upgradeableWeapon"], + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "inventoryIcon": "boneshotgun.png", + "animationParts": { + //"muzzleFlash" : "/animations/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png", + "muzzleFlash": "/animations/muzzleflash/bulletmuzzle4/bulletmuzzle4.png", + "middle": "boneshotgun.png", + "barrel": "", + "butt": "" + }, + "animationCustom": { + "sounds": { + "fire": ["/sfx/gun/boneshotgun.ogg"] + }, + "animatedParts": { + "parts": { + "muzzleFlash": { + "properties": { + "offset": [1.25, 0] + } + } + } + } + }, + + "elementalType": "physical", + "primaryAbilityType": "sb_gun2", + "primaryAbility": { + "projectileType": ["bonethorn", "throwingbone"], + "fireTime": [0.4, 1.4], + "baseDps": [5, 9], + "projectileCount": [3, 8], + "energyUsage": [22.5, 25.5], + "inaccuracy": [5, 15], + "projectileParameters": { + "knockbackRange": [10, 30] + } + }, + + "builderConfig": [{ + "nameGenerator": "bonenames.config:nameGen" + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/boneshotgun.png b/items/active/starbound/guns/boneshotgun.png new file mode 100644 index 00000000..d698335f Binary files /dev/null and b/items/active/starbound/guns/boneshotgun.png differ diff --git a/items/active/starbound/guns/brainextractor.activeitem b/items/active/starbound/guns/brainextractor.activeitem index 415b4de7..de3a475b 100644 --- a/items/active/starbound/guns/brainextractor.activeitem +++ b/items/active/starbound/guns/brainextractor.activeitem @@ -14,7 +14,7 @@ "animation": "/items/active/weapons/ranged/gun.animation", "animationCustom": { "sounds": { - "fire": ["/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/brainextractor.png b/items/active/starbound/guns/brainextractor.png index 9551cadb..60ba9f5e 100644 Binary files a/items/active/starbound/guns/brainextractor.png and b/items/active/starbound/guns/brainextractor.png differ diff --git a/items/active/starbound/guns/corrosivegun.activeitem b/items/active/starbound/guns/corrosivegun.activeitem index 7e714fdd..0bd519c4 100644 --- a/items/active/starbound/guns/corrosivegun.activeitem +++ b/items/active/starbound/guns/corrosivegun.activeitem @@ -5,12 +5,10 @@ "price": 800, "tooltipKind": "sb_gun2", "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_corrosiveparticle.png", - //"damageKindBImage" : "/interface/elements/fire.png", - "subtitle": "Alien Gun" + "damageKindImage": "/interface/sb_tooltips/sb_corrosiveparticle.png" }, - "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], - "category": "pistol", + "itemTags": ["weapon", "ranged", "assaultrifle", "upgradeableWeapon"], + "category": "assaultRifle", "rarity": "Rare", "fixedRarity": false, "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", @@ -29,7 +27,7 @@ "description": "A gun that sprays corrosive particles.", "shortdescription": "Corrosive Gun", "baseOffset": [0.5, 0.15], - "muzzleOffset": [1.6, -0.1], + "muzzleOffset": [2, -0.25], "twoHanded": true, "level": 1, diff --git a/items/active/starbound/guns/corrosivegun.png b/items/active/starbound/guns/corrosivegun.png index 1f75e6e2..227fecd7 100644 Binary files a/items/active/starbound/guns/corrosivegun.png and b/items/active/starbound/guns/corrosivegun.png differ diff --git a/items/active/starbound/guns/feroziumpistol.png b/items/active/starbound/guns/feroziumpistol.png index 802110af..02f0bc64 100644 Binary files a/items/active/starbound/guns/feroziumpistol.png and b/items/active/starbound/guns/feroziumpistol.png differ diff --git a/items/active/starbound/guns/feroziumrifle.activeitem b/items/active/starbound/guns/feroziumrifle.activeitem index 23f37026..c147396f 100644 --- a/items/active/starbound/guns/feroziumrifle.activeitem +++ b/items/active/starbound/guns/feroziumrifle.activeitem @@ -29,7 +29,7 @@ } }, "baseOffset": [0.5, 0.0], - "muzzleOffset": [2.075, 0.235], + "muzzleOffset": [2.25, 0.235], "scripts": ["/items/active/weapons/ranged/gun.lua"], "elementalType": "physical", "altAbilityType": "piercingshot", diff --git a/items/active/starbound/guns/feroziumrifle.png b/items/active/starbound/guns/feroziumrifle.png index f7555ca1..ad9cf9f1 100644 Binary files a/items/active/starbound/guns/feroziumrifle.png and b/items/active/starbound/guns/feroziumrifle.png differ diff --git a/items/active/starbound/guns/feroziumrocket.activeitem b/items/active/starbound/guns/feroziumrocket.activeitem index 7331c7ca..e1db4674 100644 --- a/items/active/starbound/guns/feroziumrocket.activeitem +++ b/items/active/starbound/guns/feroziumrocket.activeitem @@ -24,6 +24,15 @@ "muzzleFlash": "/animations/muzzleflash/bulletmuzzle3/bulletmuzzle3.png" }, "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 3, + "particles": [{ + "particle": "rocketbarrelpuff" + } + ] + } + }, "sounds": { "fire": ["/sfx/gun/rocket1.ogg"] } diff --git a/items/active/starbound/guns/feroziumrocket.png b/items/active/starbound/guns/feroziumrocket.png index ad39dd1f..46e66303 100644 Binary files a/items/active/starbound/guns/feroziumrocket.png and b/items/active/starbound/guns/feroziumrocket.png differ diff --git a/items/active/starbound/guns/feroziumsniper.activeitem b/items/active/starbound/guns/feroziumsniper.activeitem index 0035db16..51938fdc 100644 --- a/items/active/starbound/guns/feroziumsniper.activeitem +++ b/items/active/starbound/guns/feroziumsniper.activeitem @@ -39,7 +39,7 @@ } }, - "baseOffset": [0.5, 0.0], + "baseOffset": [0.5, 0.25], "muzzleOffset": [2.575, 0], "scripts": ["/items/active/weapons/ranged/gun.lua"], diff --git a/items/active/starbound/guns/feroziumsniper.png b/items/active/starbound/guns/feroziumsniper.png index db0de417..2150712f 100644 Binary files a/items/active/starbound/guns/feroziumsniper.png and b/items/active/starbound/guns/feroziumsniper.png differ diff --git a/items/active/starbound/guns/freezeray.png b/items/active/starbound/guns/freezeray.png index f0ec9f7a..7b210a98 100644 Binary files a/items/active/starbound/guns/freezeray.png and b/items/active/starbound/guns/freezeray.png differ diff --git a/items/active/starbound/guns/freezeray_beam.png b/items/active/starbound/guns/freezeray_beam.png index 571de948..94fb25d2 100644 Binary files a/items/active/starbound/guns/freezeray_beam.png and b/items/active/starbound/guns/freezeray_beam.png differ diff --git a/items/active/starbound/guns/freezeray_beamend.png b/items/active/starbound/guns/freezeray_beamend.png index ac47aa48..be6a072d 100644 Binary files a/items/active/starbound/guns/freezeray_beamend.png and b/items/active/starbound/guns/freezeray_beamend.png differ diff --git a/items/active/starbound/guns/gun2.weaponability b/items/active/starbound/guns/gun2.weaponability index 3a1628fd..536fabf2 100644 --- a/items/active/starbound/guns/gun2.weaponability +++ b/items/active/starbound/guns/gun2.weaponability @@ -26,11 +26,11 @@ "allowRotate": true, "allowFlip": true }, - "fire": { //TODO: corrosive gun has this as {} and it works fine + "fire": { "armRotation": 5, "weaponRotation": 0, "twoHanded": true, - "allowRotate": false, + "allowRotate": true, "allowFlip": true }, "cooldown": { @@ -38,7 +38,7 @@ "armRotation": 5, "weaponRotation": 5, "twoHanded": true, - "allowRotate": false, + "allowRotate": true, "allowFlip": true } } diff --git a/items/active/starbound/guns/heatray.png b/items/active/starbound/guns/heatray.png index 4f953980..9286eb77 100644 Binary files a/items/active/starbound/guns/heatray.png and b/items/active/starbound/guns/heatray.png differ diff --git a/items/active/starbound/guns/heatrayfb.png b/items/active/starbound/guns/heatrayfb.png index ebcd169f..1e910470 100644 Binary files a/items/active/starbound/guns/heatrayfb.png and b/items/active/starbound/guns/heatrayfb.png differ diff --git a/items/active/starbound/guns/heatrayicon.png b/items/active/starbound/guns/heatrayicon.png index cf131bc5..7ec3ebed 100644 Binary files a/items/active/starbound/guns/heatrayicon.png and b/items/active/starbound/guns/heatrayicon.png differ diff --git a/items/active/starbound/guns/icechucker.activeitem b/items/active/starbound/guns/icechucker.activeitem new file mode 100644 index 00000000..24d81c49 --- /dev/null +++ b/items/active/starbound/guns/icechucker.activeitem @@ -0,0 +1,60 @@ +{ + "itemName": "sb_icechucker", + "inventoryIcon": "icechuckericon.png", + "maxStack": 1, + "price": 640, + "rarity": "rare", + "fixedRarity": false, + "category": "pistol", + "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], + "tooltipKind": "sb_gun2", + "tooltipFields": { + "damageKindImage": "/projectiles/material/sb_icematerial.png", + "objectImage":"/items/active/starbound/guns/icechucker.png" + }, + "animation": "/items/active/weapons/ranged/gun.animation", + "animationCustom": { + "sounds": { + "fire": [ + "/sfx/projectiles/ice_barrier_break1.ogg", + "/sfx/projectiles/ice_barrier_break4.ogg", + "/sfx/projectiles/ice_barrier_break5.ogg", + "/sfx/projectiles/ice_barrier_break6.ogg", + "/sfx/projectiles/ice_barrier_break10.ogg" + ] + } + }, + "animationParts": { + "barrel": "", + "butt": "", + "muzzleFlash": "", + "middle": "icechucker.png" + }, + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "description": "A small gun that fires blocks of ice. Freeze!", + "shortdescription": "Ice Chucker", + "baseOffset": [0.5, 0.15], + "muzzleOffset": [0.6, 0.3], + + "twoHanded": false, + "fixedLevel": false, + + "primaryAbilityType": "sb_gun", + "primaryAbility": { + "stances": { + "cooldown": { + "recoil": false, + "armRotation": 3, + "weaponRotation": 3 + } + }, + "fireTime": 0.8, + "energyUsage": 18.75, + "inaccuracy": 0.025, + "projectileType": "sb_icematerial", + "projectileParameters": { + "speed": 30 + } + }, + "builder": "/items/buildscripts/starbound/buildunrandweapon.lua" +} diff --git a/items/active/starbound/guns/icechuckericon.png b/items/active/starbound/guns/icechuckericon.png index 54fedb35..3d95394e 100644 Binary files a/items/active/starbound/guns/icechuckericon.png and b/items/active/starbound/guns/icechuckericon.png differ diff --git a/items/active/starbound/guns/icechunker.activeitem b/items/active/starbound/guns/icechunker.activeitem deleted file mode 100644 index 65a40598..00000000 --- a/items/active/starbound/guns/icechunker.activeitem +++ /dev/null @@ -1,60 +0,0 @@ -{ - "itemName": "sb_icechucker", - "inventoryIcon": "icechuckericon.png", - "maxStack": 1, - "price": 640, - "rarity": "rare", - "fixedRarity": false, - "category": "pistol", - "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], - "tooltipKind": "sb_gun2", - "tooltipFields": { - "damageKindImage": "/projectiles/material/sb_icematerial.png" - // "damageKindBImage" : "/interface/elements/ice.png" - }, - "animation": "/items/active/weapons/ranged/gun.animation", - "animationCustom": { - "sounds": { - "fire": [ - "/sfx/projectiles/ice_barrier_break1.ogg", - "/sfx/projectiles/ice_barrier_break4.ogg", - "/sfx/projectiles/ice_barrier_break5.ogg", - "/sfx/projectiles/ice_barrier_break6.ogg", - "/sfx/projectiles/ice_barrier_break10.ogg" - ] - } - }, - "animationParts": { - "barrel": "", - "butt": "", - "muzzleFlash": "", - "middle": "icechucker.png" - }, - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "description": "A small gun that fires blocks of ice. Freeze!", - "shortdescription": "Ice Chucker", - "baseOffset": [0.5, 0.15], - "muzzleOffset": [0.6, 0.3], - - "twoHanded": false, - "fixedLevel": false, - - "primaryAbilityType": "sb_gun", - "primaryAbility": { - "stances": { - "cooldown": { - "recoil": false, - "armRotation": 3, - "weaponRotation": 3 - } - }, - "fireTime": 0.8, - "energyUsage": 18.75, - "inaccuracy": 0.025, - "projectileType": "sb_icematerial", - "projectileParameters": { - "speed": 30 - } - }, - "builder": "/items/buildscripts/starbound/buildunrandweapon.lua" -} diff --git a/items/active/starbound/guns/irradiatedlauncher.png b/items/active/starbound/guns/irradiatedlauncher.png index e39ec032..9146de92 100644 Binary files a/items/active/starbound/guns/irradiatedlauncher.png and b/items/active/starbound/guns/irradiatedlauncher.png differ diff --git a/items/active/starbound/guns/irradiatedlauncherfb.png b/items/active/starbound/guns/irradiatedlauncherfb.png index c4506922..78e40a1d 100644 Binary files a/items/active/starbound/guns/irradiatedlauncherfb.png and b/items/active/starbound/guns/irradiatedlauncherfb.png differ diff --git a/items/active/starbound/guns/randomgenerated/needler.activeitem b/items/active/starbound/guns/needler.activeitem similarity index 97% rename from items/active/starbound/guns/randomgenerated/needler.activeitem rename to items/active/starbound/guns/needler.activeitem index fd796c19..b13e4901 100644 --- a/items/active/starbound/guns/randomgenerated/needler.activeitem +++ b/items/active/starbound/guns/needler.activeitem @@ -2,7 +2,7 @@ "itemName": "sb_thornyneedler", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [1.75, 0.125], + "muzzleOffset": [2, 0.125], "baseOffset": [-1.25, 0.375], "price": 620, "tooltipKind": "sb_gun2", @@ -21,7 +21,9 @@ "inventoryIcon": "needler.png", "animationParts": { "muzzleFlash": "/animations/muzzleflash/bulletmuzzle3/bulletmuzzle3.png", - "butt": "needler.png" + "butt": "needler.png", + "barrel": "", + "middle": "" }, "animationCustom": { "animatedParts": { diff --git a/items/active/starbound/guns/needler.png b/items/active/starbound/guns/needler.png new file mode 100644 index 00000000..bb7657e6 Binary files /dev/null and b/items/active/starbound/guns/needler.png differ diff --git a/items/active/starbound/guns/randomgenerated/needlernames.config b/items/active/starbound/guns/needlernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/needlernames.config rename to items/active/starbound/guns/needlernames.config diff --git a/items/active/starbound/guns/novakid/novastarter.png b/items/active/starbound/guns/novakid/novastarter.png index b7a1d5be..1503b4d9 100644 Binary files a/items/active/starbound/guns/novakid/novastarter.png and b/items/active/starbound/guns/novakid/novastarter.png differ diff --git a/items/active/starbound/guns/novakid/novatier0rifle.png b/items/active/starbound/guns/novakid/novatier0rifle.png index 3f927fe3..8bb209b8 100644 Binary files a/items/active/starbound/guns/novakid/novatier0rifle.png and b/items/active/starbound/guns/novakid/novatier0rifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier1revolver.png b/items/active/starbound/guns/novakid/novatier1revolver.png index 161a524f..3b38c45a 100644 Binary files a/items/active/starbound/guns/novakid/novatier1revolver.png and b/items/active/starbound/guns/novakid/novatier1revolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier1rifle.png b/items/active/starbound/guns/novakid/novatier1rifle.png index d1e23d08..c9f480f8 100644 Binary files a/items/active/starbound/guns/novakid/novatier1rifle.png and b/items/active/starbound/guns/novakid/novatier1rifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier2revolver.png b/items/active/starbound/guns/novakid/novatier2revolver.png index 85720878..e4574ab4 100644 Binary files a/items/active/starbound/guns/novakid/novatier2revolver.png and b/items/active/starbound/guns/novakid/novatier2revolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier2rifle.png b/items/active/starbound/guns/novakid/novatier2rifle.png index 4c0ff880..b37f5fbe 100644 Binary files a/items/active/starbound/guns/novakid/novatier2rifle.png and b/items/active/starbound/guns/novakid/novatier2rifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier3revolver.png b/items/active/starbound/guns/novakid/novatier3revolver.png index 822faa47..096e9ace 100644 Binary files a/items/active/starbound/guns/novakid/novatier3revolver.png and b/items/active/starbound/guns/novakid/novatier3revolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier4revolver.png b/items/active/starbound/guns/novakid/novatier4revolver.png index b18d3626..97a7708e 100644 Binary files a/items/active/starbound/guns/novakid/novatier4revolver.png and b/items/active/starbound/guns/novakid/novatier4revolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier4rifle.png b/items/active/starbound/guns/novakid/novatier4rifle.png index 1d45ad28..7634f649 100644 Binary files a/items/active/starbound/guns/novakid/novatier4rifle.png and b/items/active/starbound/guns/novakid/novatier4rifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier5arifle.png b/items/active/starbound/guns/novakid/novatier5arifle.png index a04bdd46..c2c3b4a0 100644 Binary files a/items/active/starbound/guns/novakid/novatier5arifle.png and b/items/active/starbound/guns/novakid/novatier5arifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier5mrevolver.png b/items/active/starbound/guns/novakid/novatier5mrevolver.png index 75116b8d..83f486c3 100644 Binary files a/items/active/starbound/guns/novakid/novatier5mrevolver.png and b/items/active/starbound/guns/novakid/novatier5mrevolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier5mrifle.png b/items/active/starbound/guns/novakid/novatier5mrifle.png index c960b1e5..ca4e7fe4 100644 Binary files a/items/active/starbound/guns/novakid/novatier5mrifle.png and b/items/active/starbound/guns/novakid/novatier5mrifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier5srevolver.png b/items/active/starbound/guns/novakid/novatier5srevolver.png index 10a6d981..8b1d9ecc 100644 Binary files a/items/active/starbound/guns/novakid/novatier5srevolver.png and b/items/active/starbound/guns/novakid/novatier5srevolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier5srifle.png b/items/active/starbound/guns/novakid/novatier5srifle.png index 49e8b9f8..085a5f66 100644 Binary files a/items/active/starbound/guns/novakid/novatier5srifle.png and b/items/active/starbound/guns/novakid/novatier5srifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier6arevolver.png b/items/active/starbound/guns/novakid/novatier6arevolver.png index 46bcffcb..39d6c991 100644 Binary files a/items/active/starbound/guns/novakid/novatier6arevolver.png and b/items/active/starbound/guns/novakid/novatier6arevolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier6arifle.png b/items/active/starbound/guns/novakid/novatier6arifle.png index 352a7ab3..865bb4f1 100644 Binary files a/items/active/starbound/guns/novakid/novatier6arifle.png and b/items/active/starbound/guns/novakid/novatier6arifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier6mrevolver.png b/items/active/starbound/guns/novakid/novatier6mrevolver.png index 19728d08..2cbcf72d 100644 Binary files a/items/active/starbound/guns/novakid/novatier6mrevolver.png and b/items/active/starbound/guns/novakid/novatier6mrevolver.png differ diff --git a/items/active/starbound/guns/novakid/novatier6mrifle.png b/items/active/starbound/guns/novakid/novatier6mrifle.png index 309bee12..7e0643e3 100644 Binary files a/items/active/starbound/guns/novakid/novatier6mrifle.png and b/items/active/starbound/guns/novakid/novatier6mrifle.png differ diff --git a/items/active/starbound/guns/novakid/novatier6srifle.png b/items/active/starbound/guns/novakid/novatier6srifle.png index df78d907..dfcf5120 100644 Binary files a/items/active/starbound/guns/novakid/novatier6srifle.png and b/items/active/starbound/guns/novakid/novatier6srifle.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultnames.config b/items/active/starbound/guns/randomgenerated/assaultrifle/assaultnames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/assaultnames.config rename to items/active/starbound/guns/randomgenerated/assaultrifle/assaultnames.config diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/1.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/1.png index 03494ab5..2c19d4f2 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/1.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/10.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/10.png index b3ce5ed3..0f58dc04 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/10.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/11.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/11.png index f88a267f..290b928e 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/11.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/13.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/13.png index 5417b125..71da3a98 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/13.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/14.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/14.png index ce4edc37..579d0ab8 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/14.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/15.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/15.png index 7cfd4798..5f03d863 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/15.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/16.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/16.png index 896c7b7f..04ccb169 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/16.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/18.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/18.png index f55abdb4..1d0cdfb3 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/18.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/19.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/19.png index 20434946..c9a3259b 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/19.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/2.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/2.png index 49415635..dfdfc691 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/2.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/4.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/4.png index b1be1275..75bb1c59 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/4.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/5.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/5.png index 508f9da6..bec0402c 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/5.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/6.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/6.png index 5a8bd08a..24027168 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/6.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/7.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/7.png index ec81e9c5..01e80e75 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/7.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/8.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/8.png index fcc59051..d697286b 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/8.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/9.png b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/9.png index 88bf0437..bd8a27b0 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/9.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/10.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/10.png index 092758ca..023e186b 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/10.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/11.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/11.png index f4a7e368..0c1e0b9c 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/11.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/12.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/12.png index 9dec5453..e5d93c15 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/12.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/13.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/13.png index df7465a5..9555ebd1 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/13.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/14.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/14.png index fe07be9a..cbc0d01f 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/14.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/15.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/15.png index 3058fb95..e81d2320 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/15.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/16.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/16.png index c00ddc4a..dd8ba3a9 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/16.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/17.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/17.png index f2fc6ed2..1b9efc7f 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/17.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/18.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/18.png index e41264cb..fa639b56 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/18.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/19.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/19.png index e16a8aa9..352223d5 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/19.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/2.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/2.png index 9df6eb3a..560e7f9e 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/2.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/20.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/20.png index d305d93d..c9b0c19a 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/20.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/3.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/3.png index 8feffbbf..3adb46f3 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/3.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/4.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/4.png index 147fb4da..9f8d9819 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/4.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/5.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/5.png index 23624cec..29dd0a62 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/5.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/6.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/6.png index d1b16d6c..c347e89d 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/6.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/7.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/7.png index 3228e26d..8994ad8a 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/7.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/8.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/8.png index 362fd632..561c37b0 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/8.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/9.png b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/9.png index 0199a023..93ebe831 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/butt/9.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/commonburstrifle.activeitem b/items/active/starbound/guns/randomgenerated/assaultrifle/commonburstrifle.activeitem similarity index 88% rename from items/active/starbound/guns/randomgenerated/commonburstrifle.activeitem rename to items/active/starbound/guns/randomgenerated/assaultrifle/commonburstrifle.activeitem index face007d..d42f876c 100644 --- a/items/active/starbound/guns/randomgenerated/commonburstrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/assaultrifle/commonburstrifle.activeitem @@ -5,8 +5,8 @@ "muzzleOffset": [0.75, 0.25], "baseOffset": [-1.25, 0.25], "price": 620, - "tooltipKind": "sb_gun", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A fully automatic, military grade rifle.", "shortdescription": "Common Burst Rifle", "paletteSwaps": "", "category": "assaultRifle", @@ -32,7 +32,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet", "marioball"], + "projectileType": ["delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet", "marioball"], "projectileParameters": { "knockbackRange": [3, 11] @@ -79,17 +79,17 @@ "nameGenerator": "assaultnames.config:nameGen", "animationParts": { "barrel": { - "path": "assaultrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "assaultrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "assaultrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/commonplasmaassaultrifle.activeitem b/items/active/starbound/guns/randomgenerated/assaultrifle/commonplasmaassaultrifle.activeitem similarity index 86% rename from items/active/starbound/guns/randomgenerated/commonplasmaassaultrifle.activeitem rename to items/active/starbound/guns/randomgenerated/assaultrifle/commonplasmaassaultrifle.activeitem index 9ab7cf80..516b3ddb 100644 --- a/items/active/starbound/guns/randomgenerated/commonplasmaassaultrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/assaultrifle/commonplasmaassaultrifle.activeitem @@ -2,11 +2,11 @@ "itemName": "sb_commonplasmaassaultrifle", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, 0.25], + "muzzleOffset": [0.25, 0.24], "baseOffset": [-1.25, 0.25], "price": 620, - "tooltipKind": "sb_gun", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A fully automatic, military grade plasma rifle.", "shortdescription": "Common Plasma Rifle", "paletteSwaps": "", "category": "assaultRifle", @@ -19,7 +19,7 @@ "scripts": ["/items/active/weapons/ranged/gun.lua"], "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", "animationParts": { - "muzzleFlash": "/animations/sb/muzzleflash/plasmamuzzle1/plasmamuzzle1.png" + "muzzleFlash": "/animations/muzzleflash/plasmamuzzle2/plasmamuzzle2.png" //TODO: fix plasmamuzzle1? }, "animationCustom": { "sounds": { @@ -67,17 +67,17 @@ "nameGenerator": "assaultnames.config:nameGen", "animationParts": { "barrel": { - "path": "assaultrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "assaultrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "assaultrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/1.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/1.png index 4c1d09fc..10b6e682 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/1.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/10.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/10.png index a377d3ef..0e0592d4 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/10.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/11.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/11.png index 45f66ccf..205fb2fa 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/11.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/13.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/13.png index 846501bf..46243da8 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/13.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/14.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/14.png index 0ce05cb4..0f707170 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/14.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/15.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/15.png index 6d805db8..3c9e7230 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/15.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/16.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/16.png index d5c9ac51..bf88f75b 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/16.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/17.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/17.png index e8ee060a..f8791d2d 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/17.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/18.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/18.png index 4950a246..040ec26b 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/18.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/2.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/2.png index bac801e4..00f347c9 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/2.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/20.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/20.png index 6beceb73..8afb4ef1 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/20.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/3.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/3.png index b02b4ef4..4293a63f 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/3.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/4.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/4.png index 6ea62672..8fb965d1 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/4.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/5.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/5.png index 29c8018f..f8ecadd3 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/5.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/6.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/6.png index 98287b0b..e3de1399 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/6.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/7.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/7.png index a398f80c..f5823ea2 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/7.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/8.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/8.png index 96b58c91..6d1d7792 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/8.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/9.png b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/9.png index b203e64e..334f8915 100644 Binary files a/items/active/starbound/guns/randomgenerated/assaultrifle/middle/9.png and b/items/active/starbound/guns/randomgenerated/assaultrifle/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/rareplasmaassaultrifle.activeitem b/items/active/starbound/guns/randomgenerated/assaultrifle/rareplasmaassaultrifle.activeitem similarity index 91% rename from items/active/starbound/guns/randomgenerated/rareplasmaassaultrifle.activeitem rename to items/active/starbound/guns/randomgenerated/assaultrifle/rareplasmaassaultrifle.activeitem index 0790b905..1a715d7b 100644 --- a/items/active/starbound/guns/randomgenerated/rareplasmaassaultrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/assaultrifle/rareplasmaassaultrifle.activeitem @@ -5,8 +5,8 @@ "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], "price": 620, - "tooltipKind": "sb_gun", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A fully automatic, military grade plasma rifle.", "shortdescription": "Rare Plasma Rifle", "paletteSwaps": "", "category": "assaultRifle", @@ -67,17 +67,17 @@ "nameGenerator": "assaultnames.config:nameGen", "animationParts": { "barrel": { - "path": "assaultrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "assaultrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "assaultrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/avianblaster.activeitem b/items/active/starbound/guns/randomgenerated/avian/avianblaster.activeitem similarity index 85% rename from items/active/starbound/guns/randomgenerated/avianblaster.activeitem rename to items/active/starbound/guns/randomgenerated/avian/avianblaster.activeitem index a0ba13b9..35377bb2 100644 --- a/items/active/starbound/guns/randomgenerated/avianblaster.activeitem +++ b/items/active/starbound/guns/randomgenerated/avian/avianblaster.activeitem @@ -4,7 +4,7 @@ "rarity": "rare", "price": 620, "baseOffset": [-0.25, 0.25], - "muzzleOffset": [0, 0.375], + "muzzleOffset": [0, 0.25], "tooltipKind": "sb_gun", "category": "pistol", "twoHanded": false, @@ -49,12 +49,10 @@ }, "fire": {}, "cooldown": { - "duration": 0, + "duration": 0.025, + "recoil": true, "armRotation": 2, - "weaponRotation": 2, - "twoHanded": false, - "allowRotate": true, - "allowFlip": true + "weaponRotation": 2 } } }, @@ -63,17 +61,17 @@ "nameGenerator": "aviannames.config:nameGen", "animationParts": { "barrel": { - "path": "avianblaster/barrel/.png", + "path": "blasterbarrel/.png", "variants": 2, "paletteSwap": true }, "butt": { - "path": "avianblaster/butt/.png", + "path": "blasterbutt/.png", "variants": 1, "paletteSwap": true }, "middle": { - "path": "avianblaster/middle/.png", + "path": "blastermiddle/.png", "variants": 2, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/aviangun.activeitem b/items/active/starbound/guns/randomgenerated/avian/aviangun.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/aviangun.activeitem rename to items/active/starbound/guns/randomgenerated/avian/aviangun.activeitem index ecee9aab..6c43ccfa 100644 --- a/items/active/starbound/guns/randomgenerated/aviangun.activeitem +++ b/items/active/starbound/guns/randomgenerated/avian/aviangun.activeitem @@ -4,7 +4,7 @@ "rarity": "uncommon", "price": 620, "baseOffset": [-1.25, 0.25], - "muzzleOffset": [-0.5, 0.275], + "muzzleOffset": [-0.5, 0.225], "description": "", "shortdescription": "Heavy Avian Blaster", "tooltipKind": "sb_gun", @@ -45,17 +45,17 @@ "nameGenerator": "aviannames.config:nameGen", "animationParts": { "barrel": { - "path": "aviangun/barrel/.png", + "path": "gunbarrel/.png", "variants": 3, "paletteSwap": true }, "butt": { - "path": "aviangun/butt/.png", + "path": "gunbutt/.png", "variants": 2, "paletteSwap": true }, "middle": { - "path": "aviangun/middle/.png", + "path": "gunmiddle/.png", "variants": 3, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/aviannames.config b/items/active/starbound/guns/randomgenerated/avian/aviannames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/aviannames.config rename to items/active/starbound/guns/randomgenerated/avian/aviannames.config diff --git a/items/active/starbound/guns/randomgenerated/avian/blasterbarrel/1.png b/items/active/starbound/guns/randomgenerated/avian/blasterbarrel/1.png new file mode 100644 index 00000000..82317bef Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/blasterbarrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/blasterbarrel/2.png b/items/active/starbound/guns/randomgenerated/avian/blasterbarrel/2.png new file mode 100644 index 00000000..7ff0740f Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/blasterbarrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/blasterbutt/1.png b/items/active/starbound/guns/randomgenerated/avian/blasterbutt/1.png new file mode 100644 index 00000000..51ca7884 Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/blasterbutt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/avianblaster/middle/1.png b/items/active/starbound/guns/randomgenerated/avian/blastermiddle/1.png similarity index 100% rename from items/active/starbound/guns/randomgenerated/avianblaster/middle/1.png rename to items/active/starbound/guns/randomgenerated/avian/blastermiddle/1.png diff --git a/items/active/starbound/guns/randomgenerated/avianblaster/middle/2.png b/items/active/starbound/guns/randomgenerated/avian/blastermiddle/2.png similarity index 100% rename from items/active/starbound/guns/randomgenerated/avianblaster/middle/2.png rename to items/active/starbound/guns/randomgenerated/avian/blastermiddle/2.png diff --git a/items/active/starbound/guns/randomgenerated/avian/gunbarrel/1.png b/items/active/starbound/guns/randomgenerated/avian/gunbarrel/1.png new file mode 100644 index 00000000..12690f98 Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunbarrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunbarrel/2.png b/items/active/starbound/guns/randomgenerated/avian/gunbarrel/2.png new file mode 100644 index 00000000..03d67ea7 Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunbarrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunbarrel/3.png b/items/active/starbound/guns/randomgenerated/avian/gunbarrel/3.png new file mode 100644 index 00000000..0eb57d0f Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunbarrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunbutt/1.png b/items/active/starbound/guns/randomgenerated/avian/gunbutt/1.png new file mode 100644 index 00000000..e8909dce Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunbutt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunbutt/2.png b/items/active/starbound/guns/randomgenerated/avian/gunbutt/2.png new file mode 100644 index 00000000..57135060 Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunbutt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunmiddle/1.png b/items/active/starbound/guns/randomgenerated/avian/gunmiddle/1.png new file mode 100644 index 00000000..590bc1db Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunmiddle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunmiddle/2.png b/items/active/starbound/guns/randomgenerated/avian/gunmiddle/2.png new file mode 100644 index 00000000..ea1fc625 Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunmiddle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/avian/gunmiddle/3.png b/items/active/starbound/guns/randomgenerated/avian/gunmiddle/3.png new file mode 100644 index 00000000..b9128d09 Binary files /dev/null and b/items/active/starbound/guns/randomgenerated/avian/gunmiddle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/avianblaster/barrel/1.png b/items/active/starbound/guns/randomgenerated/avianblaster/barrel/1.png deleted file mode 100644 index d94e1013..00000000 Binary files a/items/active/starbound/guns/randomgenerated/avianblaster/barrel/1.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/avianblaster/barrel/2.png b/items/active/starbound/guns/randomgenerated/avianblaster/barrel/2.png deleted file mode 100644 index 2769d7ea..00000000 Binary files a/items/active/starbound/guns/randomgenerated/avianblaster/barrel/2.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/avianblaster/butt/1.png b/items/active/starbound/guns/randomgenerated/avianblaster/butt/1.png deleted file mode 100644 index 32a27a0a..00000000 Binary files a/items/active/starbound/guns/randomgenerated/avianblaster/butt/1.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/barrel/1.png b/items/active/starbound/guns/randomgenerated/aviangun/barrel/1.png deleted file mode 100644 index 8be2ddf1..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/barrel/1.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/barrel/2.png b/items/active/starbound/guns/randomgenerated/aviangun/barrel/2.png deleted file mode 100644 index b83152a9..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/barrel/2.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/barrel/3.png b/items/active/starbound/guns/randomgenerated/aviangun/barrel/3.png deleted file mode 100644 index 498846ba..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/barrel/3.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/butt/1.png b/items/active/starbound/guns/randomgenerated/aviangun/butt/1.png deleted file mode 100644 index e57d6068..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/butt/1.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/butt/2.png b/items/active/starbound/guns/randomgenerated/aviangun/butt/2.png deleted file mode 100644 index 5cb60973..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/butt/2.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/middle/1.png b/items/active/starbound/guns/randomgenerated/aviangun/middle/1.png deleted file mode 100644 index e2527358..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/middle/1.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/middle/2.png b/items/active/starbound/guns/randomgenerated/aviangun/middle/2.png deleted file mode 100644 index 7294518e..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/middle/2.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/aviangun/middle/3.png b/items/active/starbound/guns/randomgenerated/aviangun/middle/3.png deleted file mode 100644 index 4cca4b85..00000000 Binary files a/items/active/starbound/guns/randomgenerated/aviangun/middle/3.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/bonepistol.png b/items/active/starbound/guns/randomgenerated/bonepistol.png deleted file mode 100644 index cf96bf33..00000000 Binary files a/items/active/starbound/guns/randomgenerated/bonepistol.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/bonerifle.png b/items/active/starbound/guns/randomgenerated/bonerifle.png deleted file mode 100644 index 6bedcfad..00000000 Binary files a/items/active/starbound/guns/randomgenerated/bonerifle.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/boneshotgun.activeitem b/items/active/starbound/guns/randomgenerated/boneshotgun.activeitem deleted file mode 100644 index 800a6e5a..00000000 --- a/items/active/starbound/guns/randomgenerated/boneshotgun.activeitem +++ /dev/null @@ -1,74 +0,0 @@ -{ - "itemName": "sb_boneshotgun", - "maxStack": 1, - "rarity": "rare", - "muzzleOffset": [2.6, 0.1], - "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun2", - "category": "shotgun", - "twoHanded": true, - "sb_waBan": true, - "price": 620, - "paletteSwaps": "", - "level": 1, - "description": "A shotgun made of bone. An entirely organic firearm.", - "shortdescription": "Bone Shotgun", - "tooltipFields": { - "subtitle": "Bone Shotgun" - }, - "itemTags": ["weapon", "ranged", "shotgun", "upgradeableWeapon"], - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "inventoryIcon": "boneshotgun.png", - "animationParts": { - // "muzzleFlash" : "/animations/muzzleflash/bloodvomitmuzzle/bloodvomitmuzzle.png", - "muzzleFlash": "/animations/muzzleflash/bulletmuzzle4/bulletmuzzle4.png", - "middle": "boneshotgun.png" - }, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/boneshotgun.ogg"] - } - }, - - "elementalType": "physical", - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["bonethorn", "throwingbone"], - "fireTime": [0.4, 1.4], - "baseDps": [5, 9], - "projectileCount": [3, 8], - "energyUsage": [22.5, 25.5], - "inaccuracy": [5, 15], - "projectileParameters": { - "knockbackRange": [10, 30] - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.25, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": false - } - } - }, - - "builderConfig": [{ - "nameGenerator": "bonenames.config:nameGen" - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/boneshotgun.png b/items/active/starbound/guns/randomgenerated/boneshotgun.png deleted file mode 100644 index 94780ba2..00000000 Binary files a/items/active/starbound/guns/randomgenerated/boneshotgun.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper.activeitem b/items/active/starbound/guns/randomgenerated/cellzapper.activeitem deleted file mode 100644 index 44a185d8..00000000 --- a/items/active/starbound/guns/randomgenerated/cellzapper.activeitem +++ /dev/null @@ -1,92 +0,0 @@ -{ - "itemName": "sb_cellzapper", - "maxStack": 1, - "rarity": "uncommon", - "baseOffset": [-2.55, 0.25], - "muzzleOffset": [0, 0], - "price": 620, - "paletteSwaps": "", - "tooltipKind": "sb_gun", - "category": "sniperRifle", - "description": "", - "shortdescription": "Cell Zapper", - "twoHanded": true, - "level": 1, - "tooltipFields": { - "subtitle": "Cell Zapper" - }, - "itemTags": ["weapon", "ranged", "sniperrifle", "cellzapper", "upgradeableWeapon"], - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": { - "muzzleFlash": "/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png" - }, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/plasma_sniper3.ogg"] - } - }, - - "elementalType": "physical", - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["cellzap1", "cellzap2", "cellzap3", "cellzap4", "cellzap5"], - - "fireTime": [0.9, 1.6], - "baseDps": [3.7, 3.85], - "energyUsage": [22.5, 25.5], - "inaccuracy": [1, 3], - "projectileParameters": { - "knockbackRange": [6, 16], - "timeToLive": 0.2 - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.35, - "armRotation": 0, - "recoil": true, - "weaponRotation": 0, - "twoHanded": true, - "allowRotate": false, - "allowFlip": true - } - } - }, - - "builderConfig": [{ - "nameGenerator": "lightningcoilnames.config:nameGen", - "animationParts": { - "barrel": { - "path": "cellzapper/barrel/.png", - "variants": 20, - "paletteSwap": true - }, - "butt": { - "path": "cellzapper/butt/.png", - "variants": 20, - "paletteSwap": true - }, - "middle": { - "path": "cellzapper/middle/.png", - "variants": 20, - "paletteSwap": true - } - }, - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"], - "palette": "/items/active/starbound/colors/lightningcoil.weaponcolors", - "altAbilities": ["flashlight", "grenadelauncher", "sb_shotgun"] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/1.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/1.png index 2c220370..f617e747 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/1.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/10.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/10.png index 3f4bb855..8373d279 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/10.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/11.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/11.png index 6c3f8035..e71121a1 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/11.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/12.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/12.png index 50c05dda..1da27f4c 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/12.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/13.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/13.png index dba6dfa3..276c85e1 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/13.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/14.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/14.png index 471a6721..d38b90ce 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/14.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/15.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/15.png index a68e31f8..91bde9cf 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/15.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/16.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/16.png index 8e5acf22..9bf5e45e 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/16.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/17.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/17.png index 4caf8e31..582225c0 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/17.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/18.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/18.png index fdceb97c..77338a9b 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/18.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/19.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/19.png index 5d117058..fd1540f5 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/19.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/2.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/2.png index d26c35f6..1a13e53f 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/2.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/20.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/20.png index 28f3d3fb..3fdb535c 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/20.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/3.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/3.png index 8303f587..69cb0af1 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/3.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/4.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/4.png index 7b54acec..402daf18 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/4.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/5.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/5.png index 4326906e..9e1ba170 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/5.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/6.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/6.png index b4045c70..91c31545 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/6.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/7.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/7.png index ea3ae0c5..fd309acd 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/7.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/8.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/8.png index 652dc4f3..4095ea61 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/8.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/9.png b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/9.png index c2cc2457..41ce9d52 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/barrel/9.png and b/items/active/starbound/guns/randomgenerated/cellzapper/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/1.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/1.png index f3bbfeb8..eda9fa07 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/1.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/10.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/10.png index c0398c38..5b572447 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/10.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/11.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/11.png index 2cfe9b67..4962d677 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/11.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/12.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/12.png index ddad7dfd..c10219ba 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/12.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/13.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/13.png index e29b4ce6..652994ac 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/13.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/14.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/14.png index 9f7b9eb3..e3c6398e 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/14.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/15.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/15.png index 1f6eca4d..66f1f9d3 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/15.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/16.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/16.png index b77d4792..86a4c6f0 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/16.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/17.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/17.png index 03332181..b7867e8a 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/17.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/18.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/18.png index 1f63a2d6..b2696fd4 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/18.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/19.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/19.png index 2815dc4e..a7f94fd5 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/19.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/2.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/2.png index 404829eb..1569b2d6 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/2.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/20.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/20.png index 3e18df31..29ed6715 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/20.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/3.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/3.png index 74b4d44e..2192c255 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/3.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/4.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/4.png index a05136e9..e0ead111 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/4.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/5.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/5.png index 1a7d92a1..09314497 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/5.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/6.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/6.png index c3cef8cf..6a36357e 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/6.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/7.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/7.png index 3d902d1d..d36d1e82 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/7.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/8.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/8.png index b3e0c73d..74b4406f 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/8.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/butt/9.png b/items/active/starbound/guns/randomgenerated/cellzapper/butt/9.png index 09cdb1a3..c58c2537 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/butt/9.png and b/items/active/starbound/guns/randomgenerated/cellzapper/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/cellzapper.activeitem b/items/active/starbound/guns/randomgenerated/cellzapper/cellzapper.activeitem new file mode 100644 index 00000000..18bb82a3 --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/cellzapper/cellzapper.activeitem @@ -0,0 +1,71 @@ +{ + "itemName": "sb_cellzapper", + "maxStack": 1, + "rarity": "uncommon", + "muzzleOffset": [0, 0], + "baseOffset": [-1.25, 0.25], + "price": 620, + "paletteSwaps": "", + "tooltipKind": "sb_gun", + "category": "sniperRifle", + "description": "", + "shortdescription": "Cell Zapper", + "twoHanded": true, + "level": 1, + "tooltipFields": { + "subtitle": "Cell Zapper" + }, + "itemTags": ["weapon", "ranged", "sniperrifle", "cellzapper", "upgradeableWeapon"], + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "animationParts": { + "muzzleFlash": "/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png" + }, + "animationCustom": { + "sounds": { + "fire": ["/sfx/gun/plasma_sniper3.ogg"] + } + }, + + "elementalType": "physical", + "primaryAbilityType": "sb_gun2", + "primaryAbility": { + "projectileType": ["cellzap1", "cellzap2", "cellzap3", "cellzap4", "cellzap5"], + + "fireTime": [0.9, 1.6], + "baseDps": [3.7, 3.85], + "energyUsage": [22.5, 25.5], + "inaccuracy": [1, 3], + "projectileParameters": { + "knockbackRange": [6, 16], + "timeToLive": 0.2 + } + }, + + "builderConfig": [{ + "nameGenerator": "/items/active/starbound/guns/randomgenerated/lightningcoil/lightningcoilnames.config:nameGen", + "animationParts": { + "barrel": { + "path": "barrel/.png", + "variants": 20, + "paletteSwap": true + }, + "butt": { + "path": "butt/.png", + "variants": 20, + "paletteSwap": true + }, + "middle": { + "path": "middle/.png", + "variants": 20, + "paletteSwap": true + } + }, + "iconDrawables": ["butt", "middle", "barrel"], + "gunParts": ["butt", "middle", "barrel"], + "palette": "/items/active/starbound/colors/lightningcoil.weaponcolors", + "altAbilities": ["flashlight", "grenadelauncher", "sb_shotgun"] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/1.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/1.png index 73227820..f322d1ca 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/1.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/10.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/10.png index 9f3a3a1d..5e31d66a 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/10.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/11.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/11.png index 14ebfcf1..18d5862b 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/11.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/12.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/12.png index 65c4890d..5e4813f3 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/12.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/13.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/13.png index 09bf4f2e..e9d854e9 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/13.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/14.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/14.png index 045f76c4..c950af2e 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/14.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/15.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/15.png index 9bfc9589..95c2f13c 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/15.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/16.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/16.png index d4d8e97d..32be2cfa 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/16.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/17.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/17.png index 2934015c..a5a717d4 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/17.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/18.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/18.png index 14c0f5b3..02313609 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/18.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/19.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/19.png index 63a629da..a0b26afc 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/19.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/2.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/2.png index 3b1f28c2..4144d2fe 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/2.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/20.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/20.png index 0b57ddd9..1daeaeeb 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/20.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/3.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/3.png index f2262eb2..1862df70 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/3.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/4.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/4.png index fb3f5bd8..81a9ef56 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/4.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/5.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/5.png index 13d2f28a..923a687c 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/5.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/6.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/6.png index 499b9c28..ec65690f 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/6.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/7.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/7.png index 35bddc4b..46fb2f29 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/7.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/8.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/8.png index 6840211d..465fe992 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/8.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/cellzapper/middle/9.png b/items/active/starbound/guns/randomgenerated/cellzapper/middle/9.png index 8b779230..6af9c9a5 100644 Binary files a/items/active/starbound/guns/randomgenerated/cellzapper/middle/9.png and b/items/active/starbound/guns/randomgenerated/cellzapper/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow.activeitem b/items/active/starbound/guns/randomgenerated/crossbow.activeitem deleted file mode 100644 index 2c25b1e1..00000000 --- a/items/active/starbound/guns/randomgenerated/crossbow.activeitem +++ /dev/null @@ -1,91 +0,0 @@ -{ - "itemName": "sb_crossbow", - "maxStack": 1, - "rarity": "uncommon", - "price": 620, - "muzzleOffset": [-0.3, 0.199], - "baseOffset": [-1.55, 0], - "tooltipKind": "sb_gun", - "category": "crossbow", - "twoHanded": true, - "paletteSwaps": "", - "level": 1, - "description": "", - "shortdescription": "Crossbow", - "itemTags": ["weapon", "ranged", "crossbow", "bow", "upgradeableWeapon"], - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": { - "muzzleFlash": "" - }, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/crossbow1.ogg"] - } - }, - - "elementalType": "physical", - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "muzzleFlashVariants": 1, - "projectileType": ["woodenbolt"], - "fireSounds": ["/sfx/gun/crossbow1.ogg", "/sfx/gun/sniper2.ogg", "/sfx/gun/sniper3.ogg", "/sfx/gun/sniper4.ogg"], - "fireTime": [0.6, 1.6], - "baseDps": [5, 5.5], - "energyUsage": [8, 14], - "inaccuracy": 0, - "projectileParameters": { - "knockbackRange": [15, 20] - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.25, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": false, - "allowFlip": false - } - } - }, - - // "builder" : "/items/buildscripts/starbound/buildweapon.lua", - "builderConfig": [{ - "nameGenerator": "crossbownames.config:nameGen", - "animationParts": { - "barrel": { - "path": "crossbow/barrel/.png", - "variants": 3, - "paletteSwap": true - }, - "butt": { - "path": "crossbow/butt/.png", - "variants": 3, - "paletteSwap": true - }, - "middle": { - "path": "crossbow/middle/.png", - "variants": 3, - "paletteSwap": true - } - }, - "palette": "/items/active/starbound/colors/crossbow.weaponcolors", - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"], - "altAbilities": ["sb_burst"] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/crossbow/barrel/1.png b/items/active/starbound/guns/randomgenerated/crossbow/barrel/1.png index 1ec52010..8a5d8ade 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/barrel/1.png and b/items/active/starbound/guns/randomgenerated/crossbow/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/barrel/2.png b/items/active/starbound/guns/randomgenerated/crossbow/barrel/2.png index 75d626f3..0a7fb0e5 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/barrel/2.png and b/items/active/starbound/guns/randomgenerated/crossbow/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/barrel/3.png b/items/active/starbound/guns/randomgenerated/crossbow/barrel/3.png index 55eb816c..a495c820 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/barrel/3.png and b/items/active/starbound/guns/randomgenerated/crossbow/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/butt/1.png b/items/active/starbound/guns/randomgenerated/crossbow/butt/1.png index f841f5cb..7f4c7d62 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/butt/1.png and b/items/active/starbound/guns/randomgenerated/crossbow/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/butt/3.png b/items/active/starbound/guns/randomgenerated/crossbow/butt/3.png index fd41c434..25e3a387 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/butt/3.png and b/items/active/starbound/guns/randomgenerated/crossbow/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/crossbow.activeitem b/items/active/starbound/guns/randomgenerated/crossbow/crossbow.activeitem new file mode 100644 index 00000000..92b5d155 --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/crossbow/crossbow.activeitem @@ -0,0 +1,7 @@ +{ + "itemName": "sb_crossbow", + "sb_definition": "crossbow", + "shortdescription": "Crossbow", + "itemTags": ["weapon", "ranged", "crossbow", "bow", "upgradeableWeapon"], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/crossbownames.config b/items/active/starbound/guns/randomgenerated/crossbow/crossbownames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/crossbownames.config rename to items/active/starbound/guns/randomgenerated/crossbow/crossbownames.config diff --git a/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem b/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem new file mode 100644 index 00000000..a118602a --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/crossbow/crossbowspecial.activeitem @@ -0,0 +1,13 @@ +{ + "itemName": "sb_crossbowspecial", + "sb_definition": "crossbow", + "rarity": "uncommon", + "shortdescription": "Elemental Crossbow", + "itemTags": ["weapon", "ranged", "crossbow", "bow", "upgradeableWeapon"], + "configOverrides": { + "primaryAbility": { + "projectileType": ["woodenbolt", "flamebolt", "icebolt", "poisonbolt", "electricbolt", "explosivebolt"] + } + }, + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/crossbow/crossbowwood.activeitem b/items/active/starbound/guns/randomgenerated/crossbow/crossbowwood.activeitem new file mode 100644 index 00000000..889f36d7 --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/crossbow/crossbowwood.activeitem @@ -0,0 +1,14 @@ +{ + "itemName": "sb_crossbowwood", + "sb_definition": "crossbow", + "rarity": "common", + "shortdescription": "Wooden Crossbow", + "itemTags": ["weapon", "ranged", "crossbow", "bow", "upgradeableWeapon"], + "configOverrides": { + "builderConfig": [{ + "palette": "/items/active/starbound/colors/crossbowwood.weaponcolors" + } + ] + }, + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/crossbow/middle/1.png b/items/active/starbound/guns/randomgenerated/crossbow/middle/1.png index c536a298..0bc77b0c 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/middle/1.png and b/items/active/starbound/guns/randomgenerated/crossbow/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/middle/2.png b/items/active/starbound/guns/randomgenerated/crossbow/middle/2.png index d48b658f..b39e3b51 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/middle/2.png and b/items/active/starbound/guns/randomgenerated/crossbow/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbow/middle/3.png b/items/active/starbound/guns/randomgenerated/crossbow/middle/3.png index 6adeeefe..3d4f76cf 100644 Binary files a/items/active/starbound/guns/randomgenerated/crossbow/middle/3.png and b/items/active/starbound/guns/randomgenerated/crossbow/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/crossbowspecial.activeitem b/items/active/starbound/guns/randomgenerated/crossbowspecial.activeitem deleted file mode 100644 index 88cfaf2a..00000000 --- a/items/active/starbound/guns/randomgenerated/crossbowspecial.activeitem +++ /dev/null @@ -1,86 +0,0 @@ -{ - "itemName": "sb_crossbowspecial", - "maxStack": 1, - "rarity": "uncommon", - "price": 620, - "muzzleOffset": [-0.3, 0.199], - "baseOffset": [-1.55, 0], - "tooltipKind": "sb_gun", - "category": "crossbow", - "twoHanded": true, - "level": 1, - "description": "", - "shortdescription": "Elemental Crossbow", - "itemTags": ["weapon", "ranged", "crossbow", "bow", "upgradeableWeapon"], - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": {}, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/crossbow1.ogg"] - } - }, - - "elementalType": "physical", - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["woodenbolt", "flamebolt", "icebolt", "poisonbolt", "electricbolt", "explosivebolt"], - "fireSounds": ["/sfx/gun/crossbow1.ogg", "/sfx/gun/sniper2.ogg", "/sfx/gun/sniper3.ogg", "/sfx/gun/sniper4.ogg"], - "fireTime": [0.6, 1.6], - "baseDps": [5, 5.5], - "energyUsage": [6, 12], - "inaccuracy": 0, - "projectileParameters": { - "knockbackRange": [15, 20] - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.25, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": false, - "allowFlip": false - } - } - }, - - "builderConfig": [{ - "nameGenerator": "crossbownames.config:nameGen", - "animationParts": { - "barrel": { - "path": "crossbow/barrel/.png", - "variants": 3, - "paletteSwap": true - }, - "butt": { - "path": "crossbow/butt/.png", - "variants": 3, - "paletteSwap": true - }, - "middle": { - "path": "crossbow/middle/.png", - "variants": 3, - "paletteSwap": true - } - }, - "palette": "/items/active/starbound/colors/crossbow.weaponcolors", - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"], - "altAbilities": ["sb_burst"] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/crossbowwood.activeitem b/items/active/starbound/guns/randomgenerated/crossbowwood.activeitem deleted file mode 100644 index 4dd578fa..00000000 --- a/items/active/starbound/guns/randomgenerated/crossbowwood.activeitem +++ /dev/null @@ -1,86 +0,0 @@ -{ - "itemName": "sb_crossbowwood", - "maxStack": 1, - "rarity": "common", - "price": 620, - "muzzleOffset": [-0.3, 0.199], - "baseOffset": [-1.55, 0], - "tooltipKind": "sb_gun", - "category": "crossbow", - "description": "", - "shortdescription": "Wooden Crossbow", - "twoHanded": true, - "level": 1, - "itemTags": ["weapon", "ranged", "crossbow", "bow", "upgradeableWeapon"], - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": {}, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/crossbow1.ogg"] - } - }, - - "elementalType": "physical", - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["woodenbolt"], - "fireSounds": ["/sfx/gun/crossbow1.ogg", "/sfx/gun/sniper2.ogg", "/sfx/gun/sniper3.ogg", "/sfx/gun/sniper4.ogg"], - "fireTime": [0.6, 1.6], - "baseDps": [5, 5.5], - "energyUsage": [6, 12], - "inaccuracy": 0, - "projectileParameters": { - "knockbackRange": [15, 20] - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.25, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": false, - "allowFlip": false - } - } - }, - - "builderConfig": [{ - "nameGenerator": "crossbownames.config:nameGen", - "animationParts": { - "barrel": { - "path": "crossbow/barrel/.png", - "variants": 3, - "paletteSwap": true - }, - "butt": { - "path": "crossbow/butt/.png", - "variants": 3, - "paletteSwap": true - }, - "middle": { - "path": "crossbow/middle/.png", - "variants": 3, - "paletteSwap": true - } - }, - "palette": "/items/active/starbound/colors/crossbowwood.weaponcolors", - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"], - "altAbilities": ["sb_burst"] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/default b/items/active/starbound/guns/randomgenerated/default deleted file mode 100644 index b6bb1583..00000000 Binary files a/items/active/starbound/guns/randomgenerated/default and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/default.frames b/items/active/starbound/guns/randomgenerated/default.frames deleted file mode 100644 index aeaccec3..00000000 --- a/items/active/starbound/guns/randomgenerated/default.frames +++ /dev/null @@ -1 +0,0 @@ -{"frameGrid":{"size":[1,1],"dimensions":[2,2]}} \ No newline at end of file diff --git a/items/active/starbound/guns/randomgenerated/flamethrower.activeitem b/items/active/starbound/guns/randomgenerated/flamethrower.activeitem deleted file mode 100644 index f62677bd..00000000 --- a/items/active/starbound/guns/randomgenerated/flamethrower.activeitem +++ /dev/null @@ -1,91 +0,0 @@ -{ - "itemName": "sb_flamethrower", - "maxStack": 1, - "price": 620, - "rarity": "uncommon", - "muzzleOffset": [0.5, 0.5], - "baseOffset": [-1, 0], - "tooltipKind": "sb_gun", - "category": "uniqueWeapon", - "description": "", - "shortdescription": "Flamethrower", - "paletteSwaps": "", - "twoHanded": true, - "level": 1, - "itemTags": ["weapon", "ranged", "upgradeableWeapon"], - "tooltipFields": { - "subtitle": "Flamethrower" - }, - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": { - "muzzleFlash": "" - }, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/fireblast.ogg", "/sfx/gun/flamethrower_stop.ogg"] - } - }, - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["flamethrower", "icethrower", "lightningthrower", "poisonthrower"], - "projectileParameters": { - "knockbackRange": [0, 0] - }, - "fireTime": [0.03, 0.09], - "baseDps": [6.5, 8.5], - "projectileOffset": [0, 0.5], - "fireMode": "auto", - "energyUsage": [68, 98], - "inaccuracy": 0.08, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": false, - "allowFlip": false - } - } - }, - - "builderConfig": [{ - "nameGenerator": "flamethrowernames.config:nameGen", - "animationParts": { - "barrel": { - "path": "flamethrower/barrel/.png", - "variants": 4, - "paletteSwap": true - }, - "butt": { - "path": "flamethrower/butt/.png", - "variants": 7, - "paletteSwap": true - }, - "middle": { - "path": "flamethrower/middle/.png", - "variants": 4, - "paletteSwap": true - } - }, - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"], - "palette": "/items/active/starbound/colors/lightningcoil.weaponcolors", - "altAbilities": [] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/barrel/1.png b/items/active/starbound/guns/randomgenerated/flamethrower/barrel/1.png index 500b98d0..bd278c46 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/barrel/1.png and b/items/active/starbound/guns/randomgenerated/flamethrower/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/barrel/2.png b/items/active/starbound/guns/randomgenerated/flamethrower/barrel/2.png index 287c7757..65e6eb05 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/barrel/2.png and b/items/active/starbound/guns/randomgenerated/flamethrower/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/barrel/3.png b/items/active/starbound/guns/randomgenerated/flamethrower/barrel/3.png index d40487a0..bc5fcfb5 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/barrel/3.png and b/items/active/starbound/guns/randomgenerated/flamethrower/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/1.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/1.png index d771bf25..94beedf5 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/1.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/2.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/2.png index 1fbbb991..516dd29d 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/2.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/3.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/3.png index 1028714e..6d31f001 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/3.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/4.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/4.png index 1ff2fc12..ba430113 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/4.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/5.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/5.png index a2aa24dc..c9268a7d 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/5.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/6.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/6.png index 7f015399..5cfdfc3b 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/6.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/7.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/7.png index 10c07773..ebc966ec 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/7.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/butt/8.png b/items/active/starbound/guns/randomgenerated/flamethrower/butt/8.png index 1fbbb991..516dd29d 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/butt/8.png and b/items/active/starbound/guns/randomgenerated/flamethrower/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem b/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem new file mode 100644 index 00000000..3fd41b3c --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/flamethrower/flamethrower.activeitem @@ -0,0 +1,95 @@ +{ + "itemName": "sb_flamethrower", + "maxStack": 1, + "price": 620, + "rarity": "uncommon", + "muzzleOffset": [0.5, 0.4], + "baseOffset": [-1, 0], + "tooltipKind": "sb_gun", + "category": "uniqueWeapon", + "description": "", + "shortdescription": "Flamethrower", + "paletteSwaps": "", + "twoHanded": true, + "level": 1, + "itemTags": ["weapon", "ranged", "upgradeableWeapon"], + "tooltipFields": { + "subtitle": "Flamethrower" + }, + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "animationParts": { + "muzzleFlash": "" + }, + "animationCustom": { + "sounds": { + "fire": ["/sfx/gun/fireblast.ogg", "/sfx/gun/flamethrower_stop.ogg"] + } + }, + + "primaryAbilityType": "sb_gun2", + "primaryAbility": { + "projectileType": ["flamethrower", "icethrower", "lightningthrower", "poisonthrower"], + "projectileParameters": { + "knockback": 0 + }, + "fireTime": [0.03, 0.09], + "baseDps": [6.5, 8.5], + "projectileOffset": [0, 0.5], + "energyUsage": [68, 98], + "inaccuracy": 0.08, + "stances": { + "idle": {}, + "fire": {}, + "cooldown": { + "duration": 0 + } + } + }, + + "altAbilityType": "sb_shotgun", + "altAbility": { + "name": "Wide Spray", + "baseDamage": 2, + "projectileCount": 6, + "fireTime": 0.06, + "energyUsage": 200, + "projectileParameters": { + "knockback": 2 + }, + "projectileOffset": [0, 0.5], + "stances": { + "idle": {}, + "fire": {}, + "cooldown": { + "duration": 0 + } + } + }, + + "builderConfig": [{ + "nameGenerator": "flamethrowernames.config:nameGen", + "animationParts": { + "barrel": { + "path": "barrel/.png", + "variants": 4, + "paletteSwap": true + }, + "butt": { + "path": "butt/.png", + "variants": 7, + "paletteSwap": true + }, + "middle": { + "path": "middle/.png", + "variants": 4, + "paletteSwap": true + } + }, + "iconDrawables": ["butt", "middle", "barrel"], + "gunParts": ["butt", "middle", "barrel"], + "palette": "/items/active/starbound/colors/lightningcoil.weaponcolors" + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/flamethrowernames.config b/items/active/starbound/guns/randomgenerated/flamethrower/flamethrowernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/flamethrowernames.config rename to items/active/starbound/guns/randomgenerated/flamethrower/flamethrowernames.config diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/middle/1.png b/items/active/starbound/guns/randomgenerated/flamethrower/middle/1.png index 2b591b31..584985be 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/middle/1.png and b/items/active/starbound/guns/randomgenerated/flamethrower/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/flamethrower/middle/2.png b/items/active/starbound/guns/randomgenerated/flamethrower/middle/2.png index a3e9ed84..8af11849 100644 Binary files a/items/active/starbound/guns/randomgenerated/flamethrower/middle/2.png and b/items/active/starbound/guns/randomgenerated/flamethrower/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/floranagrenadelauncher.activeitem b/items/active/starbound/guns/randomgenerated/floranagrenadelauncher.activeitem deleted file mode 100644 index c2c0e2dc..00000000 --- a/items/active/starbound/guns/randomgenerated/floranagrenadelauncher.activeitem +++ /dev/null @@ -1,119 +0,0 @@ -{ - "itemName": "sb_florangrenadelauncher", - "maxStack": 1, - "rarity": "common", - "muzzleOffset": [0, 0], - "baseOffset": [-0.375, 0.375], - "tooltipKind": "sb_gun", - "category": "grenadeLauncher", - "twoHanded": true, - "price": 620, - "level": 1, - "description": "", - "shortdescription": "Toxic Launcher", - "itemTags": ["weapon", "ranged", "floran", "grenadelauncher", "upgradeableWeapon"], - "tooltipFields": { - "subtitle": "Toxic Launcher" - }, - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": { - "muzzleFlash": "/animations/muzzleflash/smokemuzzle/smokemuzzle.png" - }, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/grenade1.ogg"] - } - }, - - "elementalType": "poison", - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["acidgrenade"], - "fireTime": [0.5, 2], - "baseDps": [5, 6.5], - "energyUsage": [22.5, 25.5], - "inaccuracy": 0, - "projectileParameters": { - "knockbackRange": [10, 30] - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.25, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": false, - "allowFlip": false - } - } - }, - - "altAbility": { - "name": "Poison Spray", - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.11, - "recoil": true, - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - } - }, - "projectileCount": 4, - "fireTime": 1.5, - "baseDps": 7.5, - "energyUsage": 82, - "inaccuracy": 0.13, - "fireType": "auto", - "projectileType": "poisonthrower" - }, - - "builderConfig": [{ - "nameGenerator": "floranglaunchernames.config:nameGen", - "animationParts": { - "barrel": { - "path": "florangrenadelauncher/barrel/.png", - "variants": 2 - }, - "butt": { - "path": "florangrenadelauncher/butt/.png", - "variants": 2 //3 is wack - }, - "middle": { - "path": "florangrenadelauncher/middle/.png", - "variants": 2 - } - }, - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/barrel/1.png b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/barrel/1.png index 03c86e9a..6713f5aa 100644 Binary files a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/barrel/1.png and b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/1.png b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/1.png index b7a29c06..e781ecdc 100644 Binary files a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/1.png and b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/3.png b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/3.png index fa8716e3..f00fac05 100644 Binary files a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/3.png and b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/florangrenadelauncher/floranagrenadelauncher.activeitem b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/floranagrenadelauncher.activeitem new file mode 100644 index 00000000..61ec664c --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/floranagrenadelauncher.activeitem @@ -0,0 +1,110 @@ +{ + "itemName": "sb_florangrenadelauncher", + "maxStack": 1, + "rarity": "common", + "muzzleOffset": [0, 0.25], + "baseOffset": [-0.375, 0.375], + "tooltipKind": "sb_gun", + "category": "grenadeLauncher", + "twoHanded": true, + "price": 620, + "level": 1, + "description": "", + "shortdescription": "Toxic Launcher", + "itemTags": ["weapon", "ranged", "floran", "grenadelauncher", "upgradeableWeapon"], + "tooltipFields": { + "subtitle": "Toxic Launcher" + }, + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "animationParts": { + "muzzleFlash": "" + }, + "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 2, + "particles": [{ + "particle": "poisondust" + },{ + "particle": "poisonsicknessdust2" + },{ + "particle": "poisonswoosh1" + } + ] + } + }, + "sounds": { + "fire": ["/sfx/gun/grenade1.ogg"] + } + }, + + "elementalType": "poison", + "primaryAbilityType": "sb_gun2", + "primaryAbility": { + "projectileType": ["acidgrenade"], + "fireTime": [0.5, 2], + "baseDps": [5, 6.5], + "energyUsage": [22.5, 25.5], + "inaccuracy": 0, + "projectileParameters": { + "knockbackRange": [10, 30] + } + }, + + "altAbility": { + "name": "Poison Spray", + "scripts": ["/items/active/weapons/ranged/gunfire.lua"], + "class": "GunFire", + "stances": { + "idle": { + "armRotation": 0, + "weaponRotation": 0, + "twoHanded": true, + + "allowRotate": true, + "allowFlip": true + }, + "fire": {}, + "cooldown": { + "duration": 0.11, + "recoil": true, + "armRotation": 0, + "weaponRotation": 0, + "twoHanded": true, + + "allowRotate": true, + "allowFlip": true + } + }, + "projectileCount": 4, + "fireTime": 1.5, + "baseDps": 7.5, + "energyUsage": 82, + "inaccuracy": 0.13, + "fireType": "auto", + "projectileType": "poisonthrower" + }, + + "builderConfig": [{ + "nameGenerator": "floranglaunchernames.config:nameGen", + "animationParts": { + "barrel": { + "path": "barrel/.png", + "variants": 2 + }, + "butt": { + "path": "butt/.png", + "variants": 2 //3 is wack + }, + "middle": { + "path": "middle/.png", + "variants": 2 + } + }, + "iconDrawables": ["butt", "middle", "barrel"], + "gunParts": ["butt", "middle", "barrel"] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/floranglaunchernames.config b/items/active/starbound/guns/randomgenerated/florangrenadelauncher/floranglaunchernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/floranglaunchernames.config rename to items/active/starbound/guns/randomgenerated/florangrenadelauncher/floranglaunchernames.config diff --git a/items/active/starbound/guns/randomgenerated/globelauncher.activeitem b/items/active/starbound/guns/randomgenerated/globelauncher.activeitem deleted file mode 100644 index 17ed4d6e..00000000 --- a/items/active/starbound/guns/randomgenerated/globelauncher.activeitem +++ /dev/null @@ -1,93 +0,0 @@ -{ - "itemName": "sb_globelauncher", - "maxStack": 1, - "rarity": "uncommon", - "muzzleOffset": [0, 0], - "baseOffset": [-1.25, 0.05], - "tooltipKind": "sb_gun", - "category": "sniperRifle", - "tooltipFields": { - "subtitle": "Globe Launcher" - }, - "twoHanded": true, - "price": 620, - "paletteSwaps": "", - "level": 1, - "description": "", - "shortdescription": "Globe Launcher", - "itemTags": ["weapon", "ranged", "globelauncher", "upgradeableWeapon"], - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "animationParts": { - "muzzleFlash": "/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png" - }, - "animationCustom": { - "sounds": { - "fire": ["/sfx/gun/plasma_mp2.ogg", "/sfx/gun/plasma_mp3.ogg"] - } - }, - - "elementalType": "physical", - - "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["whiteglobe", "redglobe", "yellowglobe", "blueglobe", "greenglobe", "orangeglobe", "magentaglobe"], - // "baseDamage" : 16, - "fireTime": [0.3, 1], - "projectileCount": 1, - "baseDps": [5.5, 6.5], - "energyUsage": [22.5, 25.5], - "inaccuracy": 0.02, - "projectileParameters": { - "knockbackRange": [20, 30] - }, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.25, - "armRotation": 5, - "weaponRotation": 5, - "twoHanded": true, - - "allowRotate": false, - "allowFlip": false - } - } - }, - - "builderConfig": [{ - "nameGenerator": "globelaunchernames.config:nameGen", - "animationParts": { - "barrel": { - "path": "globelauncher/barrel/.png", - "variants": 20, - "paletteSwap": true - }, - "butt": { - "path": "globelauncher/butt/.png", - "variants": 20, - "paletteSwap": true - }, - "middle": { - "path": "globelauncher/middle/.png", - "variants": 20, - "paletteSwap": true - } - }, - "iconDrawables": ["butt", "middle", "barrel"], - "gunParts": ["butt", "middle", "barrel"], - "palette": "/items/active/starbound/colors/sniperrifle.weaponcolors", - "altAbilities": ["sb_shotgun", "flashlight", "grenadelauncher"] - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/1.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/1.png index 8adf06a5..04623039 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/1.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/10.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/10.png index b3e1abdb..d388bf95 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/10.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/11.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/11.png index 5f92de52..380b3095 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/11.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/13.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/13.png index b5466e80..ff7e6957 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/13.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/14.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/14.png index c1039584..9b3cb712 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/14.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/15.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/15.png index bed6d8e9..48f55441 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/15.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/16.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/16.png index 8ee22c66..f386305a 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/16.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/17.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/17.png index 71cb5c6c..67f2f347 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/17.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/2.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/2.png index 0ff0c808..ae13fe4e 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/2.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/20.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/20.png index 3184d75e..38d586e9 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/20.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/3.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/3.png index 8ccd4922..e796b236 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/3.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/4.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/4.png index 8e5b1010..ca787217 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/4.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/5.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/5.png index 7646f183..eca88970 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/5.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/6.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/6.png index 291bed80..b220cd1f 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/6.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/8.png b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/8.png index 92c10a8c..94297c5f 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/barrel/8.png and b/items/active/starbound/guns/randomgenerated/globelauncher/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/10.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/10.png index be16e92b..87136a72 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/10.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/11.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/11.png index 61f7e0bc..86fe22da 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/11.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/13.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/13.png index c08b7d03..95714fdc 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/13.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/15.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/15.png index 31ea832e..d97d04f0 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/15.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/16.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/16.png index 81dd73f2..35883952 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/16.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/17.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/17.png index c47c360a..970d6bfe 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/17.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/18.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/18.png index ebc6d569..345e7631 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/18.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/19.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/19.png index 36ef7734..19856334 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/19.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/2.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/2.png index 2c5d0259..ef2bf5af 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/2.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/20.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/20.png index 3152e1d1..312c892d 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/20.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/3.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/3.png index 0b2968a6..1d613f57 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/3.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/4.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/4.png index 4dab9fa8..8f652735 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/4.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/5.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/5.png index 974f6fb0..bb1314c3 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/5.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/6.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/6.png index 304f6866..6c505a11 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/6.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/7.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/7.png index 4da822fa..240d271a 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/7.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/8.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/8.png index fcc99fde..e65f1a6a 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/8.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/butt/9.png b/items/active/starbound/guns/randomgenerated/globelauncher/butt/9.png index 3857de8d..dc4bb33b 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/butt/9.png and b/items/active/starbound/guns/randomgenerated/globelauncher/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/globelauncher.activeitem b/items/active/starbound/guns/randomgenerated/globelauncher/globelauncher.activeitem new file mode 100644 index 00000000..e9a3fc64 --- /dev/null +++ b/items/active/starbound/guns/randomgenerated/globelauncher/globelauncher.activeitem @@ -0,0 +1,69 @@ +{ + "itemName": "sb_globelauncher", + "maxStack": 1, + "rarity": "uncommon", + "muzzleOffset": [0, 0.25], + "baseOffset": [-1.25, 0.15], + "tooltipKind": "sb_gun", + "category": "sniperRifle", + "tooltipFields": { + "subtitle": "Globe Launcher" + }, + "twoHanded": true, + "price": 620, + "paletteSwaps": "", + "level": 1, + "description": "", + "shortdescription": "Globe Launcher", + "itemTags": ["weapon", "ranged", "globelauncher", "upgradeableWeapon"], + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "animationParts": { + "muzzleFlash": "/animations/sb/muzzleflash/plasmamuzzle3/plasmamuzzle3.png" + }, + "animationCustom": { + "sounds": { + "fire": ["/sfx/gun/plasma_mp2.ogg", "/sfx/gun/plasma_mp3.ogg"] + } + }, + + "elementalType": "physical", + "primaryAbilityType": "sb_gun2", + "primaryAbility": { + "projectileType": ["whiteglobe", "redglobe", "yellowglobe", "blueglobe", "greenglobe", "orangeglobe", "magentaglobe"], + "fireTime": [0.3, 1], + "baseDps": [5.5, 6.5], + "energyUsage": [22.5, 25.5], + "inaccuracy": 0.02, + "projectileParameters": { + "knockbackRange": [20, 30] + } + }, + + "builderConfig": [{ + "nameGenerator": "globelaunchernames.config:nameGen", + "animationParts": { + "barrel": { + "path": "barrel/.png", + "variants": 20, + "paletteSwap": true + }, + "butt": { + "path": "butt/.png", + "variants": 20, + "paletteSwap": true + }, + "middle": { + "path": "middle/.png", + "variants": 20, + "paletteSwap": true + } + }, + "iconDrawables": ["butt", "middle", "barrel"], + "gunParts": ["butt", "middle", "barrel"], + "palette": "/items/active/starbound/colors/sniperrifle.weaponcolors", + "altAbilities": ["sb_shotgun", "flashlight", "grenadelauncher"] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/randomgenerated/globelaunchernames.config b/items/active/starbound/guns/randomgenerated/globelauncher/globelaunchernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/globelaunchernames.config rename to items/active/starbound/guns/randomgenerated/globelauncher/globelaunchernames.config diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/1.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/1.png index 2e15613c..775f8f32 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/1.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/10.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/10.png index 986eaf22..8e46d609 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/10.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/12.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/12.png index 8e52c205..2245998e 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/12.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/13.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/13.png index 2685911d..0133013c 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/13.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/14.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/14.png index bc3d7b96..fd85c9b4 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/14.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/15.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/15.png index 29a8ffb2..cc8b66f7 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/15.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/16.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/16.png index e24da8cb..3947950a 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/16.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/17.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/17.png index 89050965..5ff01465 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/17.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/18.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/18.png index aaa1e1ad..2d6e7cfc 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/18.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/19.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/19.png index 92f96380..b196904e 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/19.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/2.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/2.png index 634a75f5..4bd46079 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/2.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/20.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/20.png index 3a7704f7..93f91829 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/20.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/3.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/3.png index b801bb26..727dc0d3 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/3.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/4.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/4.png index 15d515ae..a4059482 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/4.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/5.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/5.png index b8b09cfd..c03b2e6c 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/5.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/6.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/6.png index 398b3a2f..16233f1c 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/6.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/7.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/7.png index 05b572c2..2c815280 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/7.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/8.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/8.png index dfa16ab7..fce7357a 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/8.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/globelauncher/middle/9.png b/items/active/starbound/guns/randomgenerated/globelauncher/middle/9.png index 0878ed1a..54dd22af 100644 Binary files a/items/active/starbound/guns/randomgenerated/globelauncher/middle/9.png and b/items/active/starbound/guns/randomgenerated/globelauncher/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/1.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/1.png index c07a47a9..9e35c607 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/1.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/10.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/10.png index 6f7dd983..8a446e08 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/10.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/11.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/11.png index 4ea7bd44..15cbab60 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/11.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/12.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/12.png index 1579309b..3031d9a2 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/12.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/13.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/13.png index 08fc1106..958f47e0 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/13.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/14.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/14.png index 6caa3b3a..092354b0 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/14.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/15.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/15.png index 94a3f232..dafff687 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/15.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/16.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/16.png index 2046c809..769f9763 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/16.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/17.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/17.png index b422737e..b3c586fb 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/17.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/18.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/18.png index 12e95f25..9b12ca94 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/18.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/19.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/19.png index 8c698c45..01fc0ec1 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/19.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/2.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/2.png index b1de3ff8..cbc32db5 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/2.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/20.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/20.png index c4e18eae..febebb37 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/20.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/3.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/3.png index 72443dff..3b787397 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/3.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/4.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/4.png index 99aff8d3..3d5c5162 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/4.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/5.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/5.png index c781a215..9dc83b8b 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/5.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/6.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/6.png index 5032676c..e61d9e1c 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/6.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/7.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/7.png index 86ced9a1..f3716e34 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/7.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/8.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/8.png index c4aa01ee..0b266bfd 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/8.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/9.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/9.png index 76345874..0b13fded 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/9.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/10.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/10.png index be16e92b..87136a72 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/10.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/11.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/11.png index 61f7e0bc..86fe22da 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/11.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/13.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/13.png index c08b7d03..95714fdc 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/13.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/15.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/15.png index 31ea832e..d97d04f0 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/15.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/16.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/16.png index 81dd73f2..35883952 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/16.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/17.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/17.png index c47c360a..970d6bfe 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/17.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/18.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/18.png index ebc6d569..345e7631 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/18.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/19.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/19.png index 36ef7734..19856334 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/19.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/2.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/2.png index 2c5d0259..ef2bf5af 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/2.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/20.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/20.png index 3152e1d1..312c892d 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/20.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/3.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/3.png index 0b2968a6..1d613f57 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/3.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/4.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/4.png index 4dab9fa8..8f652735 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/4.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/5.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/5.png index 974f6fb0..bb1314c3 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/5.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/6.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/6.png index 304f6866..6c505a11 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/6.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/7.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/7.png index 4da822fa..240d271a 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/7.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/8.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/8.png index fcc99fde..e65f1a6a 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/8.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/9.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/9.png index 3857de8d..dc4bb33b 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/9.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/commongrenadelauncher.activeitem b/items/active/starbound/guns/randomgenerated/grenadelauncher/commongrenadelauncher.activeitem similarity index 83% rename from items/active/starbound/guns/randomgenerated/commongrenadelauncher.activeitem rename to items/active/starbound/guns/randomgenerated/grenadelauncher/commongrenadelauncher.activeitem index 92548cd7..032efdfa 100644 --- a/items/active/starbound/guns/randomgenerated/commongrenadelauncher.activeitem +++ b/items/active/starbound/guns/randomgenerated/grenadelauncher/commongrenadelauncher.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_commongrenadelauncher", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "grenadeLauncher", "twoHanded": false, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "For when your grenades need some distance.", "shortdescription": "Common Grenade Launcher", "itemTags": ["weapon", "ranged", "grenadelauncher", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -19,6 +19,15 @@ "muzzleFlash": "/animations/muzzleflash/smokemuzzle/smokemuzzle.png" }, "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 3, + "particles": [{ + "particle": "rocketbarrelpuff" + } + ] + } + }, "sounds": { "fire": ["/sfx/gun/grenade1.ogg"] } @@ -64,17 +73,17 @@ "nameGenerator": "glaunchernames.config:nameGen", "animationParts": { "barrel": { - "path": "grenadelauncher/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "grenadelauncher/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "grenadelauncher/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/glaunchernames.config b/items/active/starbound/guns/randomgenerated/grenadelauncher/glaunchernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/glaunchernames.config rename to items/active/starbound/guns/randomgenerated/grenadelauncher/glaunchernames.config diff --git a/items/active/starbound/guns/randomgenerated/legendarygrenadelauncher.activeitem b/items/active/starbound/guns/randomgenerated/grenadelauncher/legendarygrenadelauncher.activeitem similarity index 83% rename from items/active/starbound/guns/randomgenerated/legendarygrenadelauncher.activeitem rename to items/active/starbound/guns/randomgenerated/grenadelauncher/legendarygrenadelauncher.activeitem index 96854e6f..38efe06e 100644 --- a/items/active/starbound/guns/randomgenerated/legendarygrenadelauncher.activeitem +++ b/items/active/starbound/guns/randomgenerated/grenadelauncher/legendarygrenadelauncher.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_legendarygrenadelauncher", "maxStack": 1, "rarity": "legendary", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "grenadeLauncher", "twoHanded": false, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "For when your grenades need some distance.", "shortdescription": "Legendary Grenade Launcher", "itemTags": ["weapon", "ranged", "grenadelauncher", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -19,6 +19,15 @@ "muzzleFlash": "/animations/muzzleflash/smokemuzzle/smokemuzzle.png" }, "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 3, + "particles": [{ + "particle": "rocketbarrelpuff" + } + ] + } + }, "sounds": { "fire": ["/sfx/gun/grenade1.ogg"] } @@ -62,17 +71,17 @@ "nameGenerator": "glaunchernames.config:nameGen", "animationParts": { "barrel": { - "path": "grenadelauncher/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "grenadelauncher/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "grenadelauncher/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/1.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/1.png index 2e15613c..775f8f32 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/1.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/10.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/10.png index 986eaf22..8e46d609 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/10.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/12.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/12.png index 8e52c205..2245998e 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/12.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/13.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/13.png index 2685911d..0133013c 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/13.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/14.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/14.png index bc3d7b96..fd85c9b4 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/14.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/15.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/15.png index 29a8ffb2..cc8b66f7 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/15.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/16.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/16.png index e24da8cb..3947950a 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/16.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/17.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/17.png index 89050965..5ff01465 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/17.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/18.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/18.png index aaa1e1ad..2d6e7cfc 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/18.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/19.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/19.png index 92f96380..b196904e 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/19.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/2.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/2.png index 634a75f5..4bd46079 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/2.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/20.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/20.png index 3a7704f7..93f91829 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/20.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/3.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/3.png index b801bb26..727dc0d3 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/3.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/4.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/4.png index 15d515ae..a4059482 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/4.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/5.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/5.png index b8b09cfd..c03b2e6c 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/5.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/6.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/6.png index 398b3a2f..16233f1c 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/6.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/7.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/7.png index 05b572c2..2c815280 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/7.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/8.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/8.png index dfa16ab7..fce7357a 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/8.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/9.png b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/9.png index 0878ed1a..54dd22af 100644 Binary files a/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/9.png and b/items/active/starbound/guns/randomgenerated/grenadelauncher/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/raregrenadelauncher.activeitem b/items/active/starbound/guns/randomgenerated/grenadelauncher/raregrenadelauncher.activeitem similarity index 83% rename from items/active/starbound/guns/randomgenerated/raregrenadelauncher.activeitem rename to items/active/starbound/guns/randomgenerated/grenadelauncher/raregrenadelauncher.activeitem index 8547786d..40d5e6ea 100644 --- a/items/active/starbound/guns/randomgenerated/raregrenadelauncher.activeitem +++ b/items/active/starbound/guns/randomgenerated/grenadelauncher/raregrenadelauncher.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_raregrenadelauncher", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "grenadeLauncher", "twoHanded": false, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "For when your grenades need some distance.", "shortdescription": "Rare Grenade Launcher", "itemTags": ["weapon", "ranged", "grenadelauncher", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -19,6 +19,15 @@ "muzzleFlash": "/animations/muzzleflash/smokemuzzle/smokemuzzle.png" }, "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 3, + "particles": [{ + "particle": "rocketbarrelpuff" + } + ] + } + }, "sounds": { "fire": ["/sfx/gun/grenade2.ogg"] } @@ -62,17 +71,17 @@ "nameGenerator": "glaunchernames.config:nameGen", "animationParts": { "barrel": { - "path": "grenadelauncher/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "grenadelauncher/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "grenadelauncher/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/uncommongrenadelauncher.activeitem b/items/active/starbound/guns/randomgenerated/grenadelauncher/uncommongrenadelauncher.activeitem similarity index 83% rename from items/active/starbound/guns/randomgenerated/uncommongrenadelauncher.activeitem rename to items/active/starbound/guns/randomgenerated/grenadelauncher/uncommongrenadelauncher.activeitem index a601b835..df8b2832 100644 --- a/items/active/starbound/guns/randomgenerated/uncommongrenadelauncher.activeitem +++ b/items/active/starbound/guns/randomgenerated/grenadelauncher/uncommongrenadelauncher.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_uncommongrenadelauncher", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "grenadeLauncher", "twoHanded": false, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "For when your grenades need some distance.", "shortdescription": "Uncommon Grenade Launcher", "itemTags": ["weapon", "ranged", "grenadelauncher", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -19,6 +19,15 @@ "muzzleFlash": "/animations/muzzleflash/smokemuzzle/smokemuzzle.png" }, "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 3, + "particles": [{ + "particle": "rocketbarrelpuff" + } + ] + } + }, "sounds": { "fire": ["/sfx/gun/grenade1.ogg"] } @@ -62,17 +71,17 @@ "nameGenerator": "glaunchernames.config:nameGen", "animationParts": { "barrel": { - "path": "grenadelauncher/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "grenadelauncher/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "grenadelauncher/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/gun.animation b/items/active/starbound/guns/randomgenerated/gun.animation index fe9a47b3..ec5003e9 100644 --- a/items/active/starbound/guns/randomgenerated/gun.animation +++ b/items/active/starbound/guns/randomgenerated/gun.animation @@ -1,64 +1,64 @@ { - "globalTagDefaults" : { - "paletteSwaps" : "" + "globalTagDefaults": { + "paletteSwaps": "" }, - "animatedParts" : { - "stateTypes" : { - "firing" : { - "default" : "off", - "states" : { - "off" : {}, - "fire" : { - "frames" : 2, - "cycle" : 0.07, - "mode" : "transition", - "transition" : "off" + "animatedParts": { + "stateTypes": { + "firing": { + "default": "off", + "states": { + "off": {}, + "fire": { + "frames": 2, + "cycle": 0.07, + "mode": "transition", + "transition": "off" } } } }, - "parts" : { - "butt" : { - "properties" : { - "centered" : true, - "image" : "", - "offset" : [0, 0], - "transformationGroups" : ["weapon"] + "parts": { + "butt": { + "properties": { + "centered": true, + "image": "", + "offset": [0, 0], + "transformationGroups": ["weapon"] } }, - "middle" : { - "properties" : { - "centered" : true, - "image" : "", - "offset" : [0, 0], - "transformationGroups" : ["weapon"] + "middle": { + "properties": { + "centered": true, + "image": "", + "offset": [0, 0], + "transformationGroups": ["weapon"] } }, - "barrel" : { - "properties" : { - "centered" : true, - "image" : "", - "offset" : [0, 0], - "transformationGroups" : ["weapon"] + "barrel": { + "properties": { + "centered": true, + "image": "", + "offset": [0, 0], + "transformationGroups": ["weapon"] } }, - "muzzleFlash" : { - "properties" : { - "zLevel" : -1, - "centered" : true, - "offset" : [0.75, 0], - "fullbright" : true, - "image" : "", - "transformationGroups" : ["muzzle"] + "muzzleFlash": { + "properties": { + "zLevel": -1, + "centered": true, + "offset": [0.75, 0], + "fullbright": true, + "image": "", + "transformationGroups": ["muzzle"] }, - "partStates" : { - "firing" : { - "fire" : { - "properties" : { - "image" : ":" + "partStates": { + "firing": { + "fire": { + "properties": { + "image": ":" } } } @@ -67,35 +67,35 @@ } }, - "rotationGroups" : { - "weapon" : { - "angularVelocity" : 0 + "rotationGroups": { + "weapon": { + "angularVelocity": 0 } }, - "transformationGroups" : { - "weapon" : {}, - "muzzle" : {} + "transformationGroups": { + "weapon": {}, + "muzzle": {} }, - "particleEmitters" : { - "muzzleFlash" : { - "transformationGroups" : ["muzzle"], - "offsetRegion" : [0, 0, 0, 0], - "particles" : [ ] + "particleEmitters": { + "muzzleFlash": { + "transformationGroups": ["muzzle"], + "offsetRegion": [0, 0, 0, 0], + "particles": [] } }, - "lights" : { - "muzzleFlash" : { - "active" : false, - "position" : [0, 0], - "color" : [90, 90, 0] + "lights": { + "muzzleFlash": { + "active": false, + "position": [0, 0], + "color": [90, 90, 0] } }, - "sounds" : { - "fire" : [], - "fail" : [] + "sounds": { + "fire": [], + "fail": [] } -} \ No newline at end of file +} diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/3.png b/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/3.png index aeabc0aa..57e8dd9a 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/3.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/5.png b/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/5.png index fec87471..596d2f3b 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/5.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/1.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/1.png index d771bf25..94beedf5 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/1.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/2.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/2.png index 1fbbb991..516dd29d 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/2.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/3.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/3.png index 1028714e..6d31f001 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/3.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/4.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/4.png index 1ff2fc12..ba430113 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/4.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/5.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/5.png index a2aa24dc..c9268a7d 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/5.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/6.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/6.png index 7f015399..5cfdfc3b 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/6.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/7.png b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/7.png index 10c07773..ebc966ec 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/butt/7.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil.activeitem b/items/active/starbound/guns/randomgenerated/lightningcoil/lightningcoil.activeitem similarity index 93% rename from items/active/starbound/guns/randomgenerated/lightningcoil.activeitem rename to items/active/starbound/guns/randomgenerated/lightningcoil/lightningcoil.activeitem index 24f6aac4..078c019f 100644 --- a/items/active/starbound/guns/randomgenerated/lightningcoil.activeitem +++ b/items/active/starbound/guns/randomgenerated/lightningcoil/lightningcoil.activeitem @@ -69,17 +69,17 @@ "nameGenerator": "lightningcoilnames.config:nameGen", "animationParts": { "barrel": { - "path": "lightningcoil/barrel/.png", + "path": "barrel/.png", "variants": 5, "paletteSwap": true }, "butt": { - "path": "lightningcoil/butt/.png", + "path": "butt/.png", "variants": 7, "paletteSwap": true }, "middle": { - "path": "lightningcoil/middle/.png", + "path": "middle/.png", "variants": 5, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/lightningcoilnames.config b/items/active/starbound/guns/randomgenerated/lightningcoil/lightningcoilnames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/lightningcoilnames.config rename to items/active/starbound/guns/randomgenerated/lightningcoil/lightningcoilnames.config diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/middle/1.png b/items/active/starbound/guns/randomgenerated/lightningcoil/middle/1.png index 2b591b31..584985be 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/middle/1.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/middle/2.png b/items/active/starbound/guns/randomgenerated/lightningcoil/middle/2.png index a3e9ed84..8af11849 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/middle/2.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/lightningcoil/middle/5.png b/items/active/starbound/guns/randomgenerated/lightningcoil/middle/5.png index ed4532a9..5c1fad25 100644 Binary files a/items/active/starbound/guns/randomgenerated/lightningcoil/middle/5.png and b/items/active/starbound/guns/randomgenerated/lightningcoil/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/1.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/1.png index e5c0f06d..f595dccd 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/1.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/10.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/10.png index 6d538a16..7f02659d 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/10.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/11.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/11.png index 66263a9e..089b0bd1 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/11.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/12.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/12.png index f575133c..02d4f740 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/12.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/13.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/13.png index ba4a7819..49600d70 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/13.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/14.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/14.png index 623b0510..02371e38 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/14.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/15.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/15.png index 76917af2..4047057d 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/15.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/16.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/16.png index a5eb38cb..0dd66de0 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/16.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/17.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/17.png index c8d0449b..0e59e7d4 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/17.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/18.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/18.png index 4767db96..200bb7f1 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/18.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/19.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/19.png index 1bd22492..571b1055 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/19.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/2.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/2.png index e768b480..409ad51d 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/2.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/20.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/20.png index c56a35ad..5539ba73 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/20.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/3.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/3.png index 3ae0d4ca..6d7ed216 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/3.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/4.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/4.png index 1981238f..5a0002f0 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/4.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/5.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/5.png index 6d4d533d..f8439a82 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/5.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/6.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/6.png index 915d699f..cb576dac 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/6.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/7.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/7.png index 3d2037aa..a90bf5b3 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/7.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/8.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/8.png index bfa69955..db0ac012 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/8.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/9.png b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/9.png index 97e52ef3..b8e2f655 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/barrel/9.png and b/items/active/starbound/guns/randomgenerated/machinepistol/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/10.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/10.png index dec8f15d..b9659dda 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/10.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/12.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/12.png index b2906128..ae155ffc 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/12.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/13.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/13.png index fb0f5603..19a2454d 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/13.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/14.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/14.png index 9ae09f91..609dfd6e 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/14.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/15.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/15.png index 6bf94f6c..40bf0100 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/15.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/18.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/18.png index 2a75f6df..0c2df54c 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/18.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/19.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/19.png index 4c4b047c..3b206a92 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/19.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/20.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/20.png index 824fa2b6..02c87677 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/20.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/3.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/3.png index 9c98efb5..41e5b84a 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/3.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/5.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/5.png index 584096eb..e714e593 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/5.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/6.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/6.png index 44b295b9..940a4b1b 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/6.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/7.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/7.png index 92a5fdc5..f24a0668 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/7.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/butt/8.png b/items/active/starbound/guns/randomgenerated/machinepistol/butt/8.png index d34fd493..434e73a5 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/butt/8.png and b/items/active/starbound/guns/randomgenerated/machinepistol/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/commonmachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem similarity index 87% rename from items/active/starbound/guns/randomgenerated/commonmachinepistol.activeitem rename to items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem index f1713f1e..b94a5b4d 100644 --- a/items/active/starbound/guns/randomgenerated/commonmachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem @@ -4,17 +4,14 @@ "rarity": "common", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", "price": 620, - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, "paletteSwaps": "", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small fully automatic pistol.", "shortdescription": "Common Machine Pistol", - "tooltipFields": { - "subtitle": "Machine Pistol" - }, "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", @@ -64,17 +61,17 @@ "nameGenerator": "mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "machinepistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "machinepistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "machinepistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/commonplasmamachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/commonplasmamachinepistol.activeitem rename to items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem index a48e46cc..3552dbcf 100644 --- a/items/active/starbound/guns/randomgenerated/commonplasmamachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem @@ -4,12 +4,12 @@ "rarity": "common", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, "paletteSwaps": "", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small fully automatic plasma pistol.", "shortdescription": "Common Plasma Machine Pistol", "price": 620, "tooltipFields": { @@ -64,17 +64,17 @@ "nameGenerator": "mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "machinepistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "machinepistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "machinepistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/legendarymachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem similarity index 87% rename from items/active/starbound/guns/randomgenerated/legendarymachinepistol.activeitem rename to items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem index ee4c3853..a878be0a 100644 --- a/items/active/starbound/guns/randomgenerated/legendarymachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem @@ -4,17 +4,14 @@ "rarity": "legendary", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", - "category": "pistol", - "description": "", + "category": "machinePistol", + "tooltipKind": "sb_gun2", + "description": "A small fully automatic pistol.", "paletteSwaps": "", "shortdescription": "Legendary Machine Pistol", "price": 620, "twoHanded": false, "level": 1, - "tooltipFields": { - "subtitle": "Machine Pistol" - }, "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", @@ -64,17 +61,17 @@ "nameGenerator": "mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "machinepistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "machinepistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "machinepistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/1.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/1.png index 78478a92..224ed192 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/1.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/10.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/10.png index 5f06c8a1..48fd8d00 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/10.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/11.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/11.png index 3fbcfe83..e132580f 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/11.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/12.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/12.png index ed6b04a8..16ea9115 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/12.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/13.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/13.png index 70090f67..add84cde 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/13.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/14.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/14.png index f8ab17d9..bc0db1c3 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/14.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/15.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/15.png index 32f4eafe..008a2989 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/15.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/16.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/16.png index bd0e7d9b..bc41d4eb 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/16.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/17.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/17.png index 1bd511bf..f403f114 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/17.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/18.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/18.png index ba8fc3b1..c6b44e30 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/18.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/19.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/19.png index f901d1b5..db25bf02 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/19.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/2.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/2.png index 493cc400..0e128682 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/2.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/20.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/20.png index 83774031..07145eab 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/20.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/3.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/3.png index be582683..21ca1f03 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/3.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/4.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/4.png index d1953921..b0e5576e 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/4.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/5.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/5.png index ea6e7130..2a61d994 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/5.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/6.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/6.png index 1c821a7b..b009b383 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/6.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/7.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/7.png index 0765942e..48ac6e0b 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/7.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/8.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/8.png index 349b877d..8031e23b 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/8.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/middle/9.png b/items/active/starbound/guns/randomgenerated/machinepistol/middle/9.png index b0c850cb..c68367a7 100644 Binary files a/items/active/starbound/guns/randomgenerated/machinepistol/middle/9.png and b/items/active/starbound/guns/randomgenerated/machinepistol/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/mpistolnames.config b/items/active/starbound/guns/randomgenerated/machinepistol/mpistolnames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/mpistolnames.config rename to items/active/starbound/guns/randomgenerated/machinepistol/mpistolnames.config diff --git a/items/active/starbound/guns/randomgenerated/raremachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem similarity index 83% rename from items/active/starbound/guns/randomgenerated/raremachinepistol.activeitem rename to items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem index 3258bbaf..b544df60 100644 --- a/items/active/starbound/guns/randomgenerated/raremachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem @@ -5,16 +5,13 @@ "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], "price": 620, - "tooltipKind": "sb_gun", "paletteSwaps": "", - "category": "pistol", - "description": "", + "category": "machinePistol", + "tooltipKind": "sb_gun2", + "description": "A small fully automatic pistol.", "shortdescription": "Rare Machine Pistol", "twoHanded": false, "level": 1, - "tooltipFields": { - "subtitle": "Machine Pistol" - }, "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", @@ -32,7 +29,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet", "marioball"], + "projectileType": ["delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet", "marioball"], "fireTime": [0.11, 0.18], "baseDps": [5, 5.5], "energyUsage": [22, 27.5], @@ -64,17 +61,17 @@ "nameGenerator": "mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "machinepistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "machinepistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "machinepistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/rareplasmamachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/rareplasmamachinepistol.activeitem rename to items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem index 8ab59357..676b4cf8 100644 --- a/items/active/starbound/guns/randomgenerated/rareplasmamachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem @@ -4,12 +4,12 @@ "rarity": "rare", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", "price": 620, "paletteSwaps": "", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small fully automatic plasma pistol.", "shortdescription": "Rare Plasma Machine Pistol", - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, "tooltipFields": { @@ -64,17 +64,17 @@ "nameGenerator": "mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "machinepistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "machinepistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "machinepistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/uncommonmachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem similarity index 86% rename from items/active/starbound/guns/randomgenerated/uncommonmachinepistol.activeitem rename to items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem index f03dfc1d..595d4cf5 100644 --- a/items/active/starbound/guns/randomgenerated/uncommonmachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem @@ -6,15 +6,12 @@ "muzzleOffset": [0, 0.375], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small fully automatic pistol.", "shortdescription": "Uncommon Machine Pistol", - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, - "tooltipFields": { - "subtitle": "Machine Pistol" - }, "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", @@ -32,7 +29,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame"], "fireTime": [0.11, 0.18], "baseDps": [4, 4.5], "energyUsage": [20, 24.5], @@ -64,17 +61,17 @@ "nameGenerator": "mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "machinepistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "machinepistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "machinepistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/needler.png b/items/active/starbound/guns/randomgenerated/needler.png deleted file mode 100644 index 1c651cc4..00000000 Binary files a/items/active/starbound/guns/randomgenerated/needler.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/1.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/1.png index 706b795c..a0ba3c34 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/1.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/10.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/10.png index b0d55b82..f25f0ba8 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/10.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/12.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/12.png index 7c868acf..5f8c01b7 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/12.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/13.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/13.png index ba4a7819..49600d70 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/13.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/14.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/14.png index 3df30aed..05ceed19 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/14.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/15.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/15.png index ae00e4ca..9d70cc13 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/15.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/16.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/16.png index 354da131..cb7f1916 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/16.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/17.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/17.png index ad8c2a92..095748a3 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/17.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/19.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/19.png index a0d33863..2008a334 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/19.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/2.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/2.png index a9f6b5f7..ac93f803 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/2.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/20.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/20.png index ade9e2c4..10424577 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/20.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/3.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/3.png index 3380ea69..fed1b911 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/3.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/4.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/4.png index bb66dbdb..ded89af1 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/4.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/5.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/5.png index 0c23083b..0bf728d4 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/5.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/6.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/6.png index cf2c39b5..cd071605 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/6.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/7.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/7.png index 0629b868..76b9f68c 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/7.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/8.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/8.png index 2a3de53e..e276f457 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/8.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/barrel/9.png b/items/active/starbound/guns/randomgenerated/pistol/barrel/9.png index 1e147c68..3f01e941 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/barrel/9.png and b/items/active/starbound/guns/randomgenerated/pistol/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/10.png b/items/active/starbound/guns/randomgenerated/pistol/butt/10.png index ad2054ea..9d8bfb4d 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/10.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/12.png b/items/active/starbound/guns/randomgenerated/pistol/butt/12.png index 695d6d2a..97472a34 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/12.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/13.png b/items/active/starbound/guns/randomgenerated/pistol/butt/13.png index ab6b9f3f..0abba081 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/13.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/14.png b/items/active/starbound/guns/randomgenerated/pistol/butt/14.png index 1d21d906..946aae29 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/14.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/15.png b/items/active/starbound/guns/randomgenerated/pistol/butt/15.png index f92c0bab..86507e0d 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/15.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/19.png b/items/active/starbound/guns/randomgenerated/pistol/butt/19.png index 4603ed22..59d29d0e 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/19.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/20.png b/items/active/starbound/guns/randomgenerated/pistol/butt/20.png index efae726a..50b40fb4 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/20.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/3.png b/items/active/starbound/guns/randomgenerated/pistol/butt/3.png index 5862e227..6f7ab268 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/3.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/5.png b/items/active/starbound/guns/randomgenerated/pistol/butt/5.png index 13f1a417..0226030c 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/5.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/butt/7.png b/items/active/starbound/guns/randomgenerated/pistol/butt/7.png index 3357bf0c..de0a136a 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/butt/7.png and b/items/active/starbound/guns/randomgenerated/pistol/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/commonpistol.activeitem b/items/active/starbound/guns/randomgenerated/pistol/commonpistol.activeitem similarity index 91% rename from items/active/starbound/guns/randomgenerated/commonpistol.activeitem rename to items/active/starbound/guns/randomgenerated/pistol/commonpistol.activeitem index 9ea571fc..c65e4c86 100644 --- a/items/active/starbound/guns/randomgenerated/commonpistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/pistol/commonpistol.activeitem @@ -4,13 +4,13 @@ "rarity": "common", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", "category": "pistol", "twoHanded": false, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small handgun.", "shortdescription": "Common Pistol", "itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -62,17 +62,17 @@ "nameGenerator": "pistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "pistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "pistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "pistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/commonplasmapistol.activeitem b/items/active/starbound/guns/randomgenerated/pistol/commonplasmapistol.activeitem similarity index 91% rename from items/active/starbound/guns/randomgenerated/commonplasmapistol.activeitem rename to items/active/starbound/guns/randomgenerated/pistol/commonplasmapistol.activeitem index 459c82f4..d38ac96e 100644 --- a/items/active/starbound/guns/randomgenerated/commonplasmapistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/pistol/commonplasmapistol.activeitem @@ -4,12 +4,12 @@ "rarity": "common", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", "category": "pistol", "twoHanded": false, "level": 1, "paletteSwaps": "", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small plasma handgun.", "price": 620, "shortdescription": "Common Plasma Pistol", "tooltipFields": { @@ -65,17 +65,17 @@ "nameGenerator": "pistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "pistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "pistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "pistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/legendarypistol.activeitem b/items/active/starbound/guns/randomgenerated/pistol/legendarypistol.activeitem similarity index 85% rename from items/active/starbound/guns/randomgenerated/legendarypistol.activeitem rename to items/active/starbound/guns/randomgenerated/pistol/legendarypistol.activeitem index 5be49f34..e339b240 100644 --- a/items/active/starbound/guns/randomgenerated/legendarypistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/pistol/legendarypistol.activeitem @@ -4,9 +4,9 @@ "rarity": "legendary", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "tooltipKind": "sb_gun", "category": "pistol", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small handgun.", "paletteSwaps": "", "price": 620, "shortdescription": "Legendary Pistol", @@ -29,7 +29,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "pellet", "delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet", "trishot", "stickybullet", "explosivebullet", "marioball"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "pellet", "delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet", "trishot", "stickybullet", "explosivebullet", "marioball"], "fireTime": [0.3, 1.1], "baseDps": [7.7, 8.2], @@ -62,17 +62,17 @@ "nameGenerator": "pistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "pistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "pistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "pistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/1.png b/items/active/starbound/guns/randomgenerated/pistol/middle/1.png index 4c37ce75..3062ecbf 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/1.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/10.png b/items/active/starbound/guns/randomgenerated/pistol/middle/10.png index 2f5a2205..84f01649 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/10.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/11.png b/items/active/starbound/guns/randomgenerated/pistol/middle/11.png index a26ad0a0..83ba80a1 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/11.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/12.png b/items/active/starbound/guns/randomgenerated/pistol/middle/12.png index d8adc1e2..f22221a0 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/12.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/13.png b/items/active/starbound/guns/randomgenerated/pistol/middle/13.png index b3156dad..5a0081e3 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/13.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/14.png b/items/active/starbound/guns/randomgenerated/pistol/middle/14.png index 482d72b8..900d0b13 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/14.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/15.png b/items/active/starbound/guns/randomgenerated/pistol/middle/15.png index e1ca3fe5..98cb58a7 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/15.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/16.png b/items/active/starbound/guns/randomgenerated/pistol/middle/16.png index 1957cdaf..466cc76b 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/16.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/17.png b/items/active/starbound/guns/randomgenerated/pistol/middle/17.png index 8df52e3e..4210e314 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/17.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/18.png b/items/active/starbound/guns/randomgenerated/pistol/middle/18.png index 01d21472..e11ffb18 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/18.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/19.png b/items/active/starbound/guns/randomgenerated/pistol/middle/19.png index fd509767..5e23d430 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/19.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/2.png b/items/active/starbound/guns/randomgenerated/pistol/middle/2.png index a08c6d71..91b310b7 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/2.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/20.png b/items/active/starbound/guns/randomgenerated/pistol/middle/20.png index 1c5e42fa..618f84fa 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/20.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/3.png b/items/active/starbound/guns/randomgenerated/pistol/middle/3.png index 626d55cf..0281d676 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/3.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/4.png b/items/active/starbound/guns/randomgenerated/pistol/middle/4.png index 53f9afd3..f0deedd5 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/4.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/5.png b/items/active/starbound/guns/randomgenerated/pistol/middle/5.png index 92a6f41c..d60c3767 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/5.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/6.png b/items/active/starbound/guns/randomgenerated/pistol/middle/6.png index bec44f16..7a16b7e3 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/6.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/7.png b/items/active/starbound/guns/randomgenerated/pistol/middle/7.png index 2440a39a..41232edf 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/7.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/8.png b/items/active/starbound/guns/randomgenerated/pistol/middle/8.png index 47b5a1f5..03c54626 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/8.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistol/middle/9.png b/items/active/starbound/guns/randomgenerated/pistol/middle/9.png index 4fba78d8..6563a7f9 100644 Binary files a/items/active/starbound/guns/randomgenerated/pistol/middle/9.png and b/items/active/starbound/guns/randomgenerated/pistol/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/pistolnames.config b/items/active/starbound/guns/randomgenerated/pistol/pistolnames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/pistolnames.config rename to items/active/starbound/guns/randomgenerated/pistol/pistolnames.config diff --git a/items/active/starbound/guns/randomgenerated/rarepistol.activeitem b/items/active/starbound/guns/randomgenerated/pistol/rarepistol.activeitem similarity index 87% rename from items/active/starbound/guns/randomgenerated/rarepistol.activeitem rename to items/active/starbound/guns/randomgenerated/pistol/rarepistol.activeitem index 92ad7c8a..3c77d8b1 100644 --- a/items/active/starbound/guns/randomgenerated/rarepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/pistol/rarepistol.activeitem @@ -5,10 +5,10 @@ "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], "price": 620, - "description": "", "paletteSwaps": "", "shortdescription": "Rare Pistol", - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", + "description": "A small handgun.", "category": "pistol", "twoHanded": false, "level": 1, @@ -29,7 +29,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "pellet", "delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet", "marioball"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "pellet", "delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet", "marioball"], "fireTime": [0.3, 1.1], "baseDps": [6.2, 7.7], @@ -62,17 +62,17 @@ "nameGenerator": "pistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "pistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "pistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "pistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/rareplasmapistol.activeitem b/items/active/starbound/guns/randomgenerated/pistol/rareplasmapistol.activeitem similarity index 92% rename from items/active/starbound/guns/randomgenerated/rareplasmapistol.activeitem rename to items/active/starbound/guns/randomgenerated/pistol/rareplasmapistol.activeitem index e6733cf3..303d29e1 100644 --- a/items/active/starbound/guns/randomgenerated/rareplasmapistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/pistol/rareplasmapistol.activeitem @@ -6,9 +6,9 @@ "muzzleOffset": [0, 0.375], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", "category": "pistol", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small plasma handgun.", "shortdescription": "Rare Plasma Pistol", "twoHanded": false, "level": 1, @@ -65,17 +65,17 @@ "nameGenerator": "pistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "pistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "pistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "pistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/uncommonpistol.activeitem b/items/active/starbound/guns/randomgenerated/pistol/uncommonpistol.activeitem similarity index 89% rename from items/active/starbound/guns/randomgenerated/uncommonpistol.activeitem rename to items/active/starbound/guns/randomgenerated/pistol/uncommonpistol.activeitem index 26d583ce..3a690ec3 100644 --- a/items/active/starbound/guns/randomgenerated/uncommonpistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/pistol/uncommonpistol.activeitem @@ -6,8 +6,8 @@ "muzzleOffset": [0, 0.375], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", - "description": "", + "tooltipKind": "sb_gun2", + "description": "A small handgun.", "shortdescription": "Uncommon Pistol", "category": "pistol", "twoHanded": false, @@ -29,7 +29,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "pellet", "delayed", "fast", "flame"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "pellet", "delayed", "fast", "sb_fastflame"], "fireTime": [0.3, 1.1], "baseDps": [5.7, 6.2], @@ -62,17 +62,17 @@ "nameGenerator": "pistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "pistol/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "pistol/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "pistol/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/pulserifle/barrel/1.png b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/1.png index 7a9d04e0..8050ba30 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/3.png b/items/active/starbound/guns/randomgenerated/pulserifle/barrel/3.png index c9cc18ee..eac2ecdd 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 72209b13..2c42785a 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 a829f3d1..40ae5610 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 a829f3d1..40ae5610 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 02314b08..43cbd185 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 85f006f7..626ef4c8 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.activeitem b/items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem similarity index 89% rename from items/active/starbound/guns/randomgenerated/pulserifle.activeitem rename to items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem index 30e66e7e..c393aae5 100644 --- a/items/active/starbound/guns/randomgenerated/pulserifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/pulserifle/pulserifle.activeitem @@ -2,7 +2,7 @@ "itemName": "sb_pulserifle", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0.875, 0.125], + "muzzleOffset": [0.875, 0.3], "baseOffset": [-1.25, 0.5], "price": 620, "tooltipKind": "sb_gun", @@ -59,20 +59,20 @@ }, "builderConfig": [{ - "nameGenerator": "snipernames.config:nameGen", + "nameGenerator": "/items/active/starbound/guns/randomgenerated/sniperrifle/snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "pulserifle/barrel/.png", + "path": "barrel/.png", "variants": 3, "paletteSwap": true }, "butt": { - "path": "pulserifle/butt/.png", + "path": "butt/.png", "variants": 3, "paletteSwap": true }, "middle": { - "path": "pulserifle/middle/.png", + "path": "middle/.png", "variants": 3, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/1.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/1.png index e5ed9e7e..f1dedc11 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/1.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/2.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/2.png index f88f942c..923f34f9 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/2.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/3.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/3.png index ff2242a8..2b638495 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/3.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/4.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/4.png index ea877074..9b1081fa 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/4.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/5.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/5.png index c626e71e..79be8cad 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/5.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/6.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/6.png index be9907d4..551a519e 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/6.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/7.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/7.png index 8e94f68b..0ddbdcfd 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/7.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/8.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/8.png index c0571b69..e9dde86f 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/8.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/barrel/9.png b/items/active/starbound/guns/randomgenerated/revolver/barrel/9.png index 790709d0..a03f14dd 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/barrel/9.png and b/items/active/starbound/guns/randomgenerated/revolver/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/butt/10.png b/items/active/starbound/guns/randomgenerated/revolver/butt/10.png index 77e82ca6..63829935 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/butt/10.png and b/items/active/starbound/guns/randomgenerated/revolver/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/middle/1.png b/items/active/starbound/guns/randomgenerated/revolver/middle/1.png index c2292f78..83ceadea 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/middle/1.png and b/items/active/starbound/guns/randomgenerated/revolver/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/middle/2.png b/items/active/starbound/guns/randomgenerated/revolver/middle/2.png index 5b51cb23..d23ac962 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/middle/2.png and b/items/active/starbound/guns/randomgenerated/revolver/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver/middle/3.png b/items/active/starbound/guns/randomgenerated/revolver/middle/3.png index 7e7b0db2..5b3253ad 100644 Binary files a/items/active/starbound/guns/randomgenerated/revolver/middle/3.png and b/items/active/starbound/guns/randomgenerated/revolver/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/revolver.activeitem b/items/active/starbound/guns/randomgenerated/revolver/revolver.activeitem similarity index 93% rename from items/active/starbound/guns/randomgenerated/revolver.activeitem rename to items/active/starbound/guns/randomgenerated/revolver/revolver.activeitem index 046d0914..37242ffe 100644 --- a/items/active/starbound/guns/randomgenerated/revolver.activeitem +++ b/items/active/starbound/guns/randomgenerated/revolver/revolver.activeitem @@ -66,17 +66,17 @@ "nameGenerator": "revolvernames.config:nameGen", "animationParts": { "barrel": { - "path": "revolver/barrel/.png", + "path": "barrel/.png", "variants": 9, "paletteSwap": true }, "butt": { - "path": "revolver/butt/.png", + "path": "butt/.png", "variants": 12, "paletteSwap": true }, "middle": { - "path": "revolver/middle/.png", + "path": "middle/.png", "variants": 3, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/revolvernames.config b/items/active/starbound/guns/randomgenerated/revolver/revolvernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/revolvernames.config rename to items/active/starbound/guns/randomgenerated/revolver/revolvernames.config diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/1.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/1.png index 29de1619..b3808782 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/1.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/10.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/10.png index 517c9929..e485b0a3 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/10.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/11.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/11.png index c3922cfa..fd72507a 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/11.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/12.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/12.png index 997b1f5b..a5eb6854 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/12.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/13.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/13.png index 744a6309..ca933139 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/13.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/14.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/14.png index 9ecae1dd..230801d2 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/14.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/17.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/17.png index 3f5df328..b713ffab 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/17.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/18.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/18.png index baa634f8..3f87edcf 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/18.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/19.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/19.png index bab9602b..61748069 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/19.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/2.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/2.png index 5777a2ba..db03f1c9 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/2.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/20.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/20.png index 147e7be1..fff2350b 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/20.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/3.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/3.png index 9ff679ba..0774dc9d 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/3.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/4.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/4.png index 4260f4c9..f81e5e2b 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/4.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/5.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/5.png index d6060be2..a67d6365 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/5.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/6.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/6.png index 2aae19dc..d16abb74 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/6.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/1.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/1.png index 0c1a3500..58297441 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/1.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/10.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/10.png index 75b65dc0..9caef62d 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/10.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/12.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/12.png index 3a4b5c5e..6e1649a8 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/12.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/13.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/13.png index 6c5243e7..c8dfcc85 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/13.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/15.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/15.png index e461a259..05b69320 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/15.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/16.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/16.png index 8c6baf5a..42178fbb 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/16.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/17.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/17.png index 6db3759a..f3a0a1cb 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/17.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/18.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/18.png index f89b1346..4878539d 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/18.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/19.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/19.png index fc66a0a6..52801e62 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/19.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/2.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/2.png index 500abec9..f779fef8 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/2.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/20.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/20.png index e7fe55f8..c98970e2 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/20.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/3.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/3.png index 8c8c8785..d109ba9c 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/3.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/4.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/4.png index d4083ae3..8fb9e99d 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/4.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/5.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/5.png index 1c472b11..100a9937 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/5.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/6.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/6.png index 3690d3db..f2aa7040 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/6.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/7.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/7.png index 531df2fb..7b7c0435 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/7.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/9.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/9.png index a26d338b..655afc7b 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/9.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/commonrocketlauncher.activeitem b/items/active/starbound/guns/randomgenerated/rocketlauncher/commonrocketlauncher.activeitem similarity index 84% rename from items/active/starbound/guns/randomgenerated/commonrocketlauncher.activeitem rename to items/active/starbound/guns/randomgenerated/rocketlauncher/commonrocketlauncher.activeitem index ff72767e..f6513fc5 100644 --- a/items/active/starbound/guns/randomgenerated/commonrocketlauncher.activeitem +++ b/items/active/starbound/guns/randomgenerated/rocketlauncher/commonrocketlauncher.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_commonrocketlauncher", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, 0], + "muzzleOffset": [-0.25, 0.25], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "rocketLauncher", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "The power to blow stuff up.", "shortdescription": "Common Rocket Launcher", "itemTags": ["weapon", "ranged", "rocketlauncher", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -19,6 +19,15 @@ "muzzleFlash": "/animations/muzzleflash/smokemuzzle/smokemuzzle.png" }, "animationCustom": { + "particleEmitters": { + "muzzleFlash": { + "burstCount": 3, + "particles": [{ + "particle": "rocketbarrelpuff" + } + ] + } + }, "sounds": { "fire": ["/sfx/gun/rocket1.ogg"] } @@ -64,17 +73,17 @@ "nameGenerator": "rlaunchernames.config:nameGen", "animationParts": { "barrel": { - "path": "rocketlauncher/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "rocketlauncher/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "rocketlauncher/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/1.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/1.png index 2c76de7f..43b5fa02 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/1.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/10.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/10.png index 09c602c1..4f351925 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/10.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/12.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/12.png index e1279fe7..8aec0439 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/12.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/13.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/13.png index 9d435baf..96332193 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/13.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/14.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/14.png index e0f86cf7..b4f38e81 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/14.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/15.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/15.png index 4bfbe8d2..98421344 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/15.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/17.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/17.png index fa9f478f..9c5ab81e 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/17.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/18.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/18.png index 1190153f..e4cdc3b2 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/18.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/19.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/19.png index f90bf617..28d7c457 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/19.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/2.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/2.png index e0930706..c1431232 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/2.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/20.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/20.png index 313f89aa..4f69de06 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/20.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/3.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/3.png index 747f9ada..e45c83db 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/3.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/4.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/4.png index 835bb48d..2524af66 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/4.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/5.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/5.png index 811e1060..01a120ba 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/5.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/7.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/7.png index e0f86cf7..b4f38e81 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/7.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/8.png b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/8.png index 833dfc40..8cf5c1ff 100644 Binary files a/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/8.png and b/items/active/starbound/guns/randomgenerated/rocketlauncher/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/rlaunchernames.config b/items/active/starbound/guns/randomgenerated/rocketlauncher/rlaunchernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/rlaunchernames.config rename to items/active/starbound/guns/randomgenerated/rocketlauncher/rlaunchernames.config diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/1.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/1.png index ffff330a..8172e611 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/1.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/10.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/10.png index 16172e9f..f3bd1575 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/10.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/13.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/13.png index df12ac27..2e0fe5d8 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/13.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/14.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/14.png index 3a06c17b..ae09ce1d 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/14.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/16.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/16.png index f7b4b7e9..7a056bf4 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/16.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/17.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/17.png index b26cfa08..d372d44d 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/17.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/4.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/4.png index b08111e4..d365843f 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/4.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/5.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/5.png index 63213b5e..2193df7b 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/5.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/barrel/6.png b/items/active/starbound/guns/randomgenerated/shattergun/barrel/6.png index 07e382b6..a4cdccdc 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/barrel/6.png and b/items/active/starbound/guns/randomgenerated/shattergun/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/butt/1.png b/items/active/starbound/guns/randomgenerated/shattergun/butt/1.png index b0a9e5a7..ea6e3506 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/butt/1.png and b/items/active/starbound/guns/randomgenerated/shattergun/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/butt/10.png b/items/active/starbound/guns/randomgenerated/shattergun/butt/10.png index 1dab0c24..3375d74d 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/butt/10.png and b/items/active/starbound/guns/randomgenerated/shattergun/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/butt/13.png b/items/active/starbound/guns/randomgenerated/shattergun/butt/13.png index f303c6bf..82a7ce53 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/butt/13.png and b/items/active/starbound/guns/randomgenerated/shattergun/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/butt/19.png b/items/active/starbound/guns/randomgenerated/shattergun/butt/19.png index c038e1ac..c65426d2 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/butt/19.png and b/items/active/starbound/guns/randomgenerated/shattergun/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/butt/20.png b/items/active/starbound/guns/randomgenerated/shattergun/butt/20.png index bea92089..0a291191 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/butt/20.png and b/items/active/starbound/guns/randomgenerated/shattergun/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/1.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/1.png index 498e46e2..72358e17 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/1.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/12.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/12.png index d84f83de..46b31607 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/12.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/15.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/15.png index 7d83a00a..94eb77e2 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/15.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/16.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/16.png index b888ec79..d87f7c4f 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/16.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/17.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/17.png index f81b597c..a5df62f5 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/17.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/18.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/18.png index 519af249..79076ac6 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/18.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/19.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/19.png index aceccaa0..8a66d8e0 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/19.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/20.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/20.png index 669c65fb..3716b153 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/20.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/3.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/3.png index 8839e336..afc64949 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/3.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/4.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/4.png index 7df2a54e..15b1b50f 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/4.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/5.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/5.png index 30691c7f..4cf409c9 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/5.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/6.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/6.png index 47c928a6..b895354e 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/6.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/7.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/7.png index afa9075e..ee00971a 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/7.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/8.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/8.png index 6f7b8250..65ebf70a 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/8.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun/middle/9.png b/items/active/starbound/guns/randomgenerated/shattergun/middle/9.png index a1acea3e..12de9bdf 100644 Binary files a/items/active/starbound/guns/randomgenerated/shattergun/middle/9.png and b/items/active/starbound/guns/randomgenerated/shattergun/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/shattergun.activeitem b/items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/shattergun.activeitem rename to items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem index 99062736..b1fc3701 100644 --- a/items/active/starbound/guns/randomgenerated/shattergun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem @@ -2,7 +2,7 @@ "itemName": "sb_shattergun", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.05], "tooltipKind": "sb_gun", "category": "shotgun", @@ -28,15 +28,13 @@ }, "elementalType": "physical", - + //TODO: needs to use gun2 ability (not shotgun) "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", "projectileType": ["crystalslide", "glassslide", "plasticslide", "chinaslide", "goldslide", "glowslide", "brokenglassslide"], - // "baseDamage" : 16, "fireTime": [0.4, 1.4], "projectileCount": [5, 10], - //"baseDps" : [5.5, 6.5], "baseDps": [20.5, 23.5], "energyUsage": [22.5, 25.5], "inaccuracy": 0.75, @@ -69,17 +67,17 @@ "nameGenerator": "shattergunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shattergun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shattergun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shattergun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/shattergunnames.config b/items/active/starbound/guns/randomgenerated/shattergun/shattergunnames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/shattergunnames.config rename to items/active/starbound/guns/randomgenerated/shattergun/shattergunnames.config diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/1.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/1.png index 13d1c09f..f381b01e 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/1.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/10.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/10.png index 0b0a2cda..2b6a60b4 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/10.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/11.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/11.png index 1f6ac2aa..8e041789 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/11.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/12.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/12.png index b6377ba3..4c8de251 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/12.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/13.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/13.png index 93ae5507..215ce8ba 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/13.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/14.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/14.png index 770653fb..5e138afc 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/14.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/15.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/15.png index 51d23a06..9bdfea88 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/15.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/16.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/16.png index 78270bc1..91a887fb 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/16.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/17.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/17.png index bde5d10f..ca0a50af 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/17.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/18.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/18.png index 46582bd0..820097a0 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/18.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/19.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/19.png index b96377b9..4c18be5f 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/19.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/2.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/2.png index ae82114b..ec880dc6 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/2.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/20.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/20.png index 0602e35e..82a08434 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/20.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/3.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/3.png index 52eb00dd..bba6fa60 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/3.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/4.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/4.png index aae6eb2d..1b73ee58 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/4.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/5.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/5.png index 88c3845d..2e98b794 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/5.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/6.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/6.png index a79b993f..e26d7fa0 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/6.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/7.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/7.png index a70660af..417e17e3 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/7.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/8.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/8.png index 29263380..0f4d1f18 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/8.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/barrel/9.png b/items/active/starbound/guns/randomgenerated/shotgun/barrel/9.png index af96417e..1eee830d 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/barrel/9.png and b/items/active/starbound/guns/randomgenerated/shotgun/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/1.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/1.png index 034f59d6..54673dec 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/1.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/10.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/10.png index c467bced..a7bbb843 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/10.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/11.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/11.png index 582a37dd..d1fb9eb0 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/11.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/12.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/12.png index 121ccc19..11d30abe 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/12.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/13.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/13.png index 2fe01f50..dfdf070c 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/13.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/14.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/14.png index 73f3445b..a40c996a 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/14.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/15.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/15.png index b9363f96..2a2b87d7 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/15.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/16.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/16.png index 4b27e470..b04b2dfd 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/16.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/17.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/17.png index e6ab10b3..4183f70a 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/17.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/18.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/18.png index 09ecaf89..b05311e1 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/18.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/19.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/19.png index 3e46ec87..eb55b058 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/19.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/2.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/2.png index 03e375c1..e22f6af2 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/2.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/20.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/20.png index dfd6a6c5..e1ddb65e 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/20.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/3.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/3.png index 843de960..aa798ce3 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/3.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/4.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/4.png index 8fb9e939..4ec1bb7d 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/4.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/5.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/5.png index 13e7ca52..80c16ef6 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/5.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/6.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/6.png index c7d07231..af98e41f 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/6.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/7.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/7.png index d1aaf92a..9c138b47 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/7.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/8.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/8.png index ae12ad64..ef39f8e7 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/8.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/butt/9.png b/items/active/starbound/guns/randomgenerated/shotgun/butt/9.png index adefb0db..18e39886 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/butt/9.png and b/items/active/starbound/guns/randomgenerated/shotgun/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/commonplasmashotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/commonplasmashotgun.activeitem similarity index 93% rename from items/active/starbound/guns/randomgenerated/commonplasmashotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/commonplasmashotgun.activeitem index b1150952..699dd589 100644 --- a/items/active/starbound/guns/randomgenerated/commonplasmashotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/commonplasmashotgun.activeitem @@ -2,7 +2,7 @@ "itemName": "sb_commonplasmashotgun", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], "tooltipKind": "sb_gun", "category": "shotgun", @@ -67,17 +67,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/commonshotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/commonshotgun.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/commonshotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/commonshotgun.activeitem index 762d1943..679d2c45 100644 --- a/items/active/starbound/guns/randomgenerated/commonshotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/commonshotgun.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_commonshotgun", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "shotgun", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "Fires a spread that's lethal at close range.", "shortdescription": "Common Shotgun", "itemTags": ["weapon", "ranged", "shotgun", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -65,17 +65,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/legendaryshotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/legendaryshotgun.activeitem similarity index 85% rename from items/active/starbound/guns/randomgenerated/legendaryshotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/legendaryshotgun.activeitem index 9036687b..b1b0ae33 100644 --- a/items/active/starbound/guns/randomgenerated/legendaryshotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/legendaryshotgun.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_legendaryshotgun", "maxStack": 1, "rarity": "legendary", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "shotgun", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "Fires a spread that's lethal at close range.", "shortdescription": "Legendary Shotgun", "itemTags": ["weapon", "ranged", "shotgun", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -27,7 +27,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["pellet", "bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet", "trishot", "stickybullet", "explosivebullet"], + "projectileType": ["pellet", "bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet", "trishot", "stickybullet", "explosivebullet"], "fireTime": [0.4, 1.4], "baseDps": [9, 10], "projectileCount": [5, 8], @@ -63,17 +63,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/1.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/1.png index 03da90b0..14c3fc61 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/1.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/10.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/10.png index 32292493..2624a7e3 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/10.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/11.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/11.png index 6836c491..fc50d4d2 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/11.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/12.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/12.png index 0ca814d0..f1d81d1c 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/12.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/13.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/13.png index ced604fe..23bf3844 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/13.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/14.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/14.png index b06214bc..39c35086 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/14.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/15.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/15.png index 7b67ab5c..ccf35936 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/15.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/16.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/16.png index 52e83077..6ebdeff3 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/16.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/17.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/17.png index 4fe2a26d..df32d1e6 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/17.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/18.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/18.png index bf605a5f..7857a376 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/18.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/19.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/19.png index b04d733a..e0c84d73 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/19.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/2.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/2.png index 0ca53fe3..6a0d755e 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/2.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/20.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/20.png index fddd08dc..5badebad 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/20.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/3.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/3.png index 0e1ebd66..a07bc3db 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/3.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/4.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/4.png index aa9311f9..fc9b5a62 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/4.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/5.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/5.png index 4729564c..220ddc81 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/5.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/6.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/6.png index cccbb1ce..2d1d923d 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/6.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/7.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/7.png index f69cb5d9..70ce51b1 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/7.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/8.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/8.png index bf63cd2e..a2b5c4cb 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/8.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/shotgun/middle/9.png b/items/active/starbound/guns/randomgenerated/shotgun/middle/9.png index 641d8020..0976894e 100644 Binary files a/items/active/starbound/guns/randomgenerated/shotgun/middle/9.png and b/items/active/starbound/guns/randomgenerated/shotgun/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/rareplasmashotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/rareplasmashotgun.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/rareplasmashotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/rareplasmashotgun.activeitem index 7259b44b..55177540 100644 --- a/items/active/starbound/guns/randomgenerated/rareplasmashotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/rareplasmashotgun.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_rareplasmashotgun", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "shotgun", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "Fires a plasma spread that's lethal at close range.", "shortdescription": "Rare Plasma Shotgun", "tooltipFields": { "subtitle": "Plasma Shotgun" @@ -66,17 +66,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/rareshotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/rareshotgun.activeitem similarity index 86% rename from items/active/starbound/guns/randomgenerated/rareshotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/rareshotgun.activeitem index 7a0ec4f9..8921077c 100644 --- a/items/active/starbound/guns/randomgenerated/rareshotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/rareshotgun.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_rareshotgun", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "shotgun", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "Fires a spread that's lethal at close range.", "shortdescription": "Rare Shotgun", "itemTags": ["weapon", "ranged", "shotgun", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -27,7 +27,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["pellet", "bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet"], + "projectileType": ["pellet", "bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet"], "fireTime": [0.4, 1.4], "baseDps": [9.8, 10.5], "projectileCount": [5, 8], @@ -63,17 +63,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/shotgunnames.config b/items/active/starbound/guns/randomgenerated/shotgun/shotgunnames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/shotgunnames.config rename to items/active/starbound/guns/randomgenerated/shotgun/shotgunnames.config diff --git a/items/active/starbound/guns/randomgenerated/uncommonplasmashotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/uncommonplasmashotgun.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/uncommonplasmashotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/uncommonplasmashotgun.activeitem index fd1383f3..a9a7476b 100644 --- a/items/active/starbound/guns/randomgenerated/uncommonplasmashotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/uncommonplasmashotgun.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_uncommonplasmashotgun", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "shotgun", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "Fires a plasma spread that's lethal at close range.", "shortdescription": "Uncommon Plasma Shotgun", "tooltipFields": { "subtitle": "Plasma Shotgun" @@ -67,17 +67,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/uncommonshotgun.activeitem b/items/active/starbound/guns/randomgenerated/shotgun/uncommonshotgun.activeitem similarity index 88% rename from items/active/starbound/guns/randomgenerated/uncommonshotgun.activeitem rename to items/active/starbound/guns/randomgenerated/shotgun/uncommonshotgun.activeitem index 05863076..41229716 100644 --- a/items/active/starbound/guns/randomgenerated/uncommonshotgun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shotgun/uncommonshotgun.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_uncommonshotgun", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0, 0.4125], + "muzzleOffset": [0, 0.25], "baseOffset": [-1.25, 0.25], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", "category": "shotgun", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "description": "Fires a spread that's lethal at close range.", "shortdescription": "Uncommon Shotgun", "itemTags": ["weapon", "ranged", "shotgun", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -29,7 +29,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["pellet", "bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame"], + "projectileType": ["pellet", "bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame"], "fireTime": [0.4, 1.4], "baseDps": [9.5, 10.5], "projectileCount": [5, 8], @@ -72,17 +72,17 @@ "nameGenerator": "shotgunnames.config:nameGen", "animationParts": { "barrel": { - "path": "shotgun/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "shotgun/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "shotgun/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/1.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/1.png index a145b4f9..f617e747 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/1.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/10.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/10.png index 3f4bb855..8373d279 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/10.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/11.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/11.png index 6c3f8035..e71121a1 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/11.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/12.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/12.png index 50c05dda..1da27f4c 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/12.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/13.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/13.png index dba6dfa3..276c85e1 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/13.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/14.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/14.png index 471a6721..d38b90ce 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/14.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/15.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/15.png index a68e31f8..91bde9cf 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/15.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/16.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/16.png index 8e5acf22..9bf5e45e 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/16.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/17.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/17.png index 4caf8e31..582225c0 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/17.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/18.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/18.png index fdceb97c..77338a9b 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/18.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/19.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/19.png index 5d117058..fd1540f5 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/19.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/2.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/2.png index d26c35f6..1a13e53f 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/2.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/20.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/20.png index 28f3d3fb..3fdb535c 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/20.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/3.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/3.png index 8303f587..69cb0af1 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/3.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/4.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/4.png index 7b54acec..402daf18 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/4.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/5.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/5.png index 4326906e..9e1ba170 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/5.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/6.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/6.png index b4045c70..91c31545 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/6.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/7.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/7.png index ea3ae0c5..fd309acd 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/7.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/8.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/8.png index 652dc4f3..4095ea61 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/8.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/9.png b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/9.png index c2cc2457..41ce9d52 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/9.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/barrel/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/1.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/1.png index f3bbfeb8..eda9fa07 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/1.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/10.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/10.png index c0398c38..5b572447 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/10.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/11.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/11.png index 2cfe9b67..4962d677 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/11.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/12.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/12.png index ddad7dfd..c10219ba 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/12.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/13.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/13.png index e29b4ce6..652994ac 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/13.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/14.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/14.png index 9f7b9eb3..e3c6398e 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/14.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/15.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/15.png index 1f6eca4d..66f1f9d3 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/15.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/16.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/16.png index b77d4792..86a4c6f0 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/16.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/17.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/17.png index 03332181..b7867e8a 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/17.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/18.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/18.png index 1f63a2d6..b2696fd4 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/18.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/19.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/19.png index 541690dd..a7f94fd5 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/19.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/2.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/2.png index 404829eb..1569b2d6 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/2.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/20.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/20.png index 3e18df31..29ed6715 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/20.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/3.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/3.png index 177659ca..2192c255 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/3.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/4.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/4.png index a05136e9..e0ead111 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/4.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/5.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/5.png index 1a7d92a1..09314497 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/5.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/6.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/6.png index c3cef8cf..6a36357e 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/6.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/7.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/7.png index 3d902d1d..d36d1e82 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/7.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/8.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/8.png index b3e0c73d..74b4406f 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/8.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/9.png b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/9.png index 09cdb1a3..c58c2537 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/butt/9.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/butt/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/commonplasmasniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/commonplasmasniperrifle.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/commonplasmasniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/commonplasmasniperrifle.activeitem index d47804ad..2bc356c2 100644 --- a/items/active/starbound/guns/randomgenerated/commonplasmasniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/commonplasmasniperrifle.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_commonplasmasniperrifle", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, -0.1], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", "category": "sniperRifle", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "shortdescription": "Common Plasma Sniper Rifle", "itemTags": ["weapon", "ranged", "sniperrifle", "upgradeableWeapon"], "tooltipFields": { @@ -68,17 +68,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/commonsniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/commonsniperrifle.activeitem similarity index 90% rename from items/active/starbound/guns/randomgenerated/commonsniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/commonsniperrifle.activeitem index 1da6ef13..38f3a822 100644 --- a/items/active/starbound/guns/randomgenerated/commonsniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/commonsniperrifle.activeitem @@ -2,15 +2,15 @@ "itemName": "sb_commonsniperrifle", "maxStack": 1, "rarity": "common", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "category": "sniperRifle", "twoHanded": true, "price": 620, "paletteSwaps": "", "level": 1, - "description": "", "shortdescription": "Common Sniper Rifle", "itemTags": ["weapon", "ranged", "sniperrifle", "upgradeableWeapon"], "scripts": ["/items/active/weapons/ranged/gun.lua"], @@ -64,17 +64,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/legendarysniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/legendarysniperrifle.activeitem similarity index 86% rename from items/active/starbound/guns/randomgenerated/legendarysniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/legendarysniperrifle.activeitem index 45e51a5e..82881e94 100644 --- a/items/active/starbound/guns/randomgenerated/legendarysniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/legendarysniperrifle.activeitem @@ -2,11 +2,11 @@ "itemName": "sb_legendarysniperrifle", "maxStack": 1, "rarity": "legendary", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], - "tooltipKind": "sb_gun", "price": 620, - "description": "", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "shortdescription": "Legendary Sniper Rifle", "category": "sniperRifle", "paletteSwaps": "", @@ -27,7 +27,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet", "trishot", "stickybullet", "explosivebullet"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet", "trishot", "stickybullet", "explosivebullet"], "fireSounds": ["/sfx/gun/sniper1.ogg", "/sfx/gun/sniper2.ogg", "/sfx/gun/sniper3.ogg", "/sfx/gun/sniper4.ogg"], // "baseDamage" : 16, "fireTime": [0.5, 1.5], @@ -64,17 +64,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/1.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/1.png index 73227820..f322d1ca 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/1.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/10.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/10.png index 9f3a3a1d..5e31d66a 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/10.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/10.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/11.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/11.png index 14ebfcf1..18d5862b 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/11.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/11.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/12.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/12.png index 65c4890d..5e4813f3 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/12.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/12.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/13.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/13.png index 09bf4f2e..e9d854e9 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/13.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/13.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/14.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/14.png index 045f76c4..c950af2e 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/14.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/14.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/15.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/15.png index 9bfc9589..95c2f13c 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/15.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/15.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/16.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/16.png index d4d8e97d..32be2cfa 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/16.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/16.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/17.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/17.png index 2934015c..a5a717d4 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/17.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/17.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/18.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/18.png index da44d963..02313609 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/18.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/18.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/19.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/19.png index 63a629da..a0b26afc 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/19.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/19.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/2.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/2.png index 3b1f28c2..4144d2fe 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/2.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/20.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/20.png index 0b57ddd9..1daeaeeb 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/20.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/20.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/3.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/3.png index f2262eb2..1862df70 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/3.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/4.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/4.png index fb3f5bd8..81a9ef56 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/4.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/5.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/5.png index 13d2f28a..923a687c 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/5.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/6.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/6.png index 499b9c28..ec65690f 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/6.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/6.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/7.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/7.png index 35bddc4b..46fb2f29 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/7.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/7.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/8.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/8.png index 6840211d..465fe992 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/8.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/8.png differ diff --git a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/9.png b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/9.png index 8b779230..6af9c9a5 100644 Binary files a/items/active/starbound/guns/randomgenerated/sniperrifle/middle/9.png and b/items/active/starbound/guns/randomgenerated/sniperrifle/middle/9.png differ diff --git a/items/active/starbound/guns/randomgenerated/rareplasmasniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/rareplasmasniperrifle.activeitem similarity index 91% rename from items/active/starbound/guns/randomgenerated/rareplasmasniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/rareplasmasniperrifle.activeitem index 9b9c2f7d..8df516e8 100644 --- a/items/active/starbound/guns/randomgenerated/rareplasmasniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/rareplasmasniperrifle.activeitem @@ -2,13 +2,13 @@ "itemName": "sb_rareplasmasniperrifle", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [0, -0.1], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "category": "sniperRifle", - "description": "", "shortdescription": "Rare Plasma Sniper Rifle", "twoHanded": true, "level": 1, @@ -68,17 +68,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/raresniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/raresniperrifle.activeitem similarity index 88% rename from items/active/starbound/guns/randomgenerated/raresniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/raresniperrifle.activeitem index ca60f26b..86d5dfaf 100644 --- a/items/active/starbound/guns/randomgenerated/raresniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/raresniperrifle.activeitem @@ -2,13 +2,13 @@ "itemName": "sb_raresniperrifle", "maxStack": 1, "rarity": "rare", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", "category": "sniperRifle", - "description": "", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "shortdescription": "Rare Sniper Rifle", "twoHanded": true, "level": 1, @@ -27,7 +27,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame", "bouncybullet", "splitbullet", "piercingbullet"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame", "bouncybullet", "splitbullet", "piercingbullet"], "fireSounds": ["/sfx/gun/sniper1.ogg", "/sfx/gun/sniper2.ogg", "/sfx/gun/sniper3.ogg", "/sfx/gun/sniper4.ogg"], // "baseDamage" : 16, "fireTime": [0.5, 1.5], @@ -65,17 +65,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/snipernames.config b/items/active/starbound/guns/randomgenerated/sniperrifle/snipernames.config similarity index 100% rename from items/active/starbound/guns/randomgenerated/snipernames.config rename to items/active/starbound/guns/randomgenerated/sniperrifle/snipernames.config diff --git a/items/active/starbound/guns/randomgenerated/uncommonplasmasniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/uncommonplasmasniperrifle.activeitem similarity index 91% rename from items/active/starbound/guns/randomgenerated/uncommonplasmasniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/uncommonplasmasniperrifle.activeitem index 7b0d18f0..18f5c8fb 100644 --- a/items/active/starbound/guns/randomgenerated/uncommonplasmasniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/uncommonplasmasniperrifle.activeitem @@ -2,12 +2,14 @@ "itemName": "sb_uncommonplasmasniperrifle", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0, -0.1], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "category": "sniperRifle", + "shortdescription": "Uncommon Plasma Sniper Rifle", "twoHanded": true, "level": 1, "itemTags": ["weapon", "ranged", "sniperrifle", "upgradeableWeapon"], @@ -15,8 +17,6 @@ "subtitle": "Plasma Sniper Rifle" }, "scripts": ["/items/active/weapons/ranged/gun.lua"], - "description": "", - "shortdescription": "Uncommon Plasma Sniper Rifle", "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", "animationParts": { "muzzleFlash": "/animations/sb/muzzleflash/plasmamuzzle2/plasmamuzzle2.png" @@ -68,17 +68,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/uncommonsniperrifle.activeitem b/items/active/starbound/guns/randomgenerated/sniperrifle/uncommonsniperrifle.activeitem similarity index 88% rename from items/active/starbound/guns/randomgenerated/uncommonsniperrifle.activeitem rename to items/active/starbound/guns/randomgenerated/sniperrifle/uncommonsniperrifle.activeitem index 221c5459..340a56d6 100644 --- a/items/active/starbound/guns/randomgenerated/uncommonsniperrifle.activeitem +++ b/items/active/starbound/guns/randomgenerated/sniperrifle/uncommonsniperrifle.activeitem @@ -2,13 +2,13 @@ "itemName": "sb_uncommonsniperrifle", "maxStack": 1, "rarity": "uncommon", - "muzzleOffset": [0, 0], + "muzzleOffset": [0, 0.05], "baseOffset": [-1.25, 0.5], "price": 620, "paletteSwaps": "", - "tooltipKind": "sb_gun", "category": "sniperRifle", - "description": "", + "tooltipKind": "sb_gun2", + "description": "Powerfully strong to cover long distances.", "shortdescription": "Uncommon Sniper Rifle", "twoHanded": true, "level": 1, @@ -27,7 +27,7 @@ "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", - "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "flame"], + "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "delayed", "fast", "sb_fastflame"], //"baseDamage" : 16, "fireTime": [0.5, 1.5], "baseDps": [7, 8.5], @@ -63,17 +63,17 @@ "nameGenerator": "snipernames.config:nameGen", "animationParts": { "barrel": { - "path": "sniperrifle/barrel/.png", + "path": "barrel/.png", "variants": 20, "paletteSwap": true }, "butt": { - "path": "sniperrifle/butt/.png", + "path": "butt/.png", "variants": 20, "paletteSwap": true }, "middle": { - "path": "sniperrifle/middle/.png", + "path": "middle/.png", "variants": 20, "paletteSwap": true } diff --git a/items/active/starbound/guns/randomgenerated/stingergun.activeitem b/items/active/starbound/guns/randomgenerated/stingergun.activeitem deleted file mode 100644 index 7346686d..00000000 --- a/items/active/starbound/guns/randomgenerated/stingergun.activeitem +++ /dev/null @@ -1,85 +0,0 @@ -{ - "itemName": "sb_stingergun", - "maxStack": 1, - "rarity": "rare", - "muzzleOffset": [1.75, 0.125], - "baseOffset": [-1.25, 0.375], - "price": 620, - "tooltipKind": "sb_gun", - "description": "", - "shortdescription": "Stinger Gun", - "category": "assaultRifle", - "twoHanded": true, - "sb_waBan": true, - "level": 1, - "itemTags": ["weapon", "ranged", "assaultrifle", "stingergun", "upgradeableWeapon"], - "tooltipFields": { - "subtitle": "Stinger Gun" - }, - "scripts": ["/items/active/weapons/ranged/gun.lua"], - "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", - "inventoryIcon": "stingergun.png", - "animationParts": { - "muzzleFlash": "/animations/muzzleflash/bulletmuzzle3/bulletmuzzle3.png", - "butt": "stingergun.png" - }, - "animationCustom": { - "animatedParts": { - "parts": { - "butt": { - "properties": { - "offset": [0.15, 0.25] - } - } - } - }, - "sounds": { - "fire": ["/sfx/gun/needler1.ogg"] - } - }, - - "elementalType": "physical", - - "primaryAbility": { //TODO: use gun ability - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", - "projectileType": ["stingergunsting"], - "projectileParameters": { - "speed": 70, - "power": 5 - }, - "fireTime": [0.08, 0.16], - "fireType": "auto", - "baseDps": [8.25, 12.75], - "energyUsage": [45, 80], - "inaccuracy": 0.025, - "stances": { - "idle": { - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - }, - "fire": {}, - "cooldown": { - "duration": 0.11, - "recoil": true, - "armRotation": 0, - "weaponRotation": 0, - "twoHanded": true, - - "allowRotate": true, - "allowFlip": true - } - } - }, - "altAbilityType": "sb_shotgun", - - "builderConfig": [{ - "nameGenerator": "needlernames.config:nameGen" - } - ], - "builder": "/items/buildscripts/starbound/buildweapon.lua" -} diff --git a/items/active/starbound/guns/randomgenerated/stingergun.png b/items/active/starbound/guns/randomgenerated/stingergun.png deleted file mode 100644 index 2e01cb93..00000000 Binary files a/items/active/starbound/guns/randomgenerated/stingergun.png and /dev/null differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/barrel/1.png b/items/active/starbound/guns/randomgenerated/uzi/barrel/1.png index 061bea81..aba03589 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/barrel/1.png and b/items/active/starbound/guns/randomgenerated/uzi/barrel/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/barrel/2.png b/items/active/starbound/guns/randomgenerated/uzi/barrel/2.png index 73e088f5..335be495 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/barrel/2.png and b/items/active/starbound/guns/randomgenerated/uzi/barrel/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/barrel/3.png b/items/active/starbound/guns/randomgenerated/uzi/barrel/3.png index 4b93a8fd..849b37f3 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/barrel/3.png and b/items/active/starbound/guns/randomgenerated/uzi/barrel/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/butt/1.png b/items/active/starbound/guns/randomgenerated/uzi/butt/1.png index c71e3921..78441a20 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/butt/1.png and b/items/active/starbound/guns/randomgenerated/uzi/butt/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/butt/2.png b/items/active/starbound/guns/randomgenerated/uzi/butt/2.png index 300b8825..d23a1b2c 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/butt/2.png and b/items/active/starbound/guns/randomgenerated/uzi/butt/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/butt/3.png b/items/active/starbound/guns/randomgenerated/uzi/butt/3.png index e35ed373..fcfe0a7d 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/butt/3.png and b/items/active/starbound/guns/randomgenerated/uzi/butt/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/butt/4.png b/items/active/starbound/guns/randomgenerated/uzi/butt/4.png index c35a4253..56fd0d5a 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/butt/4.png and b/items/active/starbound/guns/randomgenerated/uzi/butt/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/middle/1.png b/items/active/starbound/guns/randomgenerated/uzi/middle/1.png index 0dc7720b..5fa04ccf 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/middle/1.png and b/items/active/starbound/guns/randomgenerated/uzi/middle/1.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/middle/2.png b/items/active/starbound/guns/randomgenerated/uzi/middle/2.png index 46e62a79..d0d18d9e 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/middle/2.png and b/items/active/starbound/guns/randomgenerated/uzi/middle/2.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/middle/3.png b/items/active/starbound/guns/randomgenerated/uzi/middle/3.png index 0155722a..6ace563f 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/middle/3.png and b/items/active/starbound/guns/randomgenerated/uzi/middle/3.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/middle/4.png b/items/active/starbound/guns/randomgenerated/uzi/middle/4.png index 8981abfc..4f3f2a13 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/middle/4.png and b/items/active/starbound/guns/randomgenerated/uzi/middle/4.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi/middle/5.png b/items/active/starbound/guns/randomgenerated/uzi/middle/5.png index 7830155e..f2fa20b7 100644 Binary files a/items/active/starbound/guns/randomgenerated/uzi/middle/5.png and b/items/active/starbound/guns/randomgenerated/uzi/middle/5.png differ diff --git a/items/active/starbound/guns/randomgenerated/uzi.activeitem b/items/active/starbound/guns/randomgenerated/uzi/uzi.activeitem similarity index 77% rename from items/active/starbound/guns/randomgenerated/uzi.activeitem rename to items/active/starbound/guns/randomgenerated/uzi/uzi.activeitem index 56cc9aba..a7e08c9b 100644 --- a/items/active/starbound/guns/randomgenerated/uzi.activeitem +++ b/items/active/starbound/guns/randomgenerated/uzi/uzi.activeitem @@ -28,55 +28,48 @@ }, "elementalType": "physical", - + "primaryAbilityType": "sb_gun", "primaryAbility": { - "scripts": ["/items/active/weapons/ranged/gunfire.lua"], - "class": "GunFire", "projectileType": ["bullet-1", "bullet-2", "bullet-3", "bullet-4", "fast", "bouncybullet"], "fireTime": [0.07, 0.11], "baseDps": [7.5, 8], "energyUsage": [11, 13], "inaccuracy": [1, 5], - + "projectileParameters": { "knockbackRange": [0, 0.7] }, "stances": { "idle": { "armRotation": 0, - "weaponRotation": 0, - "twoHanded": false, - "allowRotate": true, - "allowFlip": true + "weaponRotation": 0 }, "fire": {}, "cooldown": { - "duration": 0, + "duration": 0.025, + "recoil": true, "armRotation": 2, - "weaponRotation": 2, - "twoHanded": false, - "allowRotate": true, - "allowFlip": true + "weaponRotation": 2 } } }, "builderConfig": [{ - "nameGenerator": "mpistolnames.config:nameGen", + "nameGenerator": "/items/active/starbound/guns/randomgenerated/machinepistol/mpistolnames.config:nameGen", "animationParts": { "barrel": { - "path": "uzi/barrel/.png", + "path": "barrel/.png", "variants": 3, "paletteSwap": true }, "butt": { - "path": "uzi/butt/.png", + "path": "butt/.png", "variants": 4, "paletteSwap": true }, "middle": { - "path": "uzi/middle/.png", + "path": "middle/.png", "variants": 5, "paletteSwap": true } diff --git a/items/active/starbound/guns/revolver.png b/items/active/starbound/guns/revolver.png index d7d98f5f..f5c3ab8b 100644 Binary files a/items/active/starbound/guns/revolver.png and b/items/active/starbound/guns/revolver.png differ diff --git a/items/active/starbound/guns/revolvericon.png b/items/active/starbound/guns/revolvericon.png index 09897d02..b14a2f2e 100644 Binary files a/items/active/starbound/guns/revolvericon.png and b/items/active/starbound/guns/revolvericon.png differ diff --git a/items/active/starbound/guns/shotgun.weaponability b/items/active/starbound/guns/shotgun.weaponability index e93acc0d..09ecdc61 100644 --- a/items/active/starbound/guns/shotgun.weaponability +++ b/items/active/starbound/guns/shotgun.weaponability @@ -1,6 +1,6 @@ { - "animationParts": {}, //TODO: why are these here - "animationCustom": {}, //are they even merged into the weapon + "animationParts": {}, + "animationCustom": {}, "ability": { "name": "Shotgun", diff --git a/items/active/starbound/guns/stingergun.activeitem b/items/active/starbound/guns/stingergun.activeitem new file mode 100644 index 00000000..eafbbe57 --- /dev/null +++ b/items/active/starbound/guns/stingergun.activeitem @@ -0,0 +1,68 @@ +{ + "itemName": "sb_stingergun", + "maxStack": 1, + "rarity": "rare", + "muzzleOffset": [1.75, 0.125], + "baseOffset": [-1.25, 0.375], + "price": 620, + "tooltipKind": "sb_gun", + "description": "", + "shortdescription": "Stinger Gun", + "category": "assaultRifle", + "twoHanded": true, + "sb_waBan": true, + "level": 1, + "itemTags": ["weapon", "ranged", "assaultrifle", "stingergun", "upgradeableWeapon"], + "tooltipFields": { + "subtitle": "Stinger Gun" + }, + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "inventoryIcon": "stingergun.png", + "animationParts": { + "muzzleFlash": "/animations/muzzleflash/bulletmuzzle3/bulletmuzzle3.png", + "butt": "stingergun.png", + "barrel": "", + "middle": "" + }, + "animationCustom": { + "animatedParts": { + "parts": { + "butt": { + "properties": { + "offset": [0.15, 0.25] + } + } + } + }, + "sounds": { + "fire": ["/sfx/gun/needler1.ogg"] + } + }, + + "elementalType": "physical", + "primaryAbilityType": "sb_gun2", + "primaryAbility": { + "projectileType": ["stingergunsting"], + "projectileParameters": { + "speed": 70, + "power": 5 + }, + "fireTime": [0.08, 0.16], + "baseDps": [8.25, 12.75], + "energyUsage": [45, 80], + "inaccuracy": 0.025, + "stances": { + "cooldown": { + "duration": 0.11 + } + } + }, + "altAbilityType": "sb_shotgun", + + "builderConfig": [{ + "nameGenerator": "needlernames.config:nameGen" + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/guns/stingergun.png b/items/active/starbound/guns/stingergun.png new file mode 100644 index 00000000..6c584564 Binary files /dev/null and b/items/active/starbound/guns/stingergun.png differ diff --git a/items/active/starbound/guns/tranquilizergun.png b/items/active/starbound/guns/tranquilizergun.png index 84e88143..8aa897c0 100644 Binary files a/items/active/starbound/guns/tranquilizergun.png and b/items/active/starbound/guns/tranquilizergun.png differ diff --git a/items/active/starbound/hawkeyes.activeitem b/items/active/starbound/hawkeyes/hawkeyes.activeitem similarity index 100% rename from items/active/starbound/hawkeyes.activeitem rename to items/active/starbound/hawkeyes/hawkeyes.activeitem diff --git a/items/active/starbound/hawkeyes.frames b/items/active/starbound/hawkeyes/hawkeyes.frames similarity index 100% rename from items/active/starbound/hawkeyes.frames rename to items/active/starbound/hawkeyes/hawkeyes.frames diff --git a/items/active/starbound/hawkeyes.lua b/items/active/starbound/hawkeyes/hawkeyes.lua similarity index 100% rename from items/active/starbound/hawkeyes.lua rename to items/active/starbound/hawkeyes/hawkeyes.lua diff --git a/items/active/starbound/hawkeyes.png b/items/active/starbound/hawkeyes/hawkeyes.png similarity index 100% rename from items/active/starbound/hawkeyes.png rename to items/active/starbound/hawkeyes/hawkeyes.png diff --git a/items/active/starbound/hawkeyes.projectile b/items/active/starbound/hawkeyes/hawkeyes.projectile similarity index 100% rename from items/active/starbound/hawkeyes.projectile rename to items/active/starbound/hawkeyes/hawkeyes.projectile diff --git a/items/active/starbound/hawkeyes2.lua b/items/active/starbound/hawkeyes/hawkeyes2.lua similarity index 100% rename from items/active/starbound/hawkeyes2.lua rename to items/active/starbound/hawkeyes/hawkeyes2.lua diff --git a/items/active/starbound/healthmonitor.activeitem b/items/active/starbound/healthmonitor.activeitem deleted file mode 100644 index 9e3858f7..00000000 --- a/items/active/starbound/healthmonitor.activeitem +++ /dev/null @@ -1,18 +0,0 @@ -{ - "itemName" : "sb_healthmonitor", - "inventoryIcon" : "healthmonitor.png", - "rarity" : "rare", - "maxStack" : 1, - "price" : 100, - "description" : "The health monitor displays your current health, energy, and hunger as numeric values.", - "shortdescription" : "Health Monitor", - "tooltipKind" : "sb_tool", - "largeImage" : "healthmonitor.png", - "category" : "tool", - "scriptDelta" : 1, - "itemTags" : ["sb_info"], - "animationScripts" : ["healthmonitor.lua"], - "scripts" : ["healthmonitor2.lua"], - "colors" : [["f72929","3bc431","d5ab36"],["ffa5a5","7bdc73","dfc068"]], - "resources" : ["health","energy","food"] -} \ No newline at end of file diff --git a/items/active/starbound/healthmonitor.png b/items/active/starbound/healthmonitor.png deleted file mode 100644 index 835f417c..00000000 Binary files a/items/active/starbound/healthmonitor.png and /dev/null differ diff --git a/items/active/starbound/healthmonitor/healthmonitor.activeitem b/items/active/starbound/healthmonitor/healthmonitor.activeitem new file mode 100644 index 00000000..17c1447c --- /dev/null +++ b/items/active/starbound/healthmonitor/healthmonitor.activeitem @@ -0,0 +1,18 @@ +{ + "itemName": "sb_healthmonitor", + "inventoryIcon": "healthmonitor.png", + "rarity": "rare", + "maxStack": 1, + "price": 100, + "description": "This device displays your current health, energy, and hunger as numeric values.", + "shortdescription": "Health Monitor", + "tooltipKind": "sb_tool", + "largeImage": "healthmonitor.png", + "category": "tool", + "scriptDelta": 1, + "itemTags": ["sb_info"], + "animationScripts": ["healthmonitor.lua"], + "scripts": ["healthmonitor2.lua"], + "colors": [["f72929", "3bc431", "d5ab36"], ["ffa5a5", "7bdc73", "dfc068"]], + "resources": ["health", "energy", "food"] +} diff --git a/items/active/starbound/healthmonitor.lua b/items/active/starbound/healthmonitor/healthmonitor.lua similarity index 81% rename from items/active/starbound/healthmonitor.lua rename to items/active/starbound/healthmonitor/healthmonitor.lua index b7ef2d12..609b5b41 100644 --- a/items/active/starbound/healthmonitor.lua +++ b/items/active/starbound/healthmonitor/healthmonitor.lua @@ -15,11 +15,11 @@ function update(dt) k = 1 for i = 1, #c do for j = 1, #c[i] do - localAnimator.addDrawable({image="/interface/sb_numbers.png:"..c[i]:sub(j,j).."?replace;fff="..colors[c[i]==m[i] and 1 or 2][i],fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") + localAnimator.addDrawable({image="/interface/sb_numbers.png:"..c[i]:sub(j,j).."?replace;fff="..colors[c[i]==m[i] and 1 or 2][i]..";000=0000?border;1;333;0000",fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") k=k+1 end if i ~= #c then - localAnimator.addDrawable({image="/interface/sb_numbers.png:13",fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") + localAnimator.addDrawable({image="/interface/sb_numbers.png:13?replace;000=0000?border;1;333;0000",fullbright=true,position={pos[1]+(k/1.6),pos[2]}},"overlay") k=k+1 end end diff --git a/items/active/starbound/healthmonitor/healthmonitor.png b/items/active/starbound/healthmonitor/healthmonitor.png new file mode 100644 index 00000000..e5e4fc4d Binary files /dev/null and b/items/active/starbound/healthmonitor/healthmonitor.png differ diff --git a/items/active/starbound/healthmonitor2.lua b/items/active/starbound/healthmonitor/healthmonitor2.lua similarity index 100% rename from items/active/starbound/healthmonitor2.lua rename to items/active/starbound/healthmonitor/healthmonitor2.lua diff --git a/items/active/starbound/itembox/itembox.activeitem b/items/active/starbound/itembox/itembox.activeitem index 7e78dbb0..aca2b6f4 100644 --- a/items/active/starbound/itembox/itembox.activeitem +++ b/items/active/starbound/itembox/itembox.activeitem @@ -1,24 +1,32 @@ { - "itemName" : "sb_itembox", - "price" : 10, - "maxStack" : 1, - "rarity" : "Legendary", - "tooltipKind" : "sb_object", - "category" : "other", - "tooltipFields" : {"subtitle" : "Mysterious Reward"}, - "description" : "A parcel, wrapped up nicely with ribbon!", - "shortdescription" : "Parcel", - "twoHanded" : true, - "sb_dyeable" : true, - "directives" : "?replace;ffca8a=b2e89d;e0975c=51bd3b;a85636=247824", + "itemName": "sb_itembox", + "price": 10, + "maxStack": 1, + "rarity": "Legendary", + "tooltipKind": "sb_object", + "category": "other", + "tooltipFields": { + "subtitle": "Mysterious Reward" + }, + "description": "A parcel, wrapped up nicely with ribbon!", + "shortdescription": "Parcel", + "twoHanded": true, + "sb_dyeable": true, + "directives": "?replace;ffca8a=b2e89d;e0975c=51bd3b;a85636=247824", - "inventoryIcon" : "itembox.png", - "animation" : "itembox.animation", - "animationCustom" : {"animatedParts":{"gun":"itembox.png"}}, - "animationParts" : {"gun":"itembox.png"}, - "scripts" : ["itembox.lua"], - "builder" : "/items/buildscripts/starbound/builditembox.lua", + "inventoryIcon": "itembox.png", + "animation": "itembox.animation", + "animationCustom": { + "animatedParts": { + "gun": "itembox.png" + } + }, + "animationParts": { + "gun": "itembox.png" + }, + "scripts": ["itembox.lua"], + "builder": "/items/buildscripts/starbound/builditembox.lua", - "fireTime" : 2, - "items" : "sb_wrappingpaper" -} \ No newline at end of file + "fireTime": 2, + "items": "sb_wrappingpaper" +} diff --git a/items/active/starbound/itembox/itembox.png b/items/active/starbound/itembox/itembox.png index 401cdd98..eb65fc40 100644 Binary files a/items/active/starbound/itembox/itembox.png and b/items/active/starbound/itembox/itembox.png differ diff --git a/items/active/starbound/ladderdeployer.activeitem b/items/active/starbound/ladderdeployer/ladderdeployer.activeitem similarity index 100% rename from items/active/starbound/ladderdeployer.activeitem rename to items/active/starbound/ladderdeployer/ladderdeployer.activeitem diff --git a/items/active/starbound/ladderdeployer.lua b/items/active/starbound/ladderdeployer/ladderdeployer.lua similarity index 100% rename from items/active/starbound/ladderdeployer.lua rename to items/active/starbound/ladderdeployer/ladderdeployer.lua diff --git a/items/active/starbound/ladderdeployer.png b/items/active/starbound/ladderdeployer/ladderdeployer.png similarity index 100% rename from items/active/starbound/ladderdeployer.png rename to items/active/starbound/ladderdeployer/ladderdeployer.png diff --git a/items/active/starbound/ladderplacementpreview.lua b/items/active/starbound/ladderdeployer/ladderplacementpreview.lua similarity index 100% rename from items/active/starbound/ladderplacementpreview.lua rename to items/active/starbound/ladderdeployer/ladderplacementpreview.lua diff --git a/items/active/starbound/light2energy.activeitem b/items/active/starbound/light2energy.activeitem deleted file mode 100644 index 81beb42f..00000000 --- a/items/active/starbound/light2energy.activeitem +++ /dev/null @@ -1,14 +0,0 @@ -{ - "itemName" : "sb_light2energy", - "inventoryIcon" : "light2energy.png", - "largeImage" : "light2energy.png", - "rarity" : "legendary", - "maxStack" : 1, - "price" : 3000, - "description" : "A large toxic flower which converts light into energy when held.", - "shortdescription" : "Toxic Flower", - "tooltipKind" : "sb_tool", - "category" : "tool", - "effects" : ["sb_light2energy192"], - "scripts" : ["effect.lua"] -} \ No newline at end of file diff --git a/items/active/starbound/parachutepack.activeitem b/items/active/starbound/parachutepack.activeitem deleted file mode 100644 index 92fc3600..00000000 --- a/items/active/starbound/parachutepack.activeitem +++ /dev/null @@ -1,14 +0,0 @@ -{ - "itemName" : "sb_parachutepack", - "inventoryIcon" : "parachute.png", - "largeImage" : "parachute.png", - "rarity" : "legendary", - "maxStack" : 1, - "price" : 3000, - "description" : "An automatic parachute. No more free-falling!", - "shortdescription" : "Handheld Parachute", - "tooltipKind" : "sb_tool", - "category" : "tool", - "effects" : ["sb_glide"], - "scripts" : ["effect.lua"] -} \ No newline at end of file diff --git a/items/active/starbound/partypopper/muzzleflash.png b/items/active/starbound/partypopper/muzzleflash.png index 545490ea..e9a93828 100644 Binary files a/items/active/starbound/partypopper/muzzleflash.png and b/items/active/starbound/partypopper/muzzleflash.png differ diff --git a/items/active/starbound/portable3dprinter/portable3dprinter.activeitem b/items/active/starbound/portable3dprinter/portable3dprinter.activeitem new file mode 100644 index 00000000..303ec94b --- /dev/null +++ b/items/active/starbound/portable3dprinter/portable3dprinter.activeitem @@ -0,0 +1,12 @@ +{ + "itemName": "sb_portable3dprinter", + "rarity": "Legendary", + "category": "tool", + "price": 750, + "tooltipKind": "sb_object", + "inventoryIcon": "portable3dprinter.png", //slightly modified icon with 254 alpha + "animation": "portable3dprinter.animation", + "shortdescription": "^orange;Portable Pixel Printer^reset;", + "description": "Used to print small hi-tech items on-the-fly.", + "scripts": ["portable3dprinter.lua"] +} diff --git a/items/active/starbound/portable3dprinter/portable3dprinter.animation b/items/active/starbound/portable3dprinter/portable3dprinter.animation new file mode 100644 index 00000000..5905bac5 --- /dev/null +++ b/items/active/starbound/portable3dprinter/portable3dprinter.animation @@ -0,0 +1,6 @@ +{ + "sounds": { + "error": ["/sfx/interface/clickon_error.ogg"], + "success": ["/sfx/interface/stationtransponder_valid2.ogg"] + } +} diff --git a/items/active/starbound/portable3dprinter/portable3dprinter.lua b/items/active/starbound/portable3dprinter/portable3dprinter.lua new file mode 100644 index 00000000..a82ef6e6 --- /dev/null +++ b/items/active/starbound/portable3dprinter/portable3dprinter.lua @@ -0,0 +1,22 @@ +require "/scripts/sb_uimessage.lua" +require "/scripts/activeitem/sb_cursors.lua" + +function init() + sb_cursor("power") + activeItem.setHoldingItem(false) +end + +function activate() + local pos = world.entityPosition(activeItem.ownerEntityId()) + if world.isTileProtected(pos) then + sb_uiMessage("areaProtected") + animator.playSound("error") + return + end + if world.placeObject("sb_portable3dprinterobject", pos) then + animator.playSound("success") + else + animator.playSound("error") + sb_uiMessage("noSpaceForObject") + end +end \ No newline at end of file diff --git a/items/active/starbound/portable3dprinter/portable3dprinter.png b/items/active/starbound/portable3dprinter/portable3dprinter.png new file mode 100644 index 00000000..38960f7e Binary files /dev/null and b/items/active/starbound/portable3dprinter/portable3dprinter.png differ diff --git a/items/active/starbound/radio.activeitem b/items/active/starbound/radio.activeitem index 7842e647..845c54ea 100644 --- a/items/active/starbound/radio.activeitem +++ b/items/active/starbound/radio.activeitem @@ -1,16 +1,18 @@ { - "itemName" : "sb_songbook", - "inventoryIcon" : "radio.png", - "rarity" : "rare", - "maxStack" : 1, - "price" : 300, - "description" : "All your music in one space!", - "shortdescription" : "Portable Radio", - "tooltipKind" : "sb_tool", - "largeImage" : "radio.png", - "category" : "musicalInstrument", - "collectablesOnPickup" : {"sb_music" : "jukebox"}, - "scriptDelta" : 0, - "scripts" : ["interface.lua"], - "interactAction" : ["scriptPane","/interface/scripted/sb_music/music.config"] -} \ No newline at end of file + "itemName": "sb_songbook", + "inventoryIcon": "radio.png", + "rarity": "rare", + "maxStack": 1, + "price": 300, + "description": "All your music in one space!", + "shortdescription": "Portable Radio", + "tooltipKind": "sb_tool", + "largeImage": "radio.png", + "category": "musicalInstrument", + "collectablesOnPickup": { + "sb_music": "jukebox" + }, + "scriptDelta": 0, + "scripts": ["interface.lua"], //maybe move it to the scripts folder, like cursor and swingable? + "interactAction": ["scriptPane", "/interface/scripted/sb_music/music.config"] +} diff --git a/items/active/starbound/spaceairtank.activeitem b/items/active/starbound/spaceairtank.activeitem deleted file mode 100644 index 5d7ff502..00000000 --- a/items/active/starbound/spaceairtank.activeitem +++ /dev/null @@ -1,14 +0,0 @@ -{ - "itemName" : "sb_spaceairtank", - "inventoryIcon" : "spaceairtank.png", - "largeImage" : "spaceairtank.png", - "rarity" : "legendary", - "maxStack" : 1, - "price" : 3000, - "description" : "This device creates a breathable field of oxygen around the wearer when held.", - "shortdescription" : "Survival System", - "tooltipKind" : "sb_tool", - "category" : "tool", - "effects" : ["sb_breathprotectiontech"], - "scripts" : ["effect.lua"] -} \ No newline at end of file diff --git a/items/active/starbound/spaceairtank.png b/items/active/starbound/spaceairtank.png deleted file mode 100644 index f0fe9856..00000000 Binary files a/items/active/starbound/spaceairtank.png and /dev/null differ diff --git a/items/active/starbound/staves/biofb.png b/items/active/starbound/staves/biofb.png index 9553cb3f..15bfb448 100644 Binary files a/items/active/starbound/staves/biofb.png and b/items/active/starbound/staves/biofb.png differ diff --git a/items/active/starbound/staves/bioglow.png b/items/active/starbound/staves/bioglow.png index 82ac916c..886573b3 100644 Binary files a/items/active/starbound/staves/bioglow.png and b/items/active/starbound/staves/bioglow.png differ diff --git a/items/active/starbound/staves/biostaff.activeitem b/items/active/starbound/staves/biostaff.activeitem index f7f6fd14..0a5a17ce 100644 --- a/items/active/starbound/staves/biostaff.activeitem +++ b/items/active/starbound/staves/biostaff.activeitem @@ -34,10 +34,7 @@ "projectileParameters": { "speed": 0, "baseDamage": 14, - "color": [255, 10, 10], - "damageTeam": { - "type": "indiscriminate" - } + "color": [255, 10, 10] } }, "altAbility": { @@ -45,6 +42,9 @@ "energyPerShot": 7, "projectileParameters": { "baseDamage": 0, + "damageTeam": { + "type": "indiscriminate" + }, "statusEffects": [{ "effect": "glow", "duration": 180 diff --git a/items/active/starbound/staves/biostaff.png b/items/active/starbound/staves/biostaff.png index cfb94757..5bb9b199 100644 Binary files a/items/active/starbound/staves/biostaff.png and b/items/active/starbound/staves/biostaff.png differ diff --git a/items/active/starbound/staves/boulderfb.png b/items/active/starbound/staves/boulderfb.png index 1f3f277d..c22ad65a 100644 Binary files a/items/active/starbound/staves/boulderfb.png and b/items/active/starbound/staves/boulderfb.png differ diff --git a/items/active/starbound/staves/boulderstaff.png b/items/active/starbound/staves/boulderstaff.png index 33f8a172..158e92d7 100644 Binary files a/items/active/starbound/staves/boulderstaff.png and b/items/active/starbound/staves/boulderstaff.png differ diff --git a/items/active/starbound/staves/fleshglow.png b/items/active/starbound/staves/fleshglow.png index 1a3459b5..a26113e5 100644 Binary files a/items/active/starbound/staves/fleshglow.png and b/items/active/starbound/staves/fleshglow.png differ diff --git a/items/active/starbound/staves/fleshstaff.activeitem b/items/active/starbound/staves/fleshstaff.activeitem index 78c436d5..4f6df5de 100644 --- a/items/active/starbound/staves/fleshstaff.activeitem +++ b/items/active/starbound/staves/fleshstaff.activeitem @@ -37,10 +37,7 @@ "primaryAbility": { "projectileType": "sb_fleshseedspawn", "projectileParameters": { - "baseDamage": 8, - "damageTeam": { - "type": "indiscriminate" - } + "baseDamage": 8 } }, "builder": "/items/buildscripts/starbound/buildunrandweapon.lua" diff --git a/items/active/starbound/staves/fleshstaff.png b/items/active/starbound/staves/fleshstaff.png index faca6fbf..144dbcb9 100644 Binary files a/items/active/starbound/staves/fleshstaff.png and b/items/active/starbound/staves/fleshstaff.png differ diff --git a/items/active/starbound/staves/oceantrident.activeitem b/items/active/starbound/staves/oceantrident.activeitem index 0d1215e2..c34da3ad 100644 --- a/items/active/starbound/staves/oceantrident.activeitem +++ b/items/active/starbound/staves/oceantrident.activeitem @@ -23,10 +23,7 @@ "primaryAbility": { "projectileType": "randomfish", "projectileParameters": { - "baseDamage": 8, - "damageTeam": { - "type": "indiscriminate" - } + "baseDamage": 8 } }, diff --git a/items/active/starbound/staves/oceantrident.png b/items/active/starbound/staves/oceantrident.png index 6bcca251..c3a5859d 100644 Binary files a/items/active/starbound/staves/oceantrident.png and b/items/active/starbound/staves/oceantrident.png differ diff --git a/items/active/starbound/staves/racialstaves/apexsteelstaff1.png b/items/active/starbound/staves/racialstaves/apexsteelstaff1.png index bc501edd..685214b8 100644 Binary files a/items/active/starbound/staves/racialstaves/apexsteelstaff1.png and b/items/active/starbound/staves/racialstaves/apexsteelstaff1.png differ diff --git a/items/active/starbound/staves/racialstaves/apexsteelstaff2.png b/items/active/starbound/staves/racialstaves/apexsteelstaff2.png index 3797b8bc..8443a412 100644 Binary files a/items/active/starbound/staves/racialstaves/apexsteelstaff2.png and b/items/active/starbound/staves/racialstaves/apexsteelstaff2.png differ diff --git a/items/active/starbound/staves/racialstaves/aquastaff2glow.png b/items/active/starbound/staves/racialstaves/aquastaff2glow.png index 602c27d2..cf940b33 100644 Binary files a/items/active/starbound/staves/racialstaves/aquastaff2glow.png and b/items/active/starbound/staves/racialstaves/aquastaff2glow.png differ diff --git a/items/active/starbound/staves/racialstaves/aquastaffglow.png b/items/active/starbound/staves/racialstaves/aquastaffglow.png index 37d78fbc..cdbd1581 100644 Binary files a/items/active/starbound/staves/racialstaves/aquastaffglow.png and b/items/active/starbound/staves/racialstaves/aquastaffglow.png differ diff --git a/items/active/starbound/staves/racialstaves/aviancrystalstaff2.png b/items/active/starbound/staves/racialstaves/aviancrystalstaff2.png index d8342af8..f5eb7a50 100644 Binary files a/items/active/starbound/staves/racialstaves/aviancrystalstaff2.png and b/items/active/starbound/staves/racialstaves/aviancrystalstaff2.png differ diff --git a/items/active/starbound/staves/racialstaves/crystalstaff2glow.png b/items/active/starbound/staves/racialstaves/crystalstaff2glow.png index ac55a916..a9110e9a 100644 Binary files a/items/active/starbound/staves/racialstaves/crystalstaff2glow.png and b/items/active/starbound/staves/racialstaves/crystalstaff2glow.png differ diff --git a/items/active/starbound/staves/racialstaves/crystalstaffglow.png b/items/active/starbound/staves/racialstaves/crystalstaffglow.png index 4829d534..1f815f21 100644 Binary files a/items/active/starbound/staves/racialstaves/crystalstaffglow.png and b/items/active/starbound/staves/racialstaves/crystalstaffglow.png differ diff --git a/items/active/starbound/staves/racialstaves/floranleafstaff2.png b/items/active/starbound/staves/racialstaves/floranleafstaff2.png index dd3e3059..b5f07f9d 100644 Binary files a/items/active/starbound/staves/racialstaves/floranleafstaff2.png and b/items/active/starbound/staves/racialstaves/floranleafstaff2.png differ diff --git a/items/active/starbound/staves/racialstaves/glitchglitchstaff1.png b/items/active/starbound/staves/racialstaves/glitchglitchstaff1.png index 4c691ccf..0850c8f9 100644 Binary files a/items/active/starbound/staves/racialstaves/glitchglitchstaff1.png and b/items/active/starbound/staves/racialstaves/glitchglitchstaff1.png differ diff --git a/items/active/starbound/staves/racialstaves/glitchglitchstaff2.png b/items/active/starbound/staves/racialstaves/glitchglitchstaff2.png index 03b959fe..89d1a942 100644 Binary files a/items/active/starbound/staves/racialstaves/glitchglitchstaff2.png and b/items/active/starbound/staves/racialstaves/glitchglitchstaff2.png differ diff --git a/items/active/starbound/staves/racialstaves/glitchstaff2glow.png b/items/active/starbound/staves/racialstaves/glitchstaff2glow.png index 22874d77..2804b931 100644 Binary files a/items/active/starbound/staves/racialstaves/glitchstaff2glow.png and b/items/active/starbound/staves/racialstaves/glitchstaff2glow.png differ diff --git a/items/active/starbound/staves/racialstaves/glitchstaffglow.png b/items/active/starbound/staves/racialstaves/glitchstaffglow.png index 581f4bb0..5cea3b2b 100644 Binary files a/items/active/starbound/staves/racialstaves/glitchstaffglow.png and b/items/active/starbound/staves/racialstaves/glitchstaffglow.png differ diff --git a/items/active/starbound/staves/racialstaves/humanplasmastaff1.png b/items/active/starbound/staves/racialstaves/humanplasmastaff1.png index 2a4f65db..cf3d1f22 100644 Binary files a/items/active/starbound/staves/racialstaves/humanplasmastaff1.png and b/items/active/starbound/staves/racialstaves/humanplasmastaff1.png differ diff --git a/items/active/starbound/staves/racialstaves/humanplasmastaff2.png b/items/active/starbound/staves/racialstaves/humanplasmastaff2.png index a74cc0ad..70d9cc73 100644 Binary files a/items/active/starbound/staves/racialstaves/humanplasmastaff2.png and b/items/active/starbound/staves/racialstaves/humanplasmastaff2.png differ diff --git a/items/active/starbound/staves/racialstaves/leafstaff2glow.png b/items/active/starbound/staves/racialstaves/leafstaff2glow.png index 43f03ec8..3e34b2cd 100644 Binary files a/items/active/starbound/staves/racialstaves/leafstaff2glow.png and b/items/active/starbound/staves/racialstaves/leafstaff2glow.png differ diff --git a/items/active/starbound/staves/racialstaves/leafstaffglow.png b/items/active/starbound/staves/racialstaves/leafstaffglow.png index 80312119..6b2b6c45 100644 Binary files a/items/active/starbound/staves/racialstaves/leafstaffglow.png and b/items/active/starbound/staves/racialstaves/leafstaffglow.png differ diff --git a/items/active/starbound/staves/racialstaves/novakidlightstaff1.png b/items/active/starbound/staves/racialstaves/novakidlightstaff1.png index 0368d362..2e848212 100644 Binary files a/items/active/starbound/staves/racialstaves/novakidlightstaff1.png and b/items/active/starbound/staves/racialstaves/novakidlightstaff1.png differ diff --git a/items/active/starbound/staves/racialstaves/novakidlightstaff2.png b/items/active/starbound/staves/racialstaves/novakidlightstaff2.png index a445da81..a5b4f20b 100644 Binary files a/items/active/starbound/staves/racialstaves/novakidlightstaff2.png and b/items/active/starbound/staves/racialstaves/novakidlightstaff2.png differ diff --git a/items/active/starbound/staves/racialstaves/plasmastaff2glow.png b/items/active/starbound/staves/racialstaves/plasmastaff2glow.png index 78cb73ef..7512608f 100644 Binary files a/items/active/starbound/staves/racialstaves/plasmastaff2glow.png and b/items/active/starbound/staves/racialstaves/plasmastaff2glow.png differ diff --git a/items/active/starbound/staves/racialstaves/plasmastaffglow.png b/items/active/starbound/staves/racialstaves/plasmastaffglow.png index beb08ccb..ce02b1ec 100644 Binary files a/items/active/starbound/staves/racialstaves/plasmastaffglow.png and b/items/active/starbound/staves/racialstaves/plasmastaffglow.png differ diff --git a/items/active/starbound/staves/racialstaves/steelstaff2glow.png b/items/active/starbound/staves/racialstaves/steelstaff2glow.png index 2b61d3dc..8c75f3c3 100644 Binary files a/items/active/starbound/staves/racialstaves/steelstaff2glow.png and b/items/active/starbound/staves/racialstaves/steelstaff2glow.png differ diff --git a/items/active/starbound/staves/racialstaves/steelstaffglow.png b/items/active/starbound/staves/racialstaves/steelstaffglow.png index 3b32256d..270edea6 100644 Binary files a/items/active/starbound/staves/racialstaves/steelstaffglow.png and b/items/active/starbound/staves/racialstaves/steelstaffglow.png differ diff --git a/items/active/starbound/staves/scistaff.activeitem b/items/active/starbound/staves/scistaff.activeitem index 8ba124bc..7bfe330e 100644 --- a/items/active/starbound/staves/scistaff.activeitem +++ b/items/active/starbound/staves/scistaff.activeitem @@ -33,10 +33,7 @@ "projectileType": "icebreath", "projectileParameters": { "speed": 0, - "baseDamage": 8, - "damageTeam": { - "type": "indiscriminate" - } + "baseDamage": 8 } }, "builder": "/items/buildscripts/starbound/buildunrandweapon.lua" diff --git a/items/active/starbound/staves/scistaff.png b/items/active/starbound/staves/scistaff.png index 121117bf..5931a345 100644 Binary files a/items/active/starbound/staves/scistaff.png and b/items/active/starbound/staves/scistaff.png differ diff --git a/items/active/starbound/staves/slimeglow.png b/items/active/starbound/staves/slimeglow.png index 27848aa1..35694a09 100644 Binary files a/items/active/starbound/staves/slimeglow.png and b/items/active/starbound/staves/slimeglow.png differ diff --git a/items/active/starbound/staves/slimestaff.activeitem b/items/active/starbound/staves/slimestaff.activeitem index ace04e06..cad2f84b 100644 --- a/items/active/starbound/staves/slimestaff.activeitem +++ b/items/active/starbound/staves/slimestaff.activeitem @@ -40,10 +40,7 @@ "effect": "slimeslow", "duration": 5 } - ], - "damageTeam": { - "type": "indiscriminate" - } + ] } }, "builder": "/items/buildscripts/starbound/buildunrandweapon.lua" diff --git a/items/active/starbound/staves/slimestaff.png b/items/active/starbound/staves/slimestaff.png index bd35e1f7..c84db34c 100644 Binary files a/items/active/starbound/staves/slimestaff.png and b/items/active/starbound/staves/slimestaff.png differ diff --git a/items/active/starbound/staves/uraniumglow.png b/items/active/starbound/staves/uraniumglow.png index af005f41..949ed65d 100644 Binary files a/items/active/starbound/staves/uraniumglow.png and b/items/active/starbound/staves/uraniumglow.png differ diff --git a/items/active/starbound/staves/uraniumrodstaff.png b/items/active/starbound/staves/uraniumrodstaff.png index 4da4e608..a8ab84e9 100644 Binary files a/items/active/starbound/staves/uraniumrodstaff.png and b/items/active/starbound/staves/uraniumrodstaff.png differ diff --git a/items/active/starbound/watch.activeitem b/items/active/starbound/watch/watch.activeitem similarity index 100% rename from items/active/starbound/watch.activeitem rename to items/active/starbound/watch/watch.activeitem diff --git a/items/active/starbound/watch.lua b/items/active/starbound/watch/watch.lua similarity index 89% rename from items/active/starbound/watch.lua rename to items/active/starbound/watch/watch.lua index 3aa55b34..decaeabc 100644 --- a/items/active/starbound/watch.lua +++ b/items/active/starbound/watch/watch.lua @@ -20,7 +20,7 @@ function read(d,hr,m) m = m:reverse() local time = {hr:sub(1,1),hr:sub(2,2),11,#m==2 and m:sub(2,2) or 0, m:sub(1,1)} for i = 1, #time do - localAnimator.addDrawable({image="/interface/sb_numbers.png:"..time[i],fullbright=true,position={pos[1]+(i/1.6),pos[2]}},"overlay") + localAnimator.addDrawable({image="/interface/sb_numbers.png:"..time[i].."?replace;000=0000?border;1;333;0000",fullbright=true,position={pos[1]+(i/1.6),pos[2]}},"overlay") end localAnimator.addDrawable({image=d and "/interface/tooltips/warmth.png?replace;454545=0000" or "/interface/bookmarks/icons/moon.png",fullbright=true,position={pos[1]+((#time+1.5)/1.6),pos[2]+0.125},scale=0.5},"overlay") end \ No newline at end of file diff --git a/items/active/starbound/watch.png b/items/active/starbound/watch/watch.png similarity index 100% rename from items/active/starbound/watch.png rename to items/active/starbound/watch/watch.png diff --git a/items/active/starbound/watch2.lua b/items/active/starbound/watch/watch2.lua similarity index 100% rename from items/active/starbound/watch2.lua rename to items/active/starbound/watch/watch2.lua diff --git a/items/active/starbound/wateringcan.png b/items/active/starbound/wateringcan.png deleted file mode 100644 index a23d98bf..00000000 Binary files a/items/active/starbound/wateringcan.png and /dev/null differ diff --git a/items/active/starbound/wateringcan.activeitem b/items/active/starbound/wateringcan/wateringcan.activeitem similarity index 100% rename from items/active/starbound/wateringcan.activeitem rename to items/active/starbound/wateringcan/wateringcan.activeitem diff --git a/items/active/starbound/wateringcan/wateringcan.png b/items/active/starbound/wateringcan/wateringcan.png new file mode 100644 index 00000000..a8db0602 Binary files /dev/null and b/items/active/starbound/wateringcan/wateringcan.png differ diff --git a/items/active/starbound/wateringcanicon.png b/items/active/starbound/wateringcan/wateringcanicon.png similarity index 100% rename from items/active/starbound/wateringcanicon.png rename to items/active/starbound/wateringcan/wateringcanicon.png diff --git a/items/active/starbound/weapons/axe.weaponability b/items/active/starbound/weapons/axe.weaponability index 6b913f13..c66df198 100644 --- a/items/active/starbound/weapons/axe.weaponability +++ b/items/active/starbound/weapons/axe.weaponability @@ -16,7 +16,8 @@ "statusEffects": [], "knockbackMode": "aim", "knockback": 18, - "timeoutGroup": "primary" + "timeoutGroup": "primary", + "timeout": 0.5 }, "stances": { "idle": { diff --git a/items/active/starbound/weapons/axes/apex/t3.png b/items/active/starbound/weapons/axes/apex/t3.png index 129cbefd..ca86c66b 100644 Binary files a/items/active/starbound/weapons/axes/apex/t3.png and b/items/active/starbound/weapons/axes/apex/t3.png differ diff --git a/items/active/starbound/weapons/axes/apex/t4.png b/items/active/starbound/weapons/axes/apex/t4.png index 6c1eb77c..5ac0fb52 100644 Binary files a/items/active/starbound/weapons/axes/apex/t4.png and b/items/active/starbound/weapons/axes/apex/t4.png differ diff --git a/items/active/starbound/weapons/axes/apex/t5a.png b/items/active/starbound/weapons/axes/apex/t5a.png index 017dfa25..8eb8d91d 100644 Binary files a/items/active/starbound/weapons/axes/apex/t5a.png and b/items/active/starbound/weapons/axes/apex/t5a.png differ diff --git a/items/active/starbound/weapons/axes/apex/t5m.png b/items/active/starbound/weapons/axes/apex/t5m.png index e3d59e75..54135b58 100644 Binary files a/items/active/starbound/weapons/axes/apex/t5m.png and b/items/active/starbound/weapons/axes/apex/t5m.png differ diff --git a/items/active/starbound/weapons/axes/apex/t5s.png b/items/active/starbound/weapons/axes/apex/t5s.png index edc4a8dd..a34a3ad1 100644 Binary files a/items/active/starbound/weapons/axes/apex/t5s.png and b/items/active/starbound/weapons/axes/apex/t5s.png differ diff --git a/items/active/starbound/weapons/axes/apex/t6a.png b/items/active/starbound/weapons/axes/apex/t6a.png index 22743d7a..7422a61d 100644 Binary files a/items/active/starbound/weapons/axes/apex/t6a.png and b/items/active/starbound/weapons/axes/apex/t6a.png differ diff --git a/items/active/starbound/weapons/axes/apex/t6m.png b/items/active/starbound/weapons/axes/apex/t6m.png index 60ae1e5f..9f30ea26 100644 Binary files a/items/active/starbound/weapons/axes/apex/t6m.png and b/items/active/starbound/weapons/axes/apex/t6m.png differ diff --git a/items/active/starbound/weapons/axes/apex/t6s.png b/items/active/starbound/weapons/axes/apex/t6s.png index 9adaedec..cd5c85a0 100644 Binary files a/items/active/starbound/weapons/axes/apex/t6s.png and b/items/active/starbound/weapons/axes/apex/t6s.png differ diff --git a/items/active/starbound/weapons/axes/avian/t2.png b/items/active/starbound/weapons/axes/avian/t2.png index 8e535d09..ed9229de 100644 Binary files a/items/active/starbound/weapons/axes/avian/t2.png and b/items/active/starbound/weapons/axes/avian/t2.png differ diff --git a/items/active/starbound/weapons/axes/avian/t3.png b/items/active/starbound/weapons/axes/avian/t3.png index 58fea387..6c7421c3 100644 Binary files a/items/active/starbound/weapons/axes/avian/t3.png and b/items/active/starbound/weapons/axes/avian/t3.png differ diff --git a/items/active/starbound/weapons/axes/avian/t4.png b/items/active/starbound/weapons/axes/avian/t4.png index 5a116581..bedb5fe6 100644 Binary files a/items/active/starbound/weapons/axes/avian/t4.png and b/items/active/starbound/weapons/axes/avian/t4.png differ diff --git a/items/active/starbound/weapons/axes/avian/t5a.png b/items/active/starbound/weapons/axes/avian/t5a.png index 5672be8a..800e7060 100644 Binary files a/items/active/starbound/weapons/axes/avian/t5a.png and b/items/active/starbound/weapons/axes/avian/t5a.png differ diff --git a/items/active/starbound/weapons/axes/avian/t5s.png b/items/active/starbound/weapons/axes/avian/t5s.png index 9bdccd94..465d9670 100644 Binary files a/items/active/starbound/weapons/axes/avian/t5s.png and b/items/active/starbound/weapons/axes/avian/t5s.png differ diff --git a/items/active/starbound/weapons/axes/avian/t6a.png b/items/active/starbound/weapons/axes/avian/t6a.png index a740255a..29f1b7d2 100644 Binary files a/items/active/starbound/weapons/axes/avian/t6a.png and b/items/active/starbound/weapons/axes/avian/t6a.png differ diff --git a/items/active/starbound/weapons/axes/avian/t6m.png b/items/active/starbound/weapons/axes/avian/t6m.png index 10aeec40..59dbab35 100644 Binary files a/items/active/starbound/weapons/axes/avian/t6m.png and b/items/active/starbound/weapons/axes/avian/t6m.png differ diff --git a/items/active/starbound/weapons/axes/avian/t6s.png b/items/active/starbound/weapons/axes/avian/t6s.png index b5ac906b..c8eedf01 100644 Binary files a/items/active/starbound/weapons/axes/avian/t6s.png and b/items/active/starbound/weapons/axes/avian/t6s.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/1.png b/items/active/starbound/weapons/axes/axe/blade/1.png index f832584b..5c087cbd 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/1.png and b/items/active/starbound/weapons/axes/axe/blade/1.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/11.png b/items/active/starbound/weapons/axes/axe/blade/11.png index 658337ff..c004b89c 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/11.png and b/items/active/starbound/weapons/axes/axe/blade/11.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/12.png b/items/active/starbound/weapons/axes/axe/blade/12.png index 3c5115fc..92e8938b 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/12.png and b/items/active/starbound/weapons/axes/axe/blade/12.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/13.png b/items/active/starbound/weapons/axes/axe/blade/13.png index efd2dab7..ffd13315 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/13.png and b/items/active/starbound/weapons/axes/axe/blade/13.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/15.png b/items/active/starbound/weapons/axes/axe/blade/15.png index 39989894..16e15458 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/15.png and b/items/active/starbound/weapons/axes/axe/blade/15.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/16.png b/items/active/starbound/weapons/axes/axe/blade/16.png index 98572c9f..06052dac 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/16.png and b/items/active/starbound/weapons/axes/axe/blade/16.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/18.png b/items/active/starbound/weapons/axes/axe/blade/18.png index 3d57c01c..024cecdf 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/18.png and b/items/active/starbound/weapons/axes/axe/blade/18.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/20.png b/items/active/starbound/weapons/axes/axe/blade/20.png index cb25440b..f2e50943 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/20.png and b/items/active/starbound/weapons/axes/axe/blade/20.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/21.png b/items/active/starbound/weapons/axes/axe/blade/21.png index 3249b0e0..8c248ca4 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/21.png and b/items/active/starbound/weapons/axes/axe/blade/21.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/22.png b/items/active/starbound/weapons/axes/axe/blade/22.png index d9d18b39..faf5eeee 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/22.png and b/items/active/starbound/weapons/axes/axe/blade/22.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/23.png b/items/active/starbound/weapons/axes/axe/blade/23.png index 2914e3b2..90fd76ee 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/23.png and b/items/active/starbound/weapons/axes/axe/blade/23.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/24.png b/items/active/starbound/weapons/axes/axe/blade/24.png index eb66a20f..961ce88b 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/24.png and b/items/active/starbound/weapons/axes/axe/blade/24.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/27.png b/items/active/starbound/weapons/axes/axe/blade/27.png index 7fb14ac8..fe380221 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/27.png and b/items/active/starbound/weapons/axes/axe/blade/27.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/28.png b/items/active/starbound/weapons/axes/axe/blade/28.png index 3e751d79..07944b6c 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/28.png and b/items/active/starbound/weapons/axes/axe/blade/28.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/3.png b/items/active/starbound/weapons/axes/axe/blade/3.png index 02061ff7..3709ce0f 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/3.png and b/items/active/starbound/weapons/axes/axe/blade/3.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/4.png b/items/active/starbound/weapons/axes/axe/blade/4.png index 9655b5bf..6504ed80 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/4.png and b/items/active/starbound/weapons/axes/axe/blade/4.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/6.png b/items/active/starbound/weapons/axes/axe/blade/6.png index 7bf55756..1ce693ea 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/6.png and b/items/active/starbound/weapons/axes/axe/blade/6.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/8.png b/items/active/starbound/weapons/axes/axe/blade/8.png index f5498088..70c30fe0 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/8.png and b/items/active/starbound/weapons/axes/axe/blade/8.png differ diff --git a/items/active/starbound/weapons/axes/axe/blade/9.png b/items/active/starbound/weapons/axes/axe/blade/9.png index a865abd4..31e79469 100644 Binary files a/items/active/starbound/weapons/axes/axe/blade/9.png and b/items/active/starbound/weapons/axes/axe/blade/9.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/1.png b/items/active/starbound/weapons/axes/axe/handle/1.png index e8d766da..876c9b47 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/1.png and b/items/active/starbound/weapons/axes/axe/handle/1.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/10.png b/items/active/starbound/weapons/axes/axe/handle/10.png index e2a8727b..41cc21d0 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/10.png and b/items/active/starbound/weapons/axes/axe/handle/10.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/11.png b/items/active/starbound/weapons/axes/axe/handle/11.png index c72d233d..6ebdbf0c 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/11.png and b/items/active/starbound/weapons/axes/axe/handle/11.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/12.png b/items/active/starbound/weapons/axes/axe/handle/12.png index c8a5e601..e2993aa2 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/12.png and b/items/active/starbound/weapons/axes/axe/handle/12.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/13.png b/items/active/starbound/weapons/axes/axe/handle/13.png index 5a48f9d4..14a73a27 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/13.png and b/items/active/starbound/weapons/axes/axe/handle/13.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/14.png b/items/active/starbound/weapons/axes/axe/handle/14.png index 88fb1c6a..97552727 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/14.png and b/items/active/starbound/weapons/axes/axe/handle/14.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/4.png b/items/active/starbound/weapons/axes/axe/handle/4.png index 6aeb2a85..82fbd2d7 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/4.png and b/items/active/starbound/weapons/axes/axe/handle/4.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/5.png b/items/active/starbound/weapons/axes/axe/handle/5.png index d83c727d..99d7c567 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/5.png and b/items/active/starbound/weapons/axes/axe/handle/5.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/6.png b/items/active/starbound/weapons/axes/axe/handle/6.png index e9980e3b..0b6054d3 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/6.png and b/items/active/starbound/weapons/axes/axe/handle/6.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/7.png b/items/active/starbound/weapons/axes/axe/handle/7.png index bad4fe59..9272d15c 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/7.png and b/items/active/starbound/weapons/axes/axe/handle/7.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/8.png b/items/active/starbound/weapons/axes/axe/handle/8.png index faeda01a..743082a6 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/8.png and b/items/active/starbound/weapons/axes/axe/handle/8.png differ diff --git a/items/active/starbound/weapons/axes/axe/handle/9.png b/items/active/starbound/weapons/axes/axe/handle/9.png index d006feb2..e8db061c 100644 Binary files a/items/active/starbound/weapons/axes/axe/handle/9.png and b/items/active/starbound/weapons/axes/axe/handle/9.png differ diff --git a/items/active/starbound/weapons/axes/axeboneswoosh.png b/items/active/starbound/weapons/axes/axeboneswoosh.png index 5dd3f637..833cfe42 100644 Binary files a/items/active/starbound/weapons/axes/axeboneswoosh.png and b/items/active/starbound/weapons/axes/axeboneswoosh.png differ diff --git a/items/active/starbound/weapons/axes/boneaxe.activeitem b/items/active/starbound/weapons/axes/boneaxe.activeitem index b54b1510..e08f424d 100644 --- a/items/active/starbound/weapons/axes/boneaxe.activeitem +++ b/items/active/starbound/weapons/axes/boneaxe.activeitem @@ -1,53 +1,90 @@ { - "itemName" : "sb_boneaxe", - "price" : 750, - "maxStack" : 1, - "level" : 1, - "rarity" : "Legendary", - "shortdescription" : "Bone Axe", - "tooltipKind" : "sb_sword", - "category" : "axe", - "tooltipFields" : {"subtitle":"Bone Axe"}, - "twoHanded" : false, - "sb_waBan" : true, - "itemTags" : ["weapon","melee","axe","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/axe.animation", + "itemName": "sb_boneaxe", + "price": 750, + "maxStack": 1, + "level": 1, + "rarity": "Legendary", + "shortdescription": "Bone Axe", + "tooltipKind": "sb_sword", + "category": "axe", + "tooltipFields": { + "subtitle": "Bone Axe" + }, + "twoHanded": false, + "sb_waBan": true, + "itemTags": ["weapon", "melee", "axe", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/axe.animation", - "animationParts" : { - "blade" : "boneaxe.png", - "handle" : "" + "animationParts": { + "blade": "boneaxe.png", + "handle": "" }, - "animationCustom" : {"lights":{"glow":{"color":[0,0,0]}}, - "animatedParts":{"parts":{ - "swoosh":{"partStates":{"swoosh":{"fire":{"properties":{"image":"axeboneswoosh.png:"}}}},"properties":{"offset":[-2,1.75]}}, - "blade":{"properties":{"offset":[0,0.75]}}, - "handle":{"properties":{"offset":[0,0.75]}}} - } + "animationCustom": { + "lights": { + "glow": { + "color": [0, 0, 0] + } + }, + "animatedParts": { + "parts": { + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "image": "axeboneswoosh.png:" + } + } + } + }, + "properties": { + "offset": [-2, 1.75] + } + }, + "blade": { + "properties": { + "offset": [0, 0.75] + } + }, + "handle": { + "properties": { + "offset": [0, 0.75] + } + } + } + } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : -1.0, + "aimOffset": -1.0, - "primaryAbilityType" : "sb_axe", - "primaryAbility" : { - "fireTime" : [0.4,1.3], - "projectileType" : "bonechain1", - "baseDps" : [6.5,8.5], - "damageConfig" : { - "knockbackRange" : [25,35] + "primaryAbilityType": "sb_axe", + "primaryAbility": { + "fireTime": [0.4, 1.3], + "projectileType": "bonechain1", + "baseDps": [6.5, 8.5], + "damageConfig": { + "knockbackRange": [25, 35] }, - "stances" : { - "idle" : {"weaponOffset" : [0.25, 1]}, - "windup" : {"weaponOffset" : [0.25, 1]}, - "fire" : {"weaponOffset" : [0.25, 1]} + "stances": { + "idle": { + "weaponOffset": [0.25, 1] + }, + "windup": { + "weaponOffset": [0.25, 1] + }, + "fire": { + "weaponOffset": [0.25, 1] + } } }, - "elementalType" : "physical", - "builderConfig" : [{ - "nameGenerator" : "boneaxenames.config:nameGen", - "iconDrawables" : ["blade"] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "elementalType": "physical", + "builderConfig": [{ + "nameGenerator": "boneaxenames.config:nameGen", + "iconDrawables": ["blade"] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/axes/boneaxe.png b/items/active/starbound/weapons/axes/boneaxe.png index 489488dc..f137a420 100644 Binary files a/items/active/starbound/weapons/axes/boneaxe.png and b/items/active/starbound/weapons/axes/boneaxe.png differ diff --git a/items/active/starbound/weapons/axes/coralcleaver.png b/items/active/starbound/weapons/axes/coralcleaver.png index 06a3b028..5a07e678 100644 Binary files a/items/active/starbound/weapons/axes/coralcleaver.png and b/items/active/starbound/weapons/axes/coralcleaver.png differ diff --git a/items/active/starbound/weapons/axes/coralswoosh.png b/items/active/starbound/weapons/axes/coralswoosh.png index d56e63d5..c99360c8 100644 Binary files a/items/active/starbound/weapons/axes/coralswoosh.png and b/items/active/starbound/weapons/axes/coralswoosh.png differ diff --git a/items/active/starbound/weapons/axes/coralswooshx.png b/items/active/starbound/weapons/axes/coralswooshx.png index 8f7de4e5..f8d5b9ca 100644 Binary files a/items/active/starbound/weapons/axes/coralswooshx.png and b/items/active/starbound/weapons/axes/coralswooshx.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe.activeitem b/items/active/starbound/weapons/axes/crappyaxe.activeitem index edc6a4db..c8102061 100644 --- a/items/active/starbound/weapons/axes/crappyaxe.activeitem +++ b/items/active/starbound/weapons/axes/crappyaxe.activeitem @@ -1,94 +1,103 @@ { - "itemName" : "sb_crappyaxe", - "price" : 25, - "maxStack" : 1, - "level" : 1, - "rarity" : "Common", - "description" : "", - "shortdescription" : "Crappy Axe", - "tooltipKind" : "sb_sword", - "category" : "axe", - "tooltipFields" : {"subtitle":"Crappy Axe"}, - "twoHanded" : false, - // "sb_dyeable" : true, + "itemName": "sb_crappyaxe", + "price": 25, + "maxStack": 1, + "level": 1, + "rarity": "Common", + "description": "", + "shortdescription": "Crappy Axe", + "tooltipKind": "sb_sword", + "category": "axe", + "tooltipFields": { + "subtitle": "Crappy Axe" + }, + "twoHanded": false, + // "sb_dyeable" : true, //"sb_backingDirectives" : "?replace;f5e458=ffca8a;bc8b07=e0975c;a1750b=a85636;e9e9e9=ffca8a;b1b1b1=e0975c;676767=a85636", -// "sb_extraDirectives" : "?replace;ffca8a=f5e458;e0975c=bc8b07;a85636=a1750b;ffca8a=e9e9e9;e0975c=b1b1b1;a85636=676767", - "itemTags" : ["weapon","melee","axe","crappy","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/axe.animation", + // "sb_extraDirectives" : "?replace;ffca8a=f5e458;e0975c=bc8b07;a85636=a1750b;ffca8a=e9e9e9;e0975c=b1b1b1;a85636=676767", + "itemTags": ["weapon", "melee", "axe", "crappy", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/axe.animation", - "animationCustom" : { - "animatedParts" : { "parts" : { "swoosh" : { "properties" : { - "offset" : [-1.0, 1.75] - }}}}, - "sounds" : { - "fire" : [ "/sfx/melee/swing_axe.ogg" ] + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "properties": { + "offset": [-1.0, 1.75] + } + } + } + }, + "sounds": { + "fire": ["/sfx/melee/swing_axe.ogg"] } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "elementalType" : "physical", + "elementalType": "physical", - "aimOffset" : -1.0, + "aimOffset": -1.0, - "primaryAbilityType" : "axecleave", - "primaryAbility" : { - "scripts" : ["/items/active/starbound/weapons/axe.lua"], - "fireTime" : [0.4,0.9], - "allowHold" : false, - "baseDps" : [4.5,6.5], - "damageConfig" : { - "damageSourceKind" : "axe", - "knockbackRange" : [12,16] + "primaryAbilityType": "axecleave", + "primaryAbility": { + "scripts": ["/items/active/starbound/weapons/axe.lua"], + "fireTime": [0.4, 0.9], + "allowHold": false, + "baseDps": [4.5, 6.5], + "damageConfig": { + "damageSourceKind": "axe", + "knockbackRange": [12, 16] }, - "stances" : { - "idle" : { - "allowRotate" : true, - "weaponOffset" : [0.3, 1.5] + "stances": { + "idle": { + "allowRotate": true, + "weaponOffset": [0.3, 1.5] }, - "windup" : { - "allowRotate" : true, - "duration" : 0.2, - "weaponOffset" : [0.3, 1.5], + "windup": { + "allowRotate": true, + "duration": 0.2, + "weaponOffset": [0.3, 1.5], - "minWindup" : 0.6, + "minWindup": 0.6, - "weaponAngle" : [ + "weaponAngle": [ [0.7, "linear", -20, 0], [0.85, "linear", 0, 50], [0.925, "sin", 50, 45], [1.0, "cos", 50, 45] ], - "armAngle" : [ + "armAngle": [ [1.0, "sin", -90, 50] ] }, - "fire" : { - "duration" : 0.4, - "allowRotate":true, - "weaponOffset" : [0.3, 1.5] + "fire": { + "duration": 0.4, + "allowRotate": true, + "weaponOffset": [0.3, 1.5] } } }, - "builderConfig" : [{ - "nameGenerator" : "crappyaxenames.config:nameGen", - "animationParts" : { - "blade" : { - "path" : "crappyaxe/blade/.png", - "variants" : 12, - "paletteSwap" : true + "builderConfig": [{ + "nameGenerator": "crappyaxenames.config:nameGen", + "animationParts": { + "blade": { + "path": "crappyaxe/blade/.png", + "variants": 12, + "paletteSwap": true + }, + "handle": { + "path": "crappyaxe/handle/.png", + "variants": 5, + "paletteSwap": true + } }, - "handle" : { - "path" : "crappyaxe/handle/.png", - "variants" : 5, - "paletteSwap" : true - } - }, - "palette" : "/items/active/starbound/colors/crappy.weaponcolors", - "iconDrawables" : ["handle", "blade"] - }], + "palette": "/items/active/starbound/colors/crappy.weaponcolors", + "iconDrawables": ["handle", "blade"] + } + ], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" + "builder": "/items/buildscripts/starbound/buildweapon.lua" } diff --git a/items/active/starbound/weapons/axes/crappyaxe/blade/2.png b/items/active/starbound/weapons/axes/crappyaxe/blade/2.png index 863e9636..57bcaa85 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/blade/2.png and b/items/active/starbound/weapons/axes/crappyaxe/blade/2.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/blade/4.png b/items/active/starbound/weapons/axes/crappyaxe/blade/4.png index 2886f480..9abfa6e3 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/blade/4.png and b/items/active/starbound/weapons/axes/crappyaxe/blade/4.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/blade/6.png b/items/active/starbound/weapons/axes/crappyaxe/blade/6.png index 2403d038..35fa3606 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/blade/6.png and b/items/active/starbound/weapons/axes/crappyaxe/blade/6.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/blade/7.png b/items/active/starbound/weapons/axes/crappyaxe/blade/7.png index 18deba60..aaa560a5 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/blade/7.png and b/items/active/starbound/weapons/axes/crappyaxe/blade/7.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/blade/8.png b/items/active/starbound/weapons/axes/crappyaxe/blade/8.png index ddab5a52..d4c0e419 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/blade/8.png and b/items/active/starbound/weapons/axes/crappyaxe/blade/8.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/blade/9.png b/items/active/starbound/weapons/axes/crappyaxe/blade/9.png index f7000df1..953574d3 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/blade/9.png and b/items/active/starbound/weapons/axes/crappyaxe/blade/9.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/handle/1.png b/items/active/starbound/weapons/axes/crappyaxe/handle/1.png index 1fb9dbe6..01612827 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/handle/1.png and b/items/active/starbound/weapons/axes/crappyaxe/handle/1.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/handle/4.png b/items/active/starbound/weapons/axes/crappyaxe/handle/4.png index 40f52eba..23d3188a 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/handle/4.png and b/items/active/starbound/weapons/axes/crappyaxe/handle/4.png differ diff --git a/items/active/starbound/weapons/axes/crappyaxe/handle/5.png b/items/active/starbound/weapons/axes/crappyaxe/handle/5.png index af848a1f..732eed2a 100644 Binary files a/items/active/starbound/weapons/axes/crappyaxe/handle/5.png and b/items/active/starbound/weapons/axes/crappyaxe/handle/5.png differ diff --git a/items/active/starbound/weapons/axes/eyeaxe.activeitem b/items/active/starbound/weapons/axes/eyeaxe.activeitem index 78a61995..e6b7a88c 100644 --- a/items/active/starbound/weapons/axes/eyeaxe.activeitem +++ b/items/active/starbound/weapons/axes/eyeaxe.activeitem @@ -1,58 +1,76 @@ { - "itemName" : "sb_eyeaxe", - "price" : 750, - "maxStack" : 1, - "level" : 1, - "rarity" : "Common", - "description" : "Can eye axe you a question?", - "shortdescription" : "Eye Axe", - "tooltipKind" : "sb_sword2", - "category" : "axe", - "tooltipFields" : {"subtitle":"Eye Axe"}, - "twoHanded" : false, - "sb_waBan" : true, - "itemTags" : ["weapon","melee","axe","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/axe.animation", + "itemName": "sb_eyeaxe", + "price": 750, + "maxStack": 1, + "level": 1, + "rarity": "Common", + "description": "Can eye axe you a question?", + "shortdescription": "Eye Axe", + "tooltipKind": "sb_sword2", + "category": "axe", + "tooltipFields": { + "subtitle": "Eye Axe" + }, + "twoHanded": false, + "sb_waBan": true, + "itemTags": ["weapon", "melee", "axe", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/axe.animation", - "animationParts" : { - "blade" : "eyeaxe.png", - "handle" : "" + "animationParts": { + "blade": "eyeaxe.png", + "handle": "" }, - "animationCustom" : { - "animatedParts" : { - "parts" : { - "swoosh" : { - "properties" : { - "offset" : [-1.0, 1.75] - } - }, - "blade":{"properties":{}}, - "handle":{"properties":{}}} - }, - "lights":{"glow":{"color":[0,0,0]}} + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "properties": { + "offset": [-1.0, 1.75] + } + }, + "blade": { + "properties": {} + }, + "handle": { + "properties": {} + } + } + }, + "lights": { + "glow": { + "color": [0, 0, 0] + } + } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "primaryAbilityType" : "sb_axe", - "primaryAbility" : { - "projectileType" : "eyeball", - "fireTime" : [0.4,1.3], - "baseDps" : [6.5,8.5], - "damageConfig" : { - "knockbackRange" : [12,16] + "primaryAbilityType": "sb_axe", + "primaryAbility": { + "projectileType": "eyeball", + "fireTime": [0.4, 1.3], + "baseDps": [6.5, 8.5], + "damageConfig": { + "knockbackRange": [12, 16] }, - "stances" : { - "idle" : {"weaponOffset" : [0.3, 1.75]}, - "windup" : {"weaponOffset" : [0.3, 1.75]}, - "fire" : {"weaponOffset" : [0.3, 1.75]} + "stances": { + "idle": { + "weaponOffset": [0.3, 1.75] + }, + "windup": { + "weaponOffset": [0.3, 1.75] + }, + "fire": { + "weaponOffset": [0.3, 1.75] + } } }, - "elementalType" : "physical", - "builderConfig" : [{ - "nameGenerator" : "eyeaxenames.config:nameGen", - "iconDrawables" : ["blade"] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "elementalType": "physical", + "builderConfig": [{ + "nameGenerator": "eyeaxenames.config:nameGen", + "iconDrawables": ["blade"] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/axes/eyeaxe.png b/items/active/starbound/weapons/axes/eyeaxe.png index 77a56960..5bc1f1d0 100644 Binary files a/items/active/starbound/weapons/axes/eyeaxe.png and b/items/active/starbound/weapons/axes/eyeaxe.png differ diff --git a/items/active/starbound/weapons/axes/floran/t1.png b/items/active/starbound/weapons/axes/floran/t1.png index c5b14be8..f81b900d 100644 Binary files a/items/active/starbound/weapons/axes/floran/t1.png and b/items/active/starbound/weapons/axes/floran/t1.png differ diff --git a/items/active/starbound/weapons/axes/floran/t2.png b/items/active/starbound/weapons/axes/floran/t2.png index 982f1894..bd15beed 100644 Binary files a/items/active/starbound/weapons/axes/floran/t2.png and b/items/active/starbound/weapons/axes/floran/t2.png differ diff --git a/items/active/starbound/weapons/axes/floran/t3.png b/items/active/starbound/weapons/axes/floran/t3.png index 3d26c593..de2afd9a 100644 Binary files a/items/active/starbound/weapons/axes/floran/t3.png and b/items/active/starbound/weapons/axes/floran/t3.png differ diff --git a/items/active/starbound/weapons/axes/floran/t4.png b/items/active/starbound/weapons/axes/floran/t4.png index 7e18b746..f370fbb3 100644 Binary files a/items/active/starbound/weapons/axes/floran/t4.png and b/items/active/starbound/weapons/axes/floran/t4.png differ diff --git a/items/active/starbound/weapons/axes/floran/t5a.png b/items/active/starbound/weapons/axes/floran/t5a.png index f88987ae..c87908dd 100644 Binary files a/items/active/starbound/weapons/axes/floran/t5a.png and b/items/active/starbound/weapons/axes/floran/t5a.png differ diff --git a/items/active/starbound/weapons/axes/floran/t5m.png b/items/active/starbound/weapons/axes/floran/t5m.png index 0099fd2c..12fe3e44 100644 Binary files a/items/active/starbound/weapons/axes/floran/t5m.png and b/items/active/starbound/weapons/axes/floran/t5m.png differ diff --git a/items/active/starbound/weapons/axes/floran/t5s.png b/items/active/starbound/weapons/axes/floran/t5s.png index d84d4303..c03a6334 100644 Binary files a/items/active/starbound/weapons/axes/floran/t5s.png and b/items/active/starbound/weapons/axes/floran/t5s.png differ diff --git a/items/active/starbound/weapons/axes/floran/t6a.png b/items/active/starbound/weapons/axes/floran/t6a.png index 132bd1b7..7c82bb25 100644 Binary files a/items/active/starbound/weapons/axes/floran/t6a.png and b/items/active/starbound/weapons/axes/floran/t6a.png differ diff --git a/items/active/starbound/weapons/axes/floran/t6s.png b/items/active/starbound/weapons/axes/floran/t6s.png index a4e8f0dc..70c94dd2 100644 Binary files a/items/active/starbound/weapons/axes/floran/t6s.png and b/items/active/starbound/weapons/axes/floran/t6s.png differ diff --git a/items/active/starbound/weapons/axes/fryingpan.activeitem b/items/active/starbound/weapons/axes/fryingpan.activeitem index 89f80937..4da07eda 100644 --- a/items/active/starbound/weapons/axes/fryingpan.activeitem +++ b/items/active/starbound/weapons/axes/fryingpan.activeitem @@ -1,66 +1,89 @@ { - "itemName" : "sb_fryingpan", - "price" : 640, - "maxStack" : 1, - "level" : 1, - "rarity" : "Common", - "description" : "Skillet technology will never surpass cast iron.", - "shortdescription" : "Frying Pan", - "tooltipKind" : "sb_sword2", - "category" : "axe", - "tooltipFields" : {"subtitle":"Frying Pan"}, - "twoHanded" : false, - "itemTags" : ["weapon","melee","axe","fryingpan","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/axe.animation", + "itemName": "sb_fryingpan", + "price": 640, + "maxStack": 1, + "level": 1, + "rarity": "Common", + "description": "Skillet technology will never surpass cast iron.", + "shortdescription": "Frying Pan", + "tooltipKind": "sb_sword2", + "category": "axe", + "tooltipFields": { + "subtitle": "Frying Pan" + }, + "twoHanded": false, + "itemTags": ["weapon", "melee", "axe", "fryingpan", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/axe.animation", - "animationCustom" : { - "animatedParts" : {"parts":{ - "swoosh":{"properties":{"offset" :[-1.0,1.75]}}, - "blade":{"properties":{}}, - "handle":{"properties":{}}} - }, - "lights":{"glow":{"color":[0,0,0]}}, - "sounds" : { - "fire" : [ "/sfx/melee/swing_axe.ogg" ] + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "properties": { + "offset": [-1.0, 1.75] + } + }, + "blade": { + "properties": {} + }, + "handle": { + "properties": {} + } + } + }, + "lights": { + "glow": { + "color": [0, 0, 0] + } + }, + "sounds": { + "fire": ["/sfx/melee/swing_axe.ogg"] } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : -1.0, + "aimOffset": -1.0, - "primaryAbilityType" : "sb_axe", - "primaryAbility" : { - "fireTime" : [0.4,1.3], - "baseDps" : [6.5,8.5], - "damageConfig" : { - "damageSourceKind" : "fryingpan", - "knockbackRange" : [12,16] + "primaryAbilityType": "sb_axe", + "primaryAbility": { + "fireTime": [0.4, 1.3], + "baseDps": [6.5, 8.5], + "damageConfig": { + "damageSourceKind": "fryingpan", + "knockbackRange": [12, 16] }, - "stances" : { - "idle" : {"weaponOffset" : [0.25, 1]}, - "windup" : {"weaponOffset" : [0.25, 1]}, - "fire" : {"weaponOffset" : [0.25, 1]} + "stances": { + "idle": { + "weaponOffset": [0.25, 1] + }, + "windup": { + "weaponOffset": [0.25, 1] + }, + "fire": { + "weaponOffset": [0.25, 1] + } } }, - "elementalType" : "physical", - "builderConfig" : [{ - "nameGenerator" : "fryingpannames.config:nameGen", - "animationParts" : { - "blade" : { - "path" : "fryingpan/blade/.png", - "variants" : 1, - "paletteSwap" : true + "elementalType": "physical", + "builderConfig": [{ + "nameGenerator": "fryingpannames.config:nameGen", + "animationParts": { + "blade": { + "path": "fryingpan/blade/.png", + "variants": 1, + "paletteSwap": true + }, + "handle": { + "path": "fryingpan/handle/.png", + "variants": 1, + "paletteSwap": true + } }, - "handle" : { - "path" : "fryingpan/handle/.png", - "variants" : 1, - "paletteSwap" : true - } - }, - "palette" : "/items/active/starbound/colors/fryingpan.weaponcolors", - "iconDrawables" : ["handle", "blade"] - }], + "palette": "/items/active/starbound/colors/fryingpan.weaponcolors", + "iconDrawables": ["handle", "blade"] + } + ], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" + "builder": "/items/buildscripts/starbound/buildweapon.lua" } diff --git a/items/active/starbound/weapons/axes/fryingpan/blade/1.png b/items/active/starbound/weapons/axes/fryingpan/blade/1.png index 98b07bd1..0a5eeac3 100644 Binary files a/items/active/starbound/weapons/axes/fryingpan/blade/1.png and b/items/active/starbound/weapons/axes/fryingpan/blade/1.png differ diff --git a/items/active/starbound/weapons/axes/fryingpan/handle/1.png b/items/active/starbound/weapons/axes/fryingpan/handle/1.png index 7a706231..3fb464bb 100644 Binary files a/items/active/starbound/weapons/axes/fryingpan/handle/1.png and b/items/active/starbound/weapons/axes/fryingpan/handle/1.png differ diff --git a/items/active/starbound/weapons/axes/glitch/t1.png b/items/active/starbound/weapons/axes/glitch/t1.png index 5992cca8..312aacf2 100644 Binary files a/items/active/starbound/weapons/axes/glitch/t1.png and b/items/active/starbound/weapons/axes/glitch/t1.png differ diff --git a/items/active/starbound/weapons/axes/glitch/t5a.png b/items/active/starbound/weapons/axes/glitch/t5a.png index 9527d7e3..1673a297 100644 Binary files a/items/active/starbound/weapons/axes/glitch/t5a.png and b/items/active/starbound/weapons/axes/glitch/t5a.png differ diff --git a/items/active/starbound/weapons/axes/glitch/t5m.png b/items/active/starbound/weapons/axes/glitch/t5m.png index 3a07ec00..dfcd2b8b 100644 Binary files a/items/active/starbound/weapons/axes/glitch/t5m.png and b/items/active/starbound/weapons/axes/glitch/t5m.png differ diff --git a/items/active/starbound/weapons/axes/glitch/t6a.png b/items/active/starbound/weapons/axes/glitch/t6a.png index 76766b77..92522270 100644 Binary files a/items/active/starbound/weapons/axes/glitch/t6a.png and b/items/active/starbound/weapons/axes/glitch/t6a.png differ diff --git a/items/active/starbound/weapons/axes/glitch/t6s.png b/items/active/starbound/weapons/axes/glitch/t6s.png index 62b4927e..15afed9e 100644 Binary files a/items/active/starbound/weapons/axes/glitch/t6s.png and b/items/active/starbound/weapons/axes/glitch/t6s.png differ diff --git a/items/active/starbound/weapons/axes/heatcleaver.png b/items/active/starbound/weapons/axes/heatcleaver.png index 26baacc1..d13bd342 100644 Binary files a/items/active/starbound/weapons/axes/heatcleaver.png and b/items/active/starbound/weapons/axes/heatcleaver.png differ diff --git a/items/active/starbound/weapons/axes/human/t1.png b/items/active/starbound/weapons/axes/human/t1.png index 2fa3ed36..69114f2d 100644 Binary files a/items/active/starbound/weapons/axes/human/t1.png and b/items/active/starbound/weapons/axes/human/t1.png differ diff --git a/items/active/starbound/weapons/axes/human/t3.png b/items/active/starbound/weapons/axes/human/t3.png index 271b22ee..ee6cc4e8 100644 Binary files a/items/active/starbound/weapons/axes/human/t3.png and b/items/active/starbound/weapons/axes/human/t3.png differ diff --git a/items/active/starbound/weapons/axes/human/t4.png b/items/active/starbound/weapons/axes/human/t4.png index fcbafcfa..f409b99f 100644 Binary files a/items/active/starbound/weapons/axes/human/t4.png and b/items/active/starbound/weapons/axes/human/t4.png differ diff --git a/items/active/starbound/weapons/axes/human/t5a.png b/items/active/starbound/weapons/axes/human/t5a.png index 2228a328..39e2e05f 100644 Binary files a/items/active/starbound/weapons/axes/human/t5a.png and b/items/active/starbound/weapons/axes/human/t5a.png differ diff --git a/items/active/starbound/weapons/axes/human/t5m.png b/items/active/starbound/weapons/axes/human/t5m.png index 5d909d38..a5e68b24 100644 Binary files a/items/active/starbound/weapons/axes/human/t5m.png and b/items/active/starbound/weapons/axes/human/t5m.png differ diff --git a/items/active/starbound/weapons/axes/human/t6a.png b/items/active/starbound/weapons/axes/human/t6a.png index 06a64b64..c9bece65 100644 Binary files a/items/active/starbound/weapons/axes/human/t6a.png and b/items/active/starbound/weapons/axes/human/t6a.png differ diff --git a/items/active/starbound/weapons/axes/human/t6m.png b/items/active/starbound/weapons/axes/human/t6m.png index 096eb31d..f55061dc 100644 Binary files a/items/active/starbound/weapons/axes/human/t6m.png and b/items/active/starbound/weapons/axes/human/t6m.png differ diff --git a/items/active/starbound/weapons/axes/human/t6s.png b/items/active/starbound/weapons/axes/human/t6s.png index c72dcf23..1fd6f926 100644 Binary files a/items/active/starbound/weapons/axes/human/t6s.png and b/items/active/starbound/weapons/axes/human/t6s.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t1.png b/items/active/starbound/weapons/axes/hylotl/t1.png index 2955fb8e..33dadf86 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t1.png and b/items/active/starbound/weapons/axes/hylotl/t1.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t2.png b/items/active/starbound/weapons/axes/hylotl/t2.png index 37f63448..2afd65f6 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t2.png and b/items/active/starbound/weapons/axes/hylotl/t2.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t3.png b/items/active/starbound/weapons/axes/hylotl/t3.png index 5cc25d02..63536125 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t3.png and b/items/active/starbound/weapons/axes/hylotl/t3.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t4.png b/items/active/starbound/weapons/axes/hylotl/t4.png index f7cdbaab..15c7c9b3 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t4.png and b/items/active/starbound/weapons/axes/hylotl/t4.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t5a.png b/items/active/starbound/weapons/axes/hylotl/t5a.png index 7cebd888..ab9ea17f 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t5a.png and b/items/active/starbound/weapons/axes/hylotl/t5a.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t5m.png b/items/active/starbound/weapons/axes/hylotl/t5m.png index 016fcfc5..cfe116ec 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t5m.png and b/items/active/starbound/weapons/axes/hylotl/t5m.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t5s.png b/items/active/starbound/weapons/axes/hylotl/t5s.png index dc248bee..9e52009e 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t5s.png and b/items/active/starbound/weapons/axes/hylotl/t5s.png differ diff --git a/items/active/starbound/weapons/axes/hylotl/t6a.png b/items/active/starbound/weapons/axes/hylotl/t6a.png index 2d612dfb..ec7b9d67 100644 Binary files a/items/active/starbound/weapons/axes/hylotl/t6a.png and b/items/active/starbound/weapons/axes/hylotl/t6a.png differ diff --git a/items/active/starbound/weapons/axes/uncommoncrappyaxe.activeitem b/items/active/starbound/weapons/axes/uncommoncrappyaxe.activeitem index 84bf0cc8..8eb384d5 100644 --- a/items/active/starbound/weapons/axes/uncommoncrappyaxe.activeitem +++ b/items/active/starbound/weapons/axes/uncommoncrappyaxe.activeitem @@ -1,121 +1,146 @@ { - "itemName" : "sb_uncommoncrappyaxe", - "price" : 25, - "maxStack" : 1, - "level" : 1, - "rarity" : "uncommon", - "description" : "", - "shortdescription" : "Uncommon Crappy Axe", - "tooltipKind" : "sb_sword", - "category" : "axe", - "tooltipFields" : {"subtitle":"Crappy Axe"}, - "twoHanded" : false, - "itemTags" : ["weapon","melee","axe","crappy","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/axe.animation", + "itemName": "sb_uncommoncrappyaxe", + "price": 25, + "maxStack": 1, + "level": 1, + "rarity": "uncommon", + "description": "", + "shortdescription": "Uncommon Crappy Axe", + "tooltipKind": "sb_sword", + "category": "axe", + "tooltipFields": { + "subtitle": "Crappy Axe" + }, + "twoHanded": false, + "itemTags": ["weapon", "melee", "axe", "crappy", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/axe.animation", - "animationCustom" : { - "animatedParts" : { "parts" : { "swoosh" : { "properties" : { - "offset" : [-1.0, 1.75] - }}}} + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "properties": { + "offset": [-1.0, 1.75] + } + } + } + } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : -1.0, + "aimOffset": -1.0, - "primaryAbilityType" : "axecleave", - "primaryAbility" : { - "scripts" : ["/items/active/starbound/weapons/axe.lua"], - "fireTime" : [0.4,0.9], - "allowHold" : false, - "baseDps" : [4.5,6.5], - "damageConfig" : { - "damageSourceKind" : "axe", - "knockbackRange" : [12,16] + "primaryAbilityType": "axecleave", + "primaryAbility": { + "scripts": ["/items/active/starbound/weapons/axe.lua"], + "fireTime": [0.4, 0.9], + "allowHold": false, + "baseDps": [4.5, 6.5], + "damageConfig": { + "damageSourceKind": "axe", + "knockbackRange": [12, 16] }, - "stances" : { - "idle" : { - "allowRotate" : true, - "weaponOffset" : [0.3, 1.5] + "stances": { + "idle": { + "allowRotate": true, + "weaponOffset": [0.3, 1.5] }, - "windup" : { - "allowRotate" : true, - "duration" : 0.2, - "weaponOffset" : [0.3, 1.5], + "windup": { + "allowRotate": true, + "duration": 0.2, + "weaponOffset": [0.3, 1.5], - "minWindup" : 0.6, + "minWindup": 0.6, - "weaponAngle" : [ + "weaponAngle": [ [0.7, "linear", -20, 0], [0.85, "linear", 0, 50], [0.925, "sin", 50, 45], [1.0, "cos", 50, 45] ], - "armAngle" : [ + "armAngle": [ [1.0, "sin", -90, 50] ] }, - "fire" : { - "duration" : 0.4, - "allowRotate":true, - "weaponOffset" : [0.3, 1.5] + "fire": { + "duration": 0.4, + "allowRotate": true, + "weaponOffset": [0.3, 1.5] } } }, - "builderConfig" : [{ - "nameGenerator" : "crappyaxenames.config:nameGen", - "elementalType" : ["physical","fire","ice","electric","poison"], - "elementalConfig" : { - "fire" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"burning","duration":2}], - "damageSourceKind" : "fireaxe" - } - } - }, - "ice" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"frostslow","duration":2}], - "damageSourceKind" : "iceaxe" - } - } - }, - "electric" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"electrified","duration":2}], - "damageSourceKind" : "electricaxe" - } - } + "builderConfig": [{ + "nameGenerator": "crappyaxenames.config:nameGen", + "elementalType": ["physical", "fire", "ice", "electric", "poison"], + "elementalConfig": { + "fire": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "burning", + "duration": 2 + } + ], + "damageSourceKind": "fireaxe" + } + } + }, + "ice": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "frostslow", + "duration": 2 + } + ], + "damageSourceKind": "iceaxe" + } + } + }, + "electric": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "electrified", + "duration": 2 + } + ], + "damageSourceKind": "electricaxe" + } + } + }, + "poison": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "weakpoison", + "duration": 2 + } + ], + "damageSourceKind": "poisonaxe" + } + } + } }, - "poison" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"weakpoison","duration":2}], - "damageSourceKind" : "poisonaxe" - } - } - } - }, - "animationParts" : { - "blade" : { - "path" : "crappyaxe/blade/.png", - "variants" : 12, - "paletteSwap" : true + "animationParts": { + "blade": { + "path": "crappyaxe/blade/.png", + "variants": 12, + "paletteSwap": true + }, + "handle": { + "path": "crappyaxe/handle/.png", + "variants": 5, + "paletteSwap": true + } }, - "handle" : { - "path" : "crappyaxe/handle/.png", - "variants" : 5, - "paletteSwap" : true - } - }, - "palette" : "/items/active/starbound/colors/crappy.weaponcolors", - "iconDrawables" : ["handle", "blade"] - }], + "palette": "/items/active/starbound/colors/crappy.weaponcolors", + "iconDrawables": ["handle", "blade"] + } + ], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/broadswords/apex/t5m.png b/items/active/starbound/weapons/broadswords/apex/t5m.png index 5f7ffa47..59fb192b 100644 Binary files a/items/active/starbound/weapons/broadswords/apex/t5m.png and b/items/active/starbound/weapons/broadswords/apex/t5m.png differ diff --git a/items/active/starbound/weapons/broadswords/apex/t6a.png b/items/active/starbound/weapons/broadswords/apex/t6a.png index 7d0177b1..fe40b686 100644 Binary files a/items/active/starbound/weapons/broadswords/apex/t6a.png and b/items/active/starbound/weapons/broadswords/apex/t6a.png differ diff --git a/items/active/starbound/weapons/broadswords/apex/t6s.png b/items/active/starbound/weapons/broadswords/apex/t6s.png index 8850d193..0871b6ce 100644 Binary files a/items/active/starbound/weapons/broadswords/apex/t6s.png and b/items/active/starbound/weapons/broadswords/apex/t6s.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t3.png b/items/active/starbound/weapons/broadswords/avian/t3.png index e1d52b04..3224aa05 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t3.png and b/items/active/starbound/weapons/broadswords/avian/t3.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t5a.png b/items/active/starbound/weapons/broadswords/avian/t5a.png index 0ace317b..83257c92 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t5a.png and b/items/active/starbound/weapons/broadswords/avian/t5a.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t5m.png b/items/active/starbound/weapons/broadswords/avian/t5m.png index b50c7256..69b1dd5c 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t5m.png and b/items/active/starbound/weapons/broadswords/avian/t5m.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t5s.png b/items/active/starbound/weapons/broadswords/avian/t5s.png index bacccf49..dcffa63d 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t5s.png and b/items/active/starbound/weapons/broadswords/avian/t5s.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t6a.png b/items/active/starbound/weapons/broadswords/avian/t6a.png index b49262e5..7fcc0215 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t6a.png and b/items/active/starbound/weapons/broadswords/avian/t6a.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t6m.png b/items/active/starbound/weapons/broadswords/avian/t6m.png index 3c1a6170..cf630c8e 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t6m.png and b/items/active/starbound/weapons/broadswords/avian/t6m.png differ diff --git a/items/active/starbound/weapons/broadswords/avian/t6s.png b/items/active/starbound/weapons/broadswords/avian/t6s.png index 8af142cf..64b22137 100644 Binary files a/items/active/starbound/weapons/broadswords/avian/t6s.png and b/items/active/starbound/weapons/broadswords/avian/t6s.png differ diff --git a/items/active/starbound/weapons/broadswords/bloodswoosh.png b/items/active/starbound/weapons/broadswords/bloodswoosh.png index 7201d801..9a129242 100644 Binary files a/items/active/starbound/weapons/broadswords/bloodswoosh.png and b/items/active/starbound/weapons/broadswords/bloodswoosh.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/1.png b/items/active/starbound/weapons/broadswords/broadsword/blade/1.png index c072f312..9bc770db 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/1.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/1.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/10.png b/items/active/starbound/weapons/broadswords/broadsword/blade/10.png index 76fdc212..412996a0 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/10.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/10.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/11.png b/items/active/starbound/weapons/broadswords/broadsword/blade/11.png index 3b55f7d7..49af3f35 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/11.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/11.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/12.png b/items/active/starbound/weapons/broadswords/broadsword/blade/12.png index 9b90469f..ce34a454 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/12.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/12.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/13.png b/items/active/starbound/weapons/broadswords/broadsword/blade/13.png index 08c3091c..8d80eb57 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/13.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/13.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/14.png b/items/active/starbound/weapons/broadswords/broadsword/blade/14.png index f1838b38..d62bed96 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/14.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/14.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/15.png b/items/active/starbound/weapons/broadswords/broadsword/blade/15.png index 468036ff..02cf3a10 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/15.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/15.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/16.png b/items/active/starbound/weapons/broadswords/broadsword/blade/16.png index 55640479..bab40295 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/16.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/16.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/17.png b/items/active/starbound/weapons/broadswords/broadsword/blade/17.png index da4e1119..2088947d 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/17.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/17.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/18.png b/items/active/starbound/weapons/broadswords/broadsword/blade/18.png index 9d13348f..1bf9aa39 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/18.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/18.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/19.png b/items/active/starbound/weapons/broadswords/broadsword/blade/19.png index 21fb58dd..4a3530e5 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/19.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/19.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/2.png b/items/active/starbound/weapons/broadswords/broadsword/blade/2.png index 1fc16735..442c33ee 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/2.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/2.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/20.png b/items/active/starbound/weapons/broadswords/broadsword/blade/20.png index 16731cc4..48db0fe9 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/20.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/20.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/21.png b/items/active/starbound/weapons/broadswords/broadsword/blade/21.png index 690b061c..5f3f80c7 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/21.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/21.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/22.png b/items/active/starbound/weapons/broadswords/broadsword/blade/22.png index 1a018706..f8e2bde9 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/22.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/22.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/23.png b/items/active/starbound/weapons/broadswords/broadsword/blade/23.png index 04f4dced..74a734f5 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/23.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/23.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/24.png b/items/active/starbound/weapons/broadswords/broadsword/blade/24.png index 7077e9a6..c8f3c80d 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/24.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/24.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/25.png b/items/active/starbound/weapons/broadswords/broadsword/blade/25.png index 8e493d99..a242a081 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/25.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/25.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/26.png b/items/active/starbound/weapons/broadswords/broadsword/blade/26.png index 271d7201..d15da884 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/26.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/26.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/27.png b/items/active/starbound/weapons/broadswords/broadsword/blade/27.png index 91950ce2..54c803fd 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/27.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/27.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/28.png b/items/active/starbound/weapons/broadswords/broadsword/blade/28.png index 07798e6a..dd0dc38a 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/28.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/28.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/29.png b/items/active/starbound/weapons/broadswords/broadsword/blade/29.png index 5160f938..aadd4950 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/29.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/29.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/3.png b/items/active/starbound/weapons/broadswords/broadsword/blade/3.png index 464fe9d0..6410ffe5 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/3.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/3.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/30.png b/items/active/starbound/weapons/broadswords/broadsword/blade/30.png index 3da791c3..68c49741 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/30.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/30.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/31.png b/items/active/starbound/weapons/broadswords/broadsword/blade/31.png index 5cec1b7e..c1a3d288 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/31.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/31.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/32.png b/items/active/starbound/weapons/broadswords/broadsword/blade/32.png index 1a3ffca8..46b49708 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/32.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/32.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/33.png b/items/active/starbound/weapons/broadswords/broadsword/blade/33.png index b5a4abaf..58700b0e 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/33.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/33.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/34.png b/items/active/starbound/weapons/broadswords/broadsword/blade/34.png index bb531b62..7052db22 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/34.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/34.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/35.png b/items/active/starbound/weapons/broadswords/broadsword/blade/35.png index eb67e5ff..8dafb0a8 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/35.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/35.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/36.png b/items/active/starbound/weapons/broadswords/broadsword/blade/36.png index 766191a7..b5e5f157 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/36.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/36.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/37.png b/items/active/starbound/weapons/broadswords/broadsword/blade/37.png index 8cc087ef..3888e8d8 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/37.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/37.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/38.png b/items/active/starbound/weapons/broadswords/broadsword/blade/38.png index 20415605..f0ab498e 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/38.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/38.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/39.png b/items/active/starbound/weapons/broadswords/broadsword/blade/39.png index d957cf86..3cd502e3 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/39.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/39.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/4.png b/items/active/starbound/weapons/broadswords/broadsword/blade/4.png index 0975acf4..c19a3e28 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/4.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/4.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/40.png b/items/active/starbound/weapons/broadswords/broadsword/blade/40.png index e4c8e2db..cff1fa51 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/40.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/40.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/41.png b/items/active/starbound/weapons/broadswords/broadsword/blade/41.png index 89d1d917..75737bd5 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/41.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/41.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/42.png b/items/active/starbound/weapons/broadswords/broadsword/blade/42.png index 33ad3d40..9c03af9d 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/42.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/42.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/43.png b/items/active/starbound/weapons/broadswords/broadsword/blade/43.png index 75b41552..57742bfe 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/43.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/43.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/44.png b/items/active/starbound/weapons/broadswords/broadsword/blade/44.png index 6e801e83..3e5cabbd 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/44.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/44.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/45.png b/items/active/starbound/weapons/broadswords/broadsword/blade/45.png index 20ef5800..2227c0cc 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/45.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/45.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/46.png b/items/active/starbound/weapons/broadswords/broadsword/blade/46.png index f1d7ed15..ebd00a79 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/46.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/46.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/47.png b/items/active/starbound/weapons/broadswords/broadsword/blade/47.png index 0a596568..6823cd9f 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/47.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/47.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/48.png b/items/active/starbound/weapons/broadswords/broadsword/blade/48.png index 7f3a36a1..3d6b9b17 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/48.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/48.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/49.png b/items/active/starbound/weapons/broadswords/broadsword/blade/49.png index bff60ae2..3f608aa1 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/49.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/49.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/5.png b/items/active/starbound/weapons/broadswords/broadsword/blade/5.png index af1cdcf3..0c34adbb 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/5.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/5.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/50.png b/items/active/starbound/weapons/broadswords/broadsword/blade/50.png index 32ec2a7e..6d302acc 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/50.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/50.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/6.png b/items/active/starbound/weapons/broadswords/broadsword/blade/6.png index de901372..cf1bb695 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/6.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/6.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/7.png b/items/active/starbound/weapons/broadswords/broadsword/blade/7.png index 33e0dffa..9f5d9a27 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/7.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/7.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/8.png b/items/active/starbound/weapons/broadswords/broadsword/blade/8.png index 0af67a68..0fd8af71 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/8.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/8.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/blade/9.png b/items/active/starbound/weapons/broadswords/broadsword/blade/9.png index c31612b1..ea63d06d 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/blade/9.png and b/items/active/starbound/weapons/broadswords/broadsword/blade/9.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/handle/1.png b/items/active/starbound/weapons/broadswords/broadsword/handle/1.png index d0357ac0..6a5e6b8f 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/handle/1.png and b/items/active/starbound/weapons/broadswords/broadsword/handle/1.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/handle/12.png b/items/active/starbound/weapons/broadswords/broadsword/handle/12.png index 3816d62e..5fdc5add 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/handle/12.png and b/items/active/starbound/weapons/broadswords/broadsword/handle/12.png differ diff --git a/items/active/starbound/weapons/broadswords/broadsword/handle/3.png b/items/active/starbound/weapons/broadswords/broadsword/handle/3.png index c0fd84df..7d4f97d0 100644 Binary files a/items/active/starbound/weapons/broadswords/broadsword/handle/3.png and b/items/active/starbound/weapons/broadswords/broadsword/handle/3.png differ diff --git a/items/active/starbound/weapons/broadswords/candycane.png b/items/active/starbound/weapons/broadswords/candycane.png index d5a454c3..0d443ca6 100644 Binary files a/items/active/starbound/weapons/broadswords/candycane.png and b/items/active/starbound/weapons/broadswords/candycane.png differ diff --git a/items/active/starbound/weapons/broadswords/cellshade.png b/items/active/starbound/weapons/broadswords/cellshade.png index 236c7975..40478341 100644 Binary files a/items/active/starbound/weapons/broadswords/cellshade.png and b/items/active/starbound/weapons/broadswords/cellshade.png differ diff --git a/items/active/starbound/weapons/broadswords/cellswooshx.png b/items/active/starbound/weapons/broadswords/cellswooshx.png index 025c04e8..61267533 100644 Binary files a/items/active/starbound/weapons/broadswords/cellswooshx.png and b/items/active/starbound/weapons/broadswords/cellswooshx.png differ diff --git a/items/active/starbound/weapons/broadswords/chromosword.png b/items/active/starbound/weapons/broadswords/chromosword.png index a5a0f817..8a09f948 100644 Binary files a/items/active/starbound/weapons/broadswords/chromosword.png and b/items/active/starbound/weapons/broadswords/chromosword.png differ diff --git a/items/active/starbound/weapons/broadswords/crappybroadsword/blade/5.png b/items/active/starbound/weapons/broadswords/crappybroadsword/blade/5.png index 491d7ae2..11aa8277 100644 Binary files a/items/active/starbound/weapons/broadswords/crappybroadsword/blade/5.png and b/items/active/starbound/weapons/broadswords/crappybroadsword/blade/5.png differ diff --git a/items/active/starbound/weapons/broadswords/crappybroadsword/handle/6.png b/items/active/starbound/weapons/broadswords/crappybroadsword/handle/6.png index 3fac4535..7a669625 100644 Binary files a/items/active/starbound/weapons/broadswords/crappybroadsword/handle/6.png and b/items/active/starbound/weapons/broadswords/crappybroadsword/handle/6.png differ diff --git a/items/active/starbound/weapons/broadswords/eyesword.png b/items/active/starbound/weapons/broadswords/eyesword.png index f6278cc9..8c17a3d3 100644 Binary files a/items/active/starbound/weapons/broadswords/eyesword.png and b/items/active/starbound/weapons/broadswords/eyesword.png differ diff --git a/items/active/starbound/weapons/broadswords/fireswordblade.png b/items/active/starbound/weapons/broadswords/fireswordblade.png index 0f7c5a57..4ae8caf0 100644 Binary files a/items/active/starbound/weapons/broadswords/fireswordblade.png and b/items/active/starbound/weapons/broadswords/fireswordblade.png differ diff --git a/items/active/starbound/weapons/broadswords/fireswordhandle.png b/items/active/starbound/weapons/broadswords/fireswordhandle.png index 33d54c62..db16d9f2 100644 Binary files a/items/active/starbound/weapons/broadswords/fireswordhandle.png and b/items/active/starbound/weapons/broadswords/fireswordhandle.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/starter.png b/items/active/starbound/weapons/broadswords/floran/starter.png index 0c6a4135..85c26ba8 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/starter.png and b/items/active/starbound/weapons/broadswords/floran/starter.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t1.png b/items/active/starbound/weapons/broadswords/floran/t1.png index 0f7058f3..098c5be6 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t1.png and b/items/active/starbound/weapons/broadswords/floran/t1.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t2.png b/items/active/starbound/weapons/broadswords/floran/t2.png index 69b48df5..c79375a2 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t2.png and b/items/active/starbound/weapons/broadswords/floran/t2.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t3.png b/items/active/starbound/weapons/broadswords/floran/t3.png index 189c7417..69686b1a 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t3.png and b/items/active/starbound/weapons/broadswords/floran/t3.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t4.png b/items/active/starbound/weapons/broadswords/floran/t4.png index e33d40e2..733c4425 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t4.png and b/items/active/starbound/weapons/broadswords/floran/t4.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t5a.png b/items/active/starbound/weapons/broadswords/floran/t5a.png index 0dad4d4e..d5fc78ff 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t5a.png and b/items/active/starbound/weapons/broadswords/floran/t5a.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t5m.png b/items/active/starbound/weapons/broadswords/floran/t5m.png index 76a5b384..bc38befd 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t5m.png and b/items/active/starbound/weapons/broadswords/floran/t5m.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t5s.png b/items/active/starbound/weapons/broadswords/floran/t5s.png index e68d8555..cb4e56eb 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t5s.png and b/items/active/starbound/weapons/broadswords/floran/t5s.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t6a.png b/items/active/starbound/weapons/broadswords/floran/t6a.png index c4a21b5d..d2c738b6 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t6a.png and b/items/active/starbound/weapons/broadswords/floran/t6a.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t6m.png b/items/active/starbound/weapons/broadswords/floran/t6m.png index 8719d865..d6e71785 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t6m.png and b/items/active/starbound/weapons/broadswords/floran/t6m.png differ diff --git a/items/active/starbound/weapons/broadswords/floran/t6s.png b/items/active/starbound/weapons/broadswords/floran/t6s.png index d48bee19..383b5d1a 100644 Binary files a/items/active/starbound/weapons/broadswords/floran/t6s.png and b/items/active/starbound/weapons/broadswords/floran/t6s.png differ diff --git a/items/active/starbound/weapons/broadswords/flowerbouquet.png b/items/active/starbound/weapons/broadswords/flowerbouquet.png index a340708c..034f2ea6 100644 Binary files a/items/active/starbound/weapons/broadswords/flowerbouquet.png and b/items/active/starbound/weapons/broadswords/flowerbouquet.png differ diff --git a/items/active/starbound/weapons/broadswords/glitch/starter.png b/items/active/starbound/weapons/broadswords/glitch/starter.png index 72cfec79..0c4cc80a 100644 Binary files a/items/active/starbound/weapons/broadswords/glitch/starter.png and b/items/active/starbound/weapons/broadswords/glitch/starter.png differ diff --git a/items/active/starbound/weapons/broadswords/glitch/t4.png b/items/active/starbound/weapons/broadswords/glitch/t4.png index d33e0148..cf42f624 100644 Binary files a/items/active/starbound/weapons/broadswords/glitch/t4.png and b/items/active/starbound/weapons/broadswords/glitch/t4.png differ diff --git a/items/active/starbound/weapons/broadswords/glitch/t5a.png b/items/active/starbound/weapons/broadswords/glitch/t5a.png index 8e696d6e..463a7484 100644 Binary files a/items/active/starbound/weapons/broadswords/glitch/t5a.png and b/items/active/starbound/weapons/broadswords/glitch/t5a.png differ diff --git a/items/active/starbound/weapons/broadswords/glitch/t6m.png b/items/active/starbound/weapons/broadswords/glitch/t6m.png index aab9d856..9c6277b8 100644 Binary files a/items/active/starbound/weapons/broadswords/glitch/t6m.png and b/items/active/starbound/weapons/broadswords/glitch/t6m.png differ diff --git a/items/active/starbound/weapons/broadswords/glitch/t6s.png b/items/active/starbound/weapons/broadswords/glitch/t6s.png index 0927843b..4d9c720b 100644 Binary files a/items/active/starbound/weapons/broadswords/glitch/t6s.png and b/items/active/starbound/weapons/broadswords/glitch/t6s.png differ diff --git a/items/active/starbound/weapons/broadswords/human/starter.png b/items/active/starbound/weapons/broadswords/human/starter.png index 8d5b4f03..e61c56e4 100644 Binary files a/items/active/starbound/weapons/broadswords/human/starter.png and b/items/active/starbound/weapons/broadswords/human/starter.png differ diff --git a/items/active/starbound/weapons/broadswords/human/t5a.png b/items/active/starbound/weapons/broadswords/human/t5a.png index 7a41b2fa..8c7f1631 100644 Binary files a/items/active/starbound/weapons/broadswords/human/t5a.png and b/items/active/starbound/weapons/broadswords/human/t5a.png differ diff --git a/items/active/starbound/weapons/broadswords/human/t5m.png b/items/active/starbound/weapons/broadswords/human/t5m.png index 278ef3fa..4e6199f4 100644 Binary files a/items/active/starbound/weapons/broadswords/human/t5m.png and b/items/active/starbound/weapons/broadswords/human/t5m.png differ diff --git a/items/active/starbound/weapons/broadswords/human/t6a.png b/items/active/starbound/weapons/broadswords/human/t6a.png index 6762bdb7..cdb153fe 100644 Binary files a/items/active/starbound/weapons/broadswords/human/t6a.png and b/items/active/starbound/weapons/broadswords/human/t6a.png differ diff --git a/items/active/starbound/weapons/broadswords/human/t6s.png b/items/active/starbound/weapons/broadswords/human/t6s.png index 0416508b..5fdcad50 100644 Binary files a/items/active/starbound/weapons/broadswords/human/t6s.png and b/items/active/starbound/weapons/broadswords/human/t6s.png differ diff --git a/items/active/starbound/weapons/broadswords/hylotl/starter.png b/items/active/starbound/weapons/broadswords/hylotl/starter.png index 67663f26..7cee94e0 100644 Binary files a/items/active/starbound/weapons/broadswords/hylotl/starter.png and b/items/active/starbound/weapons/broadswords/hylotl/starter.png differ diff --git a/items/active/starbound/weapons/broadswords/hylotl/t6a.png b/items/active/starbound/weapons/broadswords/hylotl/t6a.png index c5434a81..0e2310dd 100644 Binary files a/items/active/starbound/weapons/broadswords/hylotl/t6a.png and b/items/active/starbound/weapons/broadswords/hylotl/t6a.png differ diff --git a/items/active/starbound/weapons/broadswords/hylotl/t6m.png b/items/active/starbound/weapons/broadswords/hylotl/t6m.png index 3720bcae..45272d78 100644 Binary files a/items/active/starbound/weapons/broadswords/hylotl/t6m.png and b/items/active/starbound/weapons/broadswords/hylotl/t6m.png differ diff --git a/items/active/starbound/weapons/broadswords/petals.png b/items/active/starbound/weapons/broadswords/petals.png index 05abb33a..8280ccd0 100644 Binary files a/items/active/starbound/weapons/broadswords/petals.png and b/items/active/starbound/weapons/broadswords/petals.png differ diff --git a/items/active/starbound/weapons/colorful/rainbowswoosh.frames b/items/active/starbound/weapons/broadswords/rainbowswoosh.frames similarity index 100% rename from items/active/starbound/weapons/colorful/rainbowswoosh.frames rename to items/active/starbound/weapons/broadswords/rainbowswoosh.frames diff --git a/items/active/starbound/weapons/broadswords/rainbowswoosh.png b/items/active/starbound/weapons/broadswords/rainbowswoosh.png new file mode 100644 index 00000000..82b7ae82 Binary files /dev/null and b/items/active/starbound/weapons/broadswords/rainbowswoosh.png differ diff --git a/items/active/starbound/weapons/broadswords/rainbowswooshoriginal.png b/items/active/starbound/weapons/broadswords/rainbowswooshoriginal.png new file mode 100644 index 00000000..3ce078df Binary files /dev/null and b/items/active/starbound/weapons/broadswords/rainbowswooshoriginal.png differ diff --git a/items/active/starbound/weapons/colorful/rainbowsword.activeitem b/items/active/starbound/weapons/broadswords/rainbowsword.activeitem similarity index 96% rename from items/active/starbound/weapons/colorful/rainbowsword.activeitem rename to items/active/starbound/weapons/broadswords/rainbowsword.activeitem index a2c161a0..9638b72c 100644 --- a/items/active/starbound/weapons/colorful/rainbowsword.activeitem +++ b/items/active/starbound/weapons/broadswords/rainbowsword.activeitem @@ -1,14 +1,14 @@ { "itemName": "sb_rainbowsword", "level": 1, - "price": 100, + "price": 1080, "maxStack": 1, "rarity": "rare", "sb_waBan": true, "tooltipKind": "sb_sword2", "category": "broadsword", "description": "This beautiful blade shines with a striking iridescence that catches the eye.", //bends light around it like a prism, - "shortdescription": "Rainbow Sword", + "shortdescription": "Rainbow Rapier", "twoHanded": true, "itemTags": ["weapon", "melee", "broadsword", "upgradeableWeapon"], "animation": "/items/active/starbound/weapons/broadsword.animation", diff --git a/items/active/starbound/weapons/broadswords/rainbowsword.png b/items/active/starbound/weapons/broadswords/rainbowsword.png new file mode 100644 index 00000000..29060e88 Binary files /dev/null and b/items/active/starbound/weapons/broadswords/rainbowsword.png differ diff --git a/items/active/starbound/weapons/broadswords/starcleaver.png b/items/active/starbound/weapons/broadswords/starcleaver.png index 9e45fc42..a8303e58 100644 Binary files a/items/active/starbound/weapons/broadswords/starcleaver.png and b/items/active/starbound/weapons/broadswords/starcleaver.png differ diff --git a/items/active/starbound/weapons/broadswords/starcleaverswoosh.png b/items/active/starbound/weapons/broadswords/starcleaverswoosh.png index 2d1d355a..002e5c8c 100644 Binary files a/items/active/starbound/weapons/broadswords/starcleaverswoosh.png and b/items/active/starbound/weapons/broadswords/starcleaverswoosh.png differ diff --git a/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/2.png b/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/2.png index 6b2c6d47..1c192103 100644 Binary files a/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/2.png and b/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/2.png differ diff --git a/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/3.png b/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/3.png index 71cf9bfc..dcd5a348 100644 Binary files a/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/3.png and b/items/active/starbound/weapons/broadswords/toxicbroadsword/blade/3.png differ diff --git a/items/active/starbound/weapons/broadswords/waterswoosh.png b/items/active/starbound/weapons/broadswords/waterswoosh.png index bc18503e..155402e8 100644 Binary files a/items/active/starbound/weapons/broadswords/waterswoosh.png and b/items/active/starbound/weapons/broadswords/waterswoosh.png differ diff --git a/items/active/starbound/weapons/broadswords/watersword.png b/items/active/starbound/weapons/broadswords/watersword.png index 460887fb..a6e1347d 100644 Binary files a/items/active/starbound/weapons/broadswords/watersword.png and b/items/active/starbound/weapons/broadswords/watersword.png differ diff --git a/items/active/starbound/weapons/colorful/crayonswoosh.png b/items/active/starbound/weapons/colorful/crayonswoosh.png deleted file mode 100644 index dbbbe186..00000000 Binary files a/items/active/starbound/weapons/colorful/crayonswoosh.png and /dev/null differ diff --git a/items/active/starbound/weapons/colorful/rainbowswoosh.png b/items/active/starbound/weapons/colorful/rainbowswoosh.png deleted file mode 100644 index 2875a5ab..00000000 Binary files a/items/active/starbound/weapons/colorful/rainbowswoosh.png and /dev/null differ diff --git a/items/active/starbound/weapons/colorful/rainbowswooshoriginal.png b/items/active/starbound/weapons/colorful/rainbowswooshoriginal.png deleted file mode 100644 index b26d1780..00000000 Binary files a/items/active/starbound/weapons/colorful/rainbowswooshoriginal.png and /dev/null differ diff --git a/items/active/starbound/weapons/colorful/rainbowsword.png b/items/active/starbound/weapons/colorful/rainbowsword.png deleted file mode 100644 index 15981131..00000000 Binary files a/items/active/starbound/weapons/colorful/rainbowsword.png and /dev/null differ diff --git a/items/active/starbound/weapons/daggers/apex/t1.png b/items/active/starbound/weapons/daggers/apex/t1.png index 797cfd3f..df91dfde 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t1.png and b/items/active/starbound/weapons/daggers/apex/t1.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t2.png b/items/active/starbound/weapons/daggers/apex/t2.png index aef12367..e5fd7c39 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t2.png and b/items/active/starbound/weapons/daggers/apex/t2.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t4.png b/items/active/starbound/weapons/daggers/apex/t4.png index 7c16ee88..54fe3646 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t4.png and b/items/active/starbound/weapons/daggers/apex/t4.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t5a.png b/items/active/starbound/weapons/daggers/apex/t5a.png index 298d5aec..f13a92b8 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t5a.png and b/items/active/starbound/weapons/daggers/apex/t5a.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t5m.png b/items/active/starbound/weapons/daggers/apex/t5m.png index 6f16a142..7a527b2e 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t5m.png and b/items/active/starbound/weapons/daggers/apex/t5m.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t5s.png b/items/active/starbound/weapons/daggers/apex/t5s.png index 2cc0ee52..738e389f 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t5s.png and b/items/active/starbound/weapons/daggers/apex/t5s.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t6a.png b/items/active/starbound/weapons/daggers/apex/t6a.png index 436340f9..27ca4e92 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t6a.png and b/items/active/starbound/weapons/daggers/apex/t6a.png differ diff --git a/items/active/starbound/weapons/daggers/apex/t6s.png b/items/active/starbound/weapons/daggers/apex/t6s.png index bfc39af5..330ae323 100644 Binary files a/items/active/starbound/weapons/daggers/apex/t6s.png and b/items/active/starbound/weapons/daggers/apex/t6s.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t1.png b/items/active/starbound/weapons/daggers/avian/t1.png index a9ba18e8..45fb44df 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t1.png and b/items/active/starbound/weapons/daggers/avian/t1.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t2.png b/items/active/starbound/weapons/daggers/avian/t2.png index 188d128f..de9248c7 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t2.png and b/items/active/starbound/weapons/daggers/avian/t2.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t3.png b/items/active/starbound/weapons/daggers/avian/t3.png index 9787db64..315307e3 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t3.png and b/items/active/starbound/weapons/daggers/avian/t3.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t4.png b/items/active/starbound/weapons/daggers/avian/t4.png index 19a9a803..55ddca42 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t4.png and b/items/active/starbound/weapons/daggers/avian/t4.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t5a.png b/items/active/starbound/weapons/daggers/avian/t5a.png index ab2697a8..5cd8913a 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t5a.png and b/items/active/starbound/weapons/daggers/avian/t5a.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t5m.png b/items/active/starbound/weapons/daggers/avian/t5m.png index 60cc4b3d..cad163eb 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t5m.png and b/items/active/starbound/weapons/daggers/avian/t5m.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t5s.png b/items/active/starbound/weapons/daggers/avian/t5s.png index 70132b4d..2b4e341d 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t5s.png and b/items/active/starbound/weapons/daggers/avian/t5s.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t6_.png b/items/active/starbound/weapons/daggers/avian/t6_.png index b48eed62..2b4e341d 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t6_.png and b/items/active/starbound/weapons/daggers/avian/t6_.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t6a.png b/items/active/starbound/weapons/daggers/avian/t6a.png index f01bb0a6..77e81ebd 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t6a.png and b/items/active/starbound/weapons/daggers/avian/t6a.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t6m.png b/items/active/starbound/weapons/daggers/avian/t6m.png index c1c3bd40..000f8641 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t6m.png and b/items/active/starbound/weapons/daggers/avian/t6m.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t6s.png b/items/active/starbound/weapons/daggers/avian/t6s.png index 996134b4..9a112792 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t6s.png and b/items/active/starbound/weapons/daggers/avian/t6s.png differ diff --git a/items/active/starbound/weapons/daggers/avian/t9_.png b/items/active/starbound/weapons/daggers/avian/t9_.png index 6679ae18..34e696b0 100644 Binary files a/items/active/starbound/weapons/daggers/avian/t9_.png and b/items/active/starbound/weapons/daggers/avian/t9_.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw.activeitem b/items/active/starbound/weapons/daggers/bonesaw.activeitem index 16ec3129..fe1c8931 100644 --- a/items/active/starbound/weapons/daggers/bonesaw.activeitem +++ b/items/active/starbound/weapons/daggers/bonesaw.activeitem @@ -24,11 +24,11 @@ "aimOffset": 0, "primaryAbilityType": "sb_dagger", "primaryAbility": { - "fireTime" : [0.27, 0.42], - "baseDps" : [8.0, 9.0], + "fireTime": [0.27, 0.42], + "baseDps": [8.0, 9.0], "damageConfig": { "damageSourceKind": "slash", - "knockbackRange" : [10, 15] + "knockbackRange": [10, 15] } }, diff --git a/items/active/starbound/weapons/daggers/bonesaw/blade/2.png b/items/active/starbound/weapons/daggers/bonesaw/blade/2.png index b676e100..c3e0fcd4 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/blade/2.png and b/items/active/starbound/weapons/daggers/bonesaw/blade/2.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/blade/4.png b/items/active/starbound/weapons/daggers/bonesaw/blade/4.png index 7f6c45df..3dc49187 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/blade/4.png and b/items/active/starbound/weapons/daggers/bonesaw/blade/4.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/blade/5.png b/items/active/starbound/weapons/daggers/bonesaw/blade/5.png index e2bec34c..9f5156c7 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/blade/5.png and b/items/active/starbound/weapons/daggers/bonesaw/blade/5.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/handle/1.png b/items/active/starbound/weapons/daggers/bonesaw/handle/1.png index f687f5fa..d4cf4609 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/handle/1.png and b/items/active/starbound/weapons/daggers/bonesaw/handle/1.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/handle/2.png b/items/active/starbound/weapons/daggers/bonesaw/handle/2.png index e0d12c1b..5fef6997 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/handle/2.png and b/items/active/starbound/weapons/daggers/bonesaw/handle/2.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/handle/3.png b/items/active/starbound/weapons/daggers/bonesaw/handle/3.png index 848f5c6c..9f918fa3 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/handle/3.png and b/items/active/starbound/weapons/daggers/bonesaw/handle/3.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/handle/4.png b/items/active/starbound/weapons/daggers/bonesaw/handle/4.png index 5e6f21d5..518350a0 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/handle/4.png and b/items/active/starbound/weapons/daggers/bonesaw/handle/4.png differ diff --git a/items/active/starbound/weapons/daggers/bonesaw/handle/5.png b/items/active/starbound/weapons/daggers/bonesaw/handle/5.png index 1c18fbc9..6b7f8f0c 100644 Binary files a/items/active/starbound/weapons/daggers/bonesaw/handle/5.png and b/items/active/starbound/weapons/daggers/bonesaw/handle/5.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/1.png b/items/active/starbound/weapons/daggers/dagger/blade/1.png index 0cdf7862..7f04f785 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/1.png and b/items/active/starbound/weapons/daggers/dagger/blade/1.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/10.png b/items/active/starbound/weapons/daggers/dagger/blade/10.png index 61438e64..04da9ced 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/10.png and b/items/active/starbound/weapons/daggers/dagger/blade/10.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/11.png b/items/active/starbound/weapons/daggers/dagger/blade/11.png index 4ed6ffed..32a2dd56 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/11.png and b/items/active/starbound/weapons/daggers/dagger/blade/11.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/12.png b/items/active/starbound/weapons/daggers/dagger/blade/12.png index d0f09d2b..dcc79795 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/12.png and b/items/active/starbound/weapons/daggers/dagger/blade/12.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/13.png b/items/active/starbound/weapons/daggers/dagger/blade/13.png index aac2da5a..a0027ad9 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/13.png and b/items/active/starbound/weapons/daggers/dagger/blade/13.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/14.png b/items/active/starbound/weapons/daggers/dagger/blade/14.png index 4fb507c8..2c403fc9 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/14.png and b/items/active/starbound/weapons/daggers/dagger/blade/14.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/15.png b/items/active/starbound/weapons/daggers/dagger/blade/15.png index 70a5f180..5a0d8d5e 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/15.png and b/items/active/starbound/weapons/daggers/dagger/blade/15.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/16.png b/items/active/starbound/weapons/daggers/dagger/blade/16.png index b63de724..047b803d 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/16.png and b/items/active/starbound/weapons/daggers/dagger/blade/16.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/17.png b/items/active/starbound/weapons/daggers/dagger/blade/17.png index c07fb3b7..bf324c06 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/17.png and b/items/active/starbound/weapons/daggers/dagger/blade/17.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/2.png b/items/active/starbound/weapons/daggers/dagger/blade/2.png index 3460718a..0a8f88ce 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/2.png and b/items/active/starbound/weapons/daggers/dagger/blade/2.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/3.png b/items/active/starbound/weapons/daggers/dagger/blade/3.png index 95afdbd8..9c6f67a3 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/3.png and b/items/active/starbound/weapons/daggers/dagger/blade/3.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/4.png b/items/active/starbound/weapons/daggers/dagger/blade/4.png index 6329371c..0266c896 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/4.png and b/items/active/starbound/weapons/daggers/dagger/blade/4.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/5.png b/items/active/starbound/weapons/daggers/dagger/blade/5.png index 6aa37e6f..44378bd2 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/5.png and b/items/active/starbound/weapons/daggers/dagger/blade/5.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/6.png b/items/active/starbound/weapons/daggers/dagger/blade/6.png index c3c817bd..feabde0b 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/6.png and b/items/active/starbound/weapons/daggers/dagger/blade/6.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/7.png b/items/active/starbound/weapons/daggers/dagger/blade/7.png index b3b617c7..2a853c3d 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/7.png and b/items/active/starbound/weapons/daggers/dagger/blade/7.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/8.png b/items/active/starbound/weapons/daggers/dagger/blade/8.png index 77724e7c..0c00003a 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/8.png and b/items/active/starbound/weapons/daggers/dagger/blade/8.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/blade/9.png b/items/active/starbound/weapons/daggers/dagger/blade/9.png index 0ee90451..6f194096 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/blade/9.png and b/items/active/starbound/weapons/daggers/dagger/blade/9.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/1.png b/items/active/starbound/weapons/daggers/dagger/handle/1.png index 287900de..8be8d54d 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/1.png and b/items/active/starbound/weapons/daggers/dagger/handle/1.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/10.png b/items/active/starbound/weapons/daggers/dagger/handle/10.png index 7e3f4412..c24d661d 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/10.png and b/items/active/starbound/weapons/daggers/dagger/handle/10.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/11.png b/items/active/starbound/weapons/daggers/dagger/handle/11.png index 971a6c19..18e0fda1 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/11.png and b/items/active/starbound/weapons/daggers/dagger/handle/11.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/12.png b/items/active/starbound/weapons/daggers/dagger/handle/12.png index f76bde24..7578bdd2 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/12.png and b/items/active/starbound/weapons/daggers/dagger/handle/12.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/13.png b/items/active/starbound/weapons/daggers/dagger/handle/13.png index 80e4b7b5..7cba018c 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/13.png and b/items/active/starbound/weapons/daggers/dagger/handle/13.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/14.png b/items/active/starbound/weapons/daggers/dagger/handle/14.png index b589de03..83792d8a 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/14.png and b/items/active/starbound/weapons/daggers/dagger/handle/14.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/15.png b/items/active/starbound/weapons/daggers/dagger/handle/15.png index 7b8c0a44..a8f0921d 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/15.png and b/items/active/starbound/weapons/daggers/dagger/handle/15.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/16.png b/items/active/starbound/weapons/daggers/dagger/handle/16.png index f130ef58..ca16729e 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/16.png and b/items/active/starbound/weapons/daggers/dagger/handle/16.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/17.png b/items/active/starbound/weapons/daggers/dagger/handle/17.png index 8fe63af9..d02cff6c 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/17.png and b/items/active/starbound/weapons/daggers/dagger/handle/17.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/18.png b/items/active/starbound/weapons/daggers/dagger/handle/18.png index 88ea3cdb..e0dad74b 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/18.png and b/items/active/starbound/weapons/daggers/dagger/handle/18.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/19.png b/items/active/starbound/weapons/daggers/dagger/handle/19.png index 30115904..9cd3da06 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/19.png and b/items/active/starbound/weapons/daggers/dagger/handle/19.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/2.png b/items/active/starbound/weapons/daggers/dagger/handle/2.png index 8a908479..d9618cdf 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/2.png and b/items/active/starbound/weapons/daggers/dagger/handle/2.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/20.png b/items/active/starbound/weapons/daggers/dagger/handle/20.png index 635b7efa..8fc17476 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/20.png and b/items/active/starbound/weapons/daggers/dagger/handle/20.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/3.png b/items/active/starbound/weapons/daggers/dagger/handle/3.png index 6a07d9b7..801042fe 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/3.png and b/items/active/starbound/weapons/daggers/dagger/handle/3.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/4.png b/items/active/starbound/weapons/daggers/dagger/handle/4.png index e2fa49b3..2cb4ffdb 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/4.png and b/items/active/starbound/weapons/daggers/dagger/handle/4.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/5.png b/items/active/starbound/weapons/daggers/dagger/handle/5.png index 0eef1080..1b09c1f0 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/5.png and b/items/active/starbound/weapons/daggers/dagger/handle/5.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/7.png b/items/active/starbound/weapons/daggers/dagger/handle/7.png index a6f13830..12389d7d 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/7.png and b/items/active/starbound/weapons/daggers/dagger/handle/7.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/8.png b/items/active/starbound/weapons/daggers/dagger/handle/8.png index 53be7778..1433c83b 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/8.png and b/items/active/starbound/weapons/daggers/dagger/handle/8.png differ diff --git a/items/active/starbound/weapons/daggers/dagger/handle/9.png b/items/active/starbound/weapons/daggers/dagger/handle/9.png index 672594ab..06d2edd6 100644 Binary files a/items/active/starbound/weapons/daggers/dagger/handle/9.png and b/items/active/starbound/weapons/daggers/dagger/handle/9.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t1.png b/items/active/starbound/weapons/daggers/floran/t1.png index 3b8fb2f4..be6671fc 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t1.png and b/items/active/starbound/weapons/daggers/floran/t1.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t2.png b/items/active/starbound/weapons/daggers/floran/t2.png index 3bdf30b6..3a6160ef 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t2.png and b/items/active/starbound/weapons/daggers/floran/t2.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t3.png b/items/active/starbound/weapons/daggers/floran/t3.png index 8b8fcc5f..525f464b 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t3.png and b/items/active/starbound/weapons/daggers/floran/t3.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t4.png b/items/active/starbound/weapons/daggers/floran/t4.png index 4ef2ba6d..33718ebc 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t4.png and b/items/active/starbound/weapons/daggers/floran/t4.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t5a.png b/items/active/starbound/weapons/daggers/floran/t5a.png index b3ea8811..7466bf41 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t5a.png and b/items/active/starbound/weapons/daggers/floran/t5a.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t5m.png b/items/active/starbound/weapons/daggers/floran/t5m.png index c39db328..1fb96315 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t5m.png and b/items/active/starbound/weapons/daggers/floran/t5m.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t5s.png b/items/active/starbound/weapons/daggers/floran/t5s.png index 878d1907..c7eab546 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t5s.png and b/items/active/starbound/weapons/daggers/floran/t5s.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t6a.png b/items/active/starbound/weapons/daggers/floran/t6a.png index 58a06f0e..af48b763 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t6a.png and b/items/active/starbound/weapons/daggers/floran/t6a.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t6m.png b/items/active/starbound/weapons/daggers/floran/t6m.png index ed854cae..77df37f0 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t6m.png and b/items/active/starbound/weapons/daggers/floran/t6m.png differ diff --git a/items/active/starbound/weapons/daggers/floran/t6s.png b/items/active/starbound/weapons/daggers/floran/t6s.png index 53d5534c..8c34600c 100644 Binary files a/items/active/starbound/weapons/daggers/floran/t6s.png and b/items/active/starbound/weapons/daggers/floran/t6s.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t1.png b/items/active/starbound/weapons/daggers/glitch/t1.png index bbfe5747..8289185a 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t1.png and b/items/active/starbound/weapons/daggers/glitch/t1.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t2.png b/items/active/starbound/weapons/daggers/glitch/t2.png index 9be0d8f9..2f1ff4b2 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t2.png and b/items/active/starbound/weapons/daggers/glitch/t2.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t3.png b/items/active/starbound/weapons/daggers/glitch/t3.png index 6af7b9ae..8e7f17a5 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t3.png and b/items/active/starbound/weapons/daggers/glitch/t3.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t4.png b/items/active/starbound/weapons/daggers/glitch/t4.png index af4110cd..ce8fcab1 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t4.png and b/items/active/starbound/weapons/daggers/glitch/t4.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t5a.png b/items/active/starbound/weapons/daggers/glitch/t5a.png index b4ceee35..c437db67 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t5a.png and b/items/active/starbound/weapons/daggers/glitch/t5a.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t5m.png b/items/active/starbound/weapons/daggers/glitch/t5m.png index 4f57b89f..59de55c5 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t5m.png and b/items/active/starbound/weapons/daggers/glitch/t5m.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t5s.png b/items/active/starbound/weapons/daggers/glitch/t5s.png index a78bbd91..f5bfc48e 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t5s.png and b/items/active/starbound/weapons/daggers/glitch/t5s.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t6a.png b/items/active/starbound/weapons/daggers/glitch/t6a.png index 63d3b590..8672f3ba 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t6a.png and b/items/active/starbound/weapons/daggers/glitch/t6a.png differ diff --git a/items/active/starbound/weapons/daggers/glitch/t6m.png b/items/active/starbound/weapons/daggers/glitch/t6m.png index 7de24a4f..60c92223 100644 Binary files a/items/active/starbound/weapons/daggers/glitch/t6m.png and b/items/active/starbound/weapons/daggers/glitch/t6m.png differ diff --git a/items/active/starbound/weapons/daggers/gutterknife.png b/items/active/starbound/weapons/daggers/gutterknife.png index 39df2e29..706d816d 100644 Binary files a/items/active/starbound/weapons/daggers/gutterknife.png and b/items/active/starbound/weapons/daggers/gutterknife.png differ diff --git a/items/active/starbound/weapons/daggers/heckswoosh.png b/items/active/starbound/weapons/daggers/heckswoosh.png index ed9e5c00..dea292fe 100644 Binary files a/items/active/starbound/weapons/daggers/heckswoosh.png and b/items/active/starbound/weapons/daggers/heckswoosh.png differ diff --git a/items/active/starbound/weapons/daggers/human/t1.png b/items/active/starbound/weapons/daggers/human/t1.png index 868c3bd5..16db9751 100644 Binary files a/items/active/starbound/weapons/daggers/human/t1.png and b/items/active/starbound/weapons/daggers/human/t1.png differ diff --git a/items/active/starbound/weapons/daggers/human/t2.png b/items/active/starbound/weapons/daggers/human/t2.png index 6a7285e5..9e4e69a0 100644 Binary files a/items/active/starbound/weapons/daggers/human/t2.png and b/items/active/starbound/weapons/daggers/human/t2.png differ diff --git a/items/active/starbound/weapons/daggers/human/t3.png b/items/active/starbound/weapons/daggers/human/t3.png index 1f703034..fc1951b4 100644 Binary files a/items/active/starbound/weapons/daggers/human/t3.png and b/items/active/starbound/weapons/daggers/human/t3.png differ diff --git a/items/active/starbound/weapons/daggers/human/t4.png b/items/active/starbound/weapons/daggers/human/t4.png index 8b02a8c9..0af2e0f4 100644 Binary files a/items/active/starbound/weapons/daggers/human/t4.png and b/items/active/starbound/weapons/daggers/human/t4.png differ diff --git a/items/active/starbound/weapons/daggers/human/t5a.png b/items/active/starbound/weapons/daggers/human/t5a.png index ddd63dcd..1141567e 100644 Binary files a/items/active/starbound/weapons/daggers/human/t5a.png and b/items/active/starbound/weapons/daggers/human/t5a.png differ diff --git a/items/active/starbound/weapons/daggers/human/t5m.png b/items/active/starbound/weapons/daggers/human/t5m.png index 1046a81c..fbf8218e 100644 Binary files a/items/active/starbound/weapons/daggers/human/t5m.png and b/items/active/starbound/weapons/daggers/human/t5m.png differ diff --git a/items/active/starbound/weapons/daggers/human/t5s.png b/items/active/starbound/weapons/daggers/human/t5s.png index b11140ca..8bae7718 100644 Binary files a/items/active/starbound/weapons/daggers/human/t5s.png and b/items/active/starbound/weapons/daggers/human/t5s.png differ diff --git a/items/active/starbound/weapons/daggers/human/t6a.png b/items/active/starbound/weapons/daggers/human/t6a.png index cd827b5a..66ebc2a8 100644 Binary files a/items/active/starbound/weapons/daggers/human/t6a.png and b/items/active/starbound/weapons/daggers/human/t6a.png differ diff --git a/items/active/starbound/weapons/daggers/human/t6m.png b/items/active/starbound/weapons/daggers/human/t6m.png index 099737dd..275cd7b0 100644 Binary files a/items/active/starbound/weapons/daggers/human/t6m.png and b/items/active/starbound/weapons/daggers/human/t6m.png differ diff --git a/items/active/starbound/weapons/daggers/human/t6s.png b/items/active/starbound/weapons/daggers/human/t6s.png index d08b7462..84b74e10 100644 Binary files a/items/active/starbound/weapons/daggers/human/t6s.png and b/items/active/starbound/weapons/daggers/human/t6s.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t10.png b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t10.png index f668bd8d..97936ce8 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t10.png and b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t10.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t4.png b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t4.png index 12ef684f..4bca2403 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t4.png and b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t4.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t5.png b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t5.png index da54fc7f..75b905fc 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t5.png and b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t5.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t7.png b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t7.png index 164eae2b..cdc2192d 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/hylotl old/t7.png and b/items/active/starbound/weapons/daggers/hylotl/hylotl old/t7.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t1.png b/items/active/starbound/weapons/daggers/hylotl/t1.png index 0df3395a..65dcbda0 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t1.png and b/items/active/starbound/weapons/daggers/hylotl/t1.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t2.png b/items/active/starbound/weapons/daggers/hylotl/t2.png index 826d3fb2..0c5f298a 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t2.png and b/items/active/starbound/weapons/daggers/hylotl/t2.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t3.png b/items/active/starbound/weapons/daggers/hylotl/t3.png index ede5dac8..7f73dc32 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t3.png and b/items/active/starbound/weapons/daggers/hylotl/t3.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t4.png b/items/active/starbound/weapons/daggers/hylotl/t4.png index 8dc74954..d33361b6 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t4.png and b/items/active/starbound/weapons/daggers/hylotl/t4.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t5a.png b/items/active/starbound/weapons/daggers/hylotl/t5a.png index ee72b229..2c74a803 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t5a.png and b/items/active/starbound/weapons/daggers/hylotl/t5a.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t5m.png b/items/active/starbound/weapons/daggers/hylotl/t5m.png index 02678aa3..63632cfc 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t5m.png and b/items/active/starbound/weapons/daggers/hylotl/t5m.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t5s.png b/items/active/starbound/weapons/daggers/hylotl/t5s.png index 85621dee..28d8dfc2 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t5s.png and b/items/active/starbound/weapons/daggers/hylotl/t5s.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t6a.png b/items/active/starbound/weapons/daggers/hylotl/t6a.png index 8b5e060b..fd7fd649 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t6a.png and b/items/active/starbound/weapons/daggers/hylotl/t6a.png differ diff --git a/items/active/starbound/weapons/daggers/hylotl/t6m.png b/items/active/starbound/weapons/daggers/hylotl/t6m.png index 628652f1..f4678800 100644 Binary files a/items/active/starbound/weapons/daggers/hylotl/t6m.png and b/items/active/starbound/weapons/daggers/hylotl/t6m.png differ diff --git a/items/active/starbound/weapons/daggers/nightstick.png b/items/active/starbound/weapons/daggers/nightstick.png index 6d4a3f75..c52053e3 100644 Binary files a/items/active/starbound/weapons/daggers/nightstick.png and b/items/active/starbound/weapons/daggers/nightstick.png differ diff --git a/items/active/starbound/weapons/daggers/shiv/blade/1.png b/items/active/starbound/weapons/daggers/shiv/blade/1.png index c3be6355..fc2f51d5 100644 Binary files a/items/active/starbound/weapons/daggers/shiv/blade/1.png and b/items/active/starbound/weapons/daggers/shiv/blade/1.png differ diff --git a/items/active/starbound/weapons/daggers/shiv/blade/2.png b/items/active/starbound/weapons/daggers/shiv/blade/2.png index 9b144bde..0536d406 100644 Binary files a/items/active/starbound/weapons/daggers/shiv/blade/2.png and b/items/active/starbound/weapons/daggers/shiv/blade/2.png differ diff --git a/items/active/starbound/weapons/daggers/shiv/handle/1.png b/items/active/starbound/weapons/daggers/shiv/handle/1.png index e3f588eb..d7ef4e93 100644 Binary files a/items/active/starbound/weapons/daggers/shiv/handle/1.png and b/items/active/starbound/weapons/daggers/shiv/handle/1.png differ diff --git a/items/active/starbound/weapons/daggers/splatterknife.png b/items/active/starbound/weapons/daggers/splatterknife.png index 28949e5f..329abf68 100644 Binary files a/items/active/starbound/weapons/daggers/splatterknife.png and b/items/active/starbound/weapons/daggers/splatterknife.png differ diff --git a/items/active/starbound/weapons/daggers/steelspoon.png b/items/active/starbound/weapons/daggers/steelspoon.png index 749c26b4..91e425b4 100644 Binary files a/items/active/starbound/weapons/daggers/steelspoon.png and b/items/active/starbound/weapons/daggers/steelspoon.png differ diff --git a/items/active/starbound/weapons/hammer.weaponability b/items/active/starbound/weapons/hammer.weaponability index fac450f8..2453a656 100644 --- a/items/active/starbound/weapons/hammer.weaponability +++ b/items/active/starbound/weapons/hammer.weaponability @@ -16,7 +16,8 @@ "damageSourceKind" : "hammer", "statusEffects" : [ ], "knockbackMode" : "aim", - "knockback" : 40 + "knockback" : 40, + "timeout": 0.5 }, "smashMomentum" : [0, -45], "stances" : { diff --git a/items/active/starbound/weapons/hammers/apex/t1.png b/items/active/starbound/weapons/hammers/apex/t1.png index dd8743b7..7b078e4c 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t1.png and b/items/active/starbound/weapons/hammers/apex/t1.png differ diff --git a/items/active/starbound/weapons/hammers/apex/t2.png b/items/active/starbound/weapons/hammers/apex/t2.png index ec68ede9..07bc9dd8 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t2.png and b/items/active/starbound/weapons/hammers/apex/t2.png differ diff --git a/items/active/starbound/weapons/hammers/apex/t4.png b/items/active/starbound/weapons/hammers/apex/t4.png index a867c8ca..ff24cd67 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t4.png and b/items/active/starbound/weapons/hammers/apex/t4.png differ diff --git a/items/active/starbound/weapons/hammers/apex/t5m.png b/items/active/starbound/weapons/hammers/apex/t5m.png index 25f480c5..58721a59 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t5m.png and b/items/active/starbound/weapons/hammers/apex/t5m.png differ diff --git a/items/active/starbound/weapons/hammers/apex/t5s.png b/items/active/starbound/weapons/hammers/apex/t5s.png index 420f4d77..438f8fe9 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t5s.png and b/items/active/starbound/weapons/hammers/apex/t5s.png differ diff --git a/items/active/starbound/weapons/hammers/apex/t6a.png b/items/active/starbound/weapons/hammers/apex/t6a.png index 6e97b985..f5afcfc3 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t6a.png and b/items/active/starbound/weapons/hammers/apex/t6a.png differ diff --git a/items/active/starbound/weapons/hammers/apex/t6s.png b/items/active/starbound/weapons/hammers/apex/t6s.png index 98faceb4..8bb80a3f 100644 Binary files a/items/active/starbound/weapons/hammers/apex/t6s.png and b/items/active/starbound/weapons/hammers/apex/t6s.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t1.png b/items/active/starbound/weapons/hammers/avian/t1.png index e51f235c..0488c589 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t1.png and b/items/active/starbound/weapons/hammers/avian/t1.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t2.png b/items/active/starbound/weapons/hammers/avian/t2.png index 6a6a827e..74c73dd5 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t2.png and b/items/active/starbound/weapons/hammers/avian/t2.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t4.png b/items/active/starbound/weapons/hammers/avian/t4.png index 802359a4..a77e62be 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t4.png and b/items/active/starbound/weapons/hammers/avian/t4.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t5a.png b/items/active/starbound/weapons/hammers/avian/t5a.png index 9a71c7c9..a990cc09 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t5a.png and b/items/active/starbound/weapons/hammers/avian/t5a.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t5m.png b/items/active/starbound/weapons/hammers/avian/t5m.png index badc5ec2..03046318 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t5m.png and b/items/active/starbound/weapons/hammers/avian/t5m.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t5s.png b/items/active/starbound/weapons/hammers/avian/t5s.png index 5dd1defc..611bad04 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t5s.png and b/items/active/starbound/weapons/hammers/avian/t5s.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t6a.png b/items/active/starbound/weapons/hammers/avian/t6a.png index 4e71919f..c5b59907 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t6a.png and b/items/active/starbound/weapons/hammers/avian/t6a.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t6m.png b/items/active/starbound/weapons/hammers/avian/t6m.png index 91779a32..b1865707 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t6m.png and b/items/active/starbound/weapons/hammers/avian/t6m.png differ diff --git a/items/active/starbound/weapons/hammers/avian/t6s.png b/items/active/starbound/weapons/hammers/avian/t6s.png index 4d179b44..4454006e 100644 Binary files a/items/active/starbound/weapons/hammers/avian/t6s.png and b/items/active/starbound/weapons/hammers/avian/t6s.png differ diff --git a/items/active/starbound/weapons/hammers/bonehammer.activeitem b/items/active/starbound/weapons/hammers/bonehammer.activeitem index 7ce6116b..ea904eab 100644 --- a/items/active/starbound/weapons/hammers/bonehammer.activeitem +++ b/items/active/starbound/weapons/hammers/bonehammer.activeitem @@ -1,80 +1,93 @@ { - "itemName" : "sb_bonehammer", - "level" : 1, - "price" : 1500, - "maxStack" : 1, - "rarity" : "Legendary", - "description" : "BOOONNNNNNEEESTOOORRRMMM!", - "shortdescription" : "Bone Hammer", - "sb_waBan" : true, - "tooltipKind" : "sb_sword2", - "category" : "hammer", - "tooltipFields" : {"subtitle":"Bone Hammer"}, - "twoHanded" : true, - "itemTags" : ["weapon","melee","hammer","upgradeableWeapon"], + "itemName": "sb_bonehammer", + "level": 1, + "price": 1500, + "maxStack": 1, + "rarity": "Legendary", + "description": "BOOONNNNNNEEESTOOORRRMMM!", + "shortdescription": "Bone Hammer", + "sb_waBan": true, + "tooltipKind": "sb_sword2", + "category": "hammer", + "tooltipFields": { + "subtitle": "Bone Hammer" + }, + "twoHanded": true, + "itemTags": ["weapon", "melee", "hammer", "upgradeableWeapon"], - "inventoryIcon" : "bonehammer.png", - "animationParts" : { - "blade" : "bonehammer.png", - "handle" : "" + "inventoryIcon": "bonehammer.png", + "animationParts": { + "blade": "bonehammer.png", + "handle": "" }, - "builderConfig" : [{ - "nameGenerator" : "bonehammernames.config:nameGen", - "altAbilities" : ["physicalshockwave"] - }], - "animation" : "/items/active/starbound/weapons/hammer.animation", - "animationCustom" : { - "animatedParts":{ - "parts" : { - "swoosh" : {"partStates":{"swoosh":{"fire":{"properties":{"offset":[0,1.5],"image":"/projectiles/swoosh/sb_boneswoosh/boneswoosh.png:"}}} - }}, - "blade" : { - "properties" : { - "offset":[0.65, 1.875] + "builderConfig": [{ + "nameGenerator": "bonehammernames.config:nameGen", + "altAbilities": ["physicalshockwave"] + } + ], + "animation": "/items/active/starbound/weapons/hammer.animation", + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "offset": [0, 1.5], + "image": "/projectiles/swoosh/sb_boneswoosh/boneswoosh.png:" + } + } + } + } + }, + "blade": { + "properties": { + "offset": [0.65, 1.875] } }, - "handle" : { - "properties" : { - "offset":[0.65, 1.875] + "handle": { + "properties": { + "offset": [0.65, 1.875] } } } }, - "sounds" : { - "fire" : ["/sfx/melee/swing_hammer.ogg"], - "groundImpact" : [] + "sounds": { + "fire": ["/sfx/melee/swing_hammer.ogg"], + "groundImpact": [] } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "elementalType" : "physical", - "aimOffset" : -1.0, - "projectileDamageMultiplier" : 2.5, - "primaryAbilityType" : "sb_hammer", - "primaryAbility" : { - "fireTime" : [0.55,1.5], - "stances" : { - "idle" : { - "weaponRotation" : 0 + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "elementalType": "physical", + "aimOffset": -1.0, + "projectileDamageMultiplier": 2.5, + "primaryAbilityType": "sb_hammer", + "primaryAbility": { + "fireTime": [0.55, 1.5], + "stances": { + "idle": { + "weaponRotation": 0 }, - "windup" : { - "weaponRotation" : 0, - "weaponOffset" : [-0.125, 0.5] + "windup": { + "weaponRotation": 0, + "weaponOffset": [-0.125, 0.5] }, - "preslash" : { - "weaponOffset" : [-0.125, 0.5] + "preslash": { + "weaponOffset": [-0.125, 0.5] }, - "fire" : { - "armRotation" : -45, - "weaponRotation" : -45, - "weaponOffset" : [-0.125, 0.5] + "fire": { + "armRotation": -45, + "weaponRotation": -45, + "weaponOffset": [-0.125, 0.5] } }, - "baseDps" : [6.5,9], - "projectileOffset" : [2,2], - "projectileType" : "sb_boneswoosh" + "baseDps": [6.5, 9], + "projectileOffset": [2, 2], + "projectileType": "sb_boneswoosh" }, - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/hammers/bonehammer.png b/items/active/starbound/weapons/hammers/bonehammer.png index 1f5919ec..859e8d46 100644 Binary files a/items/active/starbound/weapons/hammers/bonehammer.png and b/items/active/starbound/weapons/hammers/bonehammer.png differ diff --git a/items/active/starbound/weapons/hammers/cactislammer.png b/items/active/starbound/weapons/hammers/cactislammer.png index 3a69e26e..3551e85f 100644 Binary files a/items/active/starbound/weapons/hammers/cactislammer.png and b/items/active/starbound/weapons/hammers/cactislammer.png differ diff --git a/items/active/starbound/weapons/hammers/cactislammerswoosh.png b/items/active/starbound/weapons/hammers/cactislammerswoosh.png index 894c8cec..311bc6e1 100644 Binary files a/items/active/starbound/weapons/hammers/cactislammerswoosh.png and b/items/active/starbound/weapons/hammers/cactislammerswoosh.png differ diff --git a/items/active/starbound/weapons/hammers/cavehammer.png b/items/active/starbound/weapons/hammers/cavehammer.png index 158c2516..12b5d57e 100644 Binary files a/items/active/starbound/weapons/hammers/cavehammer.png and b/items/active/starbound/weapons/hammers/cavehammer.png differ diff --git a/items/active/starbound/weapons/hammers/crappyhammer.activeitem b/items/active/starbound/weapons/hammers/crappyhammer.activeitem index c2593ecb..866a9deb 100644 --- a/items/active/starbound/weapons/hammers/crappyhammer.activeitem +++ b/items/active/starbound/weapons/hammers/crappyhammer.activeitem @@ -1,70 +1,94 @@ { - "itemName" : "sb_crappyhammer", - "price" : 25, - "maxStack" : 1, - "level" : 1, - "rarity" : "Common", - "description" : "", - "shortdescription" : "Crappy Hammer", - "tooltipKind" : "sb_sword", - "category" : "hammer", - "tooltipFields" : {"subtitle":"Crappy Hammer"}, - "twoHanded" : true, - "itemTags" : ["weapon","melee","hammer","crappy","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/hammer.animation", + "itemName": "sb_crappyhammer", + "price": 25, + "maxStack": 1, + "level": 1, + "rarity": "Common", + "description": "", + "shortdescription": "Crappy Hammer", + "tooltipKind": "sb_sword", + "category": "hammer", + "tooltipFields": { + "subtitle": "Crappy Hammer" + }, + "twoHanded": true, + "itemTags": ["weapon", "melee", "hammer", "crappy", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/hammer.animation", - "animationCustom" : { - "animatedParts" : { "parts" : { - "swoosh":{ "properties" : {"offset" : [-1.0, 1.75]}}, - "blade":{"properties":{"zLevel":1}}, - "handle":{"properties":{"zLevel":0}}} - }, - "lights":{"glow":{"color":[0,0,0]}}, - "sounds" : { - "fire" : [ "/sfx/melee/swing_hammer.ogg" ] + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "properties": { + "offset": [-1.0, 1.75] + } + }, + "blade": { + "properties": { + "zLevel": 1 + } + }, + "handle": { + "properties": { + "zLevel": 0 + } + } + } + }, + "lights": { + "glow": { + "color": [0, 0, 0] + } + }, + "sounds": { + "fire": ["/sfx/melee/swing_hammer.ogg"] } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : -1.0, + "aimOffset": -1.0, - "primaryAbilityType" : "sb_hammer", - "primaryAbility" : { - "fireTime" : [0.6,1.2], - "baseDps" : [4.5,8.5], - "damageConfig" : { - "knockbackRange" : [12,16] + "primaryAbilityType": "sb_hammer", + "primaryAbility": { + "fireTime": [0.6, 1.2], + "baseDps": [4.5, 8.5], + "damageConfig": { + "knockbackRange": [12, 16] }, - "stances" : { - "idle" : {"weaponOffset" : [0.3, 1.5]}, - "windup" : { - "duration" : 0.2, - "weaponOffset" : [0.3, 1.5]}, - "fire" : { - "duration" : 0.4, - "weaponOffset" : [0.3, 1.5] + "stances": { + "idle": { + "weaponOffset": [0.3, 1.5] + }, + "windup": { + "duration": 0.2, + "weaponOffset": [0.3, 1.5] + }, + "fire": { + "duration": 0.4, + "weaponOffset": [0.3, 1.5] } } }, - "elementalType" : "physical", - "builderConfig" : [{ - "nameGenerator" : "crappyhammernames.config:nameGen", - "animationParts" : { - "handle" : { - "path" : "crappyhammer/handle/.png", - "variants" : 5, - "paletteSwap" : true + "elementalType": "physical", + "builderConfig": [{ + "nameGenerator": "crappyhammernames.config:nameGen", + "animationParts": { + "handle": { + "path": "crappyhammer/handle/.png", + "variants": 5, + "paletteSwap": true + }, + "blade": { + "path": "crappyhammer/blade/.png", + "variants": 7, + "paletteSwap": true + } }, - "blade" : { - "path" : "crappyhammer/blade/.png", - "variants" : 7, - "paletteSwap" : true - } - }, - "palette" : "/items/active/starbound/colors/crappy.weaponcolors", - "iconDrawables" : ["handle", "blade"] - }], + "palette": "/items/active/starbound/colors/crappy.weaponcolors", + "iconDrawables": ["handle", "blade"] + } + ], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" + "builder": "/items/buildscripts/starbound/buildweapon.lua" } diff --git a/items/active/starbound/weapons/hammers/crappyhammer/blade/1.png b/items/active/starbound/weapons/hammers/crappyhammer/blade/1.png index 29d05335..4cda9b3d 100644 Binary files a/items/active/starbound/weapons/hammers/crappyhammer/blade/1.png and b/items/active/starbound/weapons/hammers/crappyhammer/blade/1.png differ diff --git a/items/active/starbound/weapons/hammers/crappyhammer/blade/4.png b/items/active/starbound/weapons/hammers/crappyhammer/blade/4.png index 46defc69..f030fa25 100644 Binary files a/items/active/starbound/weapons/hammers/crappyhammer/blade/4.png and b/items/active/starbound/weapons/hammers/crappyhammer/blade/4.png differ diff --git a/items/active/starbound/weapons/hammers/crappyhammer/handle/1.png b/items/active/starbound/weapons/hammers/crappyhammer/handle/1.png index 77bddfe2..d3d792d3 100644 Binary files a/items/active/starbound/weapons/hammers/crappyhammer/handle/1.png and b/items/active/starbound/weapons/hammers/crappyhammer/handle/1.png differ diff --git a/items/active/starbound/weapons/hammers/crappyhammer/handle/4.png b/items/active/starbound/weapons/hammers/crappyhammer/handle/4.png index 435f5c14..eff8441b 100644 Binary files a/items/active/starbound/weapons/hammers/crappyhammer/handle/4.png and b/items/active/starbound/weapons/hammers/crappyhammer/handle/4.png differ diff --git a/items/active/starbound/weapons/hammers/crappyhammer/handle/5.png b/items/active/starbound/weapons/hammers/crappyhammer/handle/5.png index b29f05dc..ac17e6ec 100644 Binary files a/items/active/starbound/weapons/hammers/crappyhammer/handle/5.png and b/items/active/starbound/weapons/hammers/crappyhammer/handle/5.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t1.png b/items/active/starbound/weapons/hammers/floran/t1.png index 8ea07c7d..74e7a965 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t1.png and b/items/active/starbound/weapons/hammers/floran/t1.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t3.png b/items/active/starbound/weapons/hammers/floran/t3.png index a55b2119..d8b1c2b3 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t3.png and b/items/active/starbound/weapons/hammers/floran/t3.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t4.png b/items/active/starbound/weapons/hammers/floran/t4.png index f4b73afb..c2faf9b9 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t4.png and b/items/active/starbound/weapons/hammers/floran/t4.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t5m.png b/items/active/starbound/weapons/hammers/floran/t5m.png index 0fb317e2..8ab19679 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t5m.png and b/items/active/starbound/weapons/hammers/floran/t5m.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t5s.png b/items/active/starbound/weapons/hammers/floran/t5s.png index 058368c6..d434115b 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t5s.png and b/items/active/starbound/weapons/hammers/floran/t5s.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t6a.png b/items/active/starbound/weapons/hammers/floran/t6a.png index a6011f8b..4e369754 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t6a.png and b/items/active/starbound/weapons/hammers/floran/t6a.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t6m.png b/items/active/starbound/weapons/hammers/floran/t6m.png index 04323565..89a17ce9 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t6m.png and b/items/active/starbound/weapons/hammers/floran/t6m.png differ diff --git a/items/active/starbound/weapons/hammers/floran/t6s.png b/items/active/starbound/weapons/hammers/floran/t6s.png index 1c20006c..270c9c56 100644 Binary files a/items/active/starbound/weapons/hammers/floran/t6s.png and b/items/active/starbound/weapons/hammers/floran/t6s.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t1.png b/items/active/starbound/weapons/hammers/glitch/t1.png index e12273f5..d8a1d5ce 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t1.png and b/items/active/starbound/weapons/hammers/glitch/t1.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t2.png b/items/active/starbound/weapons/hammers/glitch/t2.png index 191b8f9e..bae1752e 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t2.png and b/items/active/starbound/weapons/hammers/glitch/t2.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t4.png b/items/active/starbound/weapons/hammers/glitch/t4.png index 37dc7cd6..f1cd9a60 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t4.png and b/items/active/starbound/weapons/hammers/glitch/t4.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t5a.png b/items/active/starbound/weapons/hammers/glitch/t5a.png index af2cd280..8b90f2a0 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t5a.png and b/items/active/starbound/weapons/hammers/glitch/t5a.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t5m.png b/items/active/starbound/weapons/hammers/glitch/t5m.png index fa56e744..db2e373d 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t5m.png and b/items/active/starbound/weapons/hammers/glitch/t5m.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t5s.png b/items/active/starbound/weapons/hammers/glitch/t5s.png index 87c6d5b5..cd582799 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t5s.png and b/items/active/starbound/weapons/hammers/glitch/t5s.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t6m.png b/items/active/starbound/weapons/hammers/glitch/t6m.png index 1c7828c6..7edff34f 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t6m.png and b/items/active/starbound/weapons/hammers/glitch/t6m.png differ diff --git a/items/active/starbound/weapons/hammers/glitch/t6s.png b/items/active/starbound/weapons/hammers/glitch/t6s.png index 78b4956f..0c340241 100644 Binary files a/items/active/starbound/weapons/hammers/glitch/t6s.png and b/items/active/starbound/weapons/hammers/glitch/t6s.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/1.png b/items/active/starbound/weapons/hammers/hammer/blade/1.png index 72af03d6..30a4c785 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/1.png and b/items/active/starbound/weapons/hammers/hammer/blade/1.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/11.png b/items/active/starbound/weapons/hammers/hammer/blade/11.png index 66095fc4..f7e35554 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/11.png and b/items/active/starbound/weapons/hammers/hammer/blade/11.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/12.png b/items/active/starbound/weapons/hammers/hammer/blade/12.png index 4e2afdad..bc4dc8d6 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/12.png and b/items/active/starbound/weapons/hammers/hammer/blade/12.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/13.png b/items/active/starbound/weapons/hammers/hammer/blade/13.png index 566a7c19..beb878ca 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/13.png and b/items/active/starbound/weapons/hammers/hammer/blade/13.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/14.png b/items/active/starbound/weapons/hammers/hammer/blade/14.png index 0c189c63..dbb90213 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/14.png and b/items/active/starbound/weapons/hammers/hammer/blade/14.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/15.png b/items/active/starbound/weapons/hammers/hammer/blade/15.png index d5881ea7..6ab78d22 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/15.png and b/items/active/starbound/weapons/hammers/hammer/blade/15.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/16.png b/items/active/starbound/weapons/hammers/hammer/blade/16.png index c9f714fe..c5f91c4d 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/16.png and b/items/active/starbound/weapons/hammers/hammer/blade/16.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/17.png b/items/active/starbound/weapons/hammers/hammer/blade/17.png index f3a99125..01e81877 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/17.png and b/items/active/starbound/weapons/hammers/hammer/blade/17.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/18.png b/items/active/starbound/weapons/hammers/hammer/blade/18.png index 0c4081af..320f5081 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/18.png and b/items/active/starbound/weapons/hammers/hammer/blade/18.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/19.png b/items/active/starbound/weapons/hammers/hammer/blade/19.png index 8ab14f25..7ffde767 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/19.png and b/items/active/starbound/weapons/hammers/hammer/blade/19.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/2.png b/items/active/starbound/weapons/hammers/hammer/blade/2.png index d40dcff4..025d94d2 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/2.png and b/items/active/starbound/weapons/hammers/hammer/blade/2.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/20.png b/items/active/starbound/weapons/hammers/hammer/blade/20.png index da7000b1..bea640a0 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/20.png and b/items/active/starbound/weapons/hammers/hammer/blade/20.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/21.png b/items/active/starbound/weapons/hammers/hammer/blade/21.png index fd3e63c2..08b28932 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/21.png and b/items/active/starbound/weapons/hammers/hammer/blade/21.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/22.png b/items/active/starbound/weapons/hammers/hammer/blade/22.png index 98507563..cb66f36e 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/22.png and b/items/active/starbound/weapons/hammers/hammer/blade/22.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/3.png b/items/active/starbound/weapons/hammers/hammer/blade/3.png index 46ffa58e..38b0519d 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/3.png and b/items/active/starbound/weapons/hammers/hammer/blade/3.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/5.png b/items/active/starbound/weapons/hammers/hammer/blade/5.png index 3cc3ad59..38861180 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/5.png and b/items/active/starbound/weapons/hammers/hammer/blade/5.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/8.png b/items/active/starbound/weapons/hammers/hammer/blade/8.png index 23f6b1ee..8e46b768 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/8.png and b/items/active/starbound/weapons/hammers/hammer/blade/8.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/blade/9.png b/items/active/starbound/weapons/hammers/hammer/blade/9.png index 122cb2b3..1206c55e 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/blade/9.png and b/items/active/starbound/weapons/hammers/hammer/blade/9.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/1.png b/items/active/starbound/weapons/hammers/hammer/handle/1.png index c80de0a1..329b8482 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/1.png and b/items/active/starbound/weapons/hammers/hammer/handle/1.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/10.png b/items/active/starbound/weapons/hammers/hammer/handle/10.png index 6db998e1..735acea2 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/10.png and b/items/active/starbound/weapons/hammers/hammer/handle/10.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/11.png b/items/active/starbound/weapons/hammers/hammer/handle/11.png index 604254b1..7bbb4161 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/11.png and b/items/active/starbound/weapons/hammers/hammer/handle/11.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/15.png b/items/active/starbound/weapons/hammers/hammer/handle/15.png index a180b1f3..4cb8b97f 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/15.png and b/items/active/starbound/weapons/hammers/hammer/handle/15.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/16.png b/items/active/starbound/weapons/hammers/hammer/handle/16.png index 88f4c8d6..99832c51 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/16.png and b/items/active/starbound/weapons/hammers/hammer/handle/16.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/17.png b/items/active/starbound/weapons/hammers/hammer/handle/17.png index ed487490..51d09941 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/17.png and b/items/active/starbound/weapons/hammers/hammer/handle/17.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/18.png b/items/active/starbound/weapons/hammers/hammer/handle/18.png index 07432cd8..c478fcb7 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/18.png and b/items/active/starbound/weapons/hammers/hammer/handle/18.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/3.png b/items/active/starbound/weapons/hammers/hammer/handle/3.png index a4dfc4a3..ea901279 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/3.png and b/items/active/starbound/weapons/hammers/hammer/handle/3.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/4.png b/items/active/starbound/weapons/hammers/hammer/handle/4.png index 634f5670..aae78747 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/4.png and b/items/active/starbound/weapons/hammers/hammer/handle/4.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/5.png b/items/active/starbound/weapons/hammers/hammer/handle/5.png index 752f1515..cbdb78c8 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/5.png and b/items/active/starbound/weapons/hammers/hammer/handle/5.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/6.png b/items/active/starbound/weapons/hammers/hammer/handle/6.png index 07432cd8..c478fcb7 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/6.png and b/items/active/starbound/weapons/hammers/hammer/handle/6.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/7.png b/items/active/starbound/weapons/hammers/hammer/handle/7.png index 5b1a9e69..d855a3c9 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/7.png and b/items/active/starbound/weapons/hammers/hammer/handle/7.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/8.png b/items/active/starbound/weapons/hammers/hammer/handle/8.png index 64299f26..3563d8ac 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/8.png and b/items/active/starbound/weapons/hammers/hammer/handle/8.png differ diff --git a/items/active/starbound/weapons/hammers/hammer/handle/9.png b/items/active/starbound/weapons/hammers/hammer/handle/9.png index 78b2cb86..e8de36e4 100644 Binary files a/items/active/starbound/weapons/hammers/hammer/handle/9.png and b/items/active/starbound/weapons/hammers/hammer/handle/9.png differ diff --git a/items/active/starbound/weapons/hammers/hiveswoosh.png b/items/active/starbound/weapons/hammers/hiveswoosh.png index 0893a04e..2ff35985 100644 Binary files a/items/active/starbound/weapons/hammers/hiveswoosh.png and b/items/active/starbound/weapons/hammers/hiveswoosh.png differ diff --git a/items/active/starbound/weapons/hammers/hiveswooshx.png b/items/active/starbound/weapons/hammers/hiveswooshx.png index 02dc05d0..20dd488e 100644 Binary files a/items/active/starbound/weapons/hammers/hiveswooshx.png and b/items/active/starbound/weapons/hammers/hiveswooshx.png differ diff --git a/items/active/starbound/weapons/hammers/human/t2.png b/items/active/starbound/weapons/hammers/human/t2.png index 37812db3..61153ab5 100644 Binary files a/items/active/starbound/weapons/hammers/human/t2.png and b/items/active/starbound/weapons/hammers/human/t2.png differ diff --git a/items/active/starbound/weapons/hammers/human/t3.png b/items/active/starbound/weapons/hammers/human/t3.png index 8d0de645..59af3870 100644 Binary files a/items/active/starbound/weapons/hammers/human/t3.png and b/items/active/starbound/weapons/hammers/human/t3.png differ diff --git a/items/active/starbound/weapons/hammers/human/t4.png b/items/active/starbound/weapons/hammers/human/t4.png index 029bf3b0..3ddfcda0 100644 Binary files a/items/active/starbound/weapons/hammers/human/t4.png and b/items/active/starbound/weapons/hammers/human/t4.png differ diff --git a/items/active/starbound/weapons/hammers/human/t5s.png b/items/active/starbound/weapons/hammers/human/t5s.png index 123361b1..8b7a3b95 100644 Binary files a/items/active/starbound/weapons/hammers/human/t5s.png and b/items/active/starbound/weapons/hammers/human/t5s.png differ diff --git a/items/active/starbound/weapons/hammers/human/t6a.png b/items/active/starbound/weapons/hammers/human/t6a.png index 0e9de646..a283b7a7 100644 Binary files a/items/active/starbound/weapons/hammers/human/t6a.png and b/items/active/starbound/weapons/hammers/human/t6a.png differ diff --git a/items/active/starbound/weapons/hammers/human/t6s.png b/items/active/starbound/weapons/hammers/human/t6s.png index f7dd66e2..bef0d9a4 100644 Binary files a/items/active/starbound/weapons/hammers/human/t6s.png and b/items/active/starbound/weapons/hammers/human/t6s.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t2.png b/items/active/starbound/weapons/hammers/hylotl/t2.png index 0a1e4bef..be1efb17 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t2.png and b/items/active/starbound/weapons/hammers/hylotl/t2.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t3.png b/items/active/starbound/weapons/hammers/hylotl/t3.png index 0c427127..ee6d21ff 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t3.png and b/items/active/starbound/weapons/hammers/hylotl/t3.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t4.png b/items/active/starbound/weapons/hammers/hylotl/t4.png index 4d28e2ca..e20e6258 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t4.png and b/items/active/starbound/weapons/hammers/hylotl/t4.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t5m.png b/items/active/starbound/weapons/hammers/hylotl/t5m.png index 7f88ad9a..758a22f7 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t5m.png and b/items/active/starbound/weapons/hammers/hylotl/t5m.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t5s.png b/items/active/starbound/weapons/hammers/hylotl/t5s.png index 189be12d..505321b1 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t5s.png and b/items/active/starbound/weapons/hammers/hylotl/t5s.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t6a.png b/items/active/starbound/weapons/hammers/hylotl/t6a.png index 4ff52395..3d4ccd63 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t6a.png and b/items/active/starbound/weapons/hammers/hylotl/t6a.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t6m.png b/items/active/starbound/weapons/hammers/hylotl/t6m.png index 0729eca0..ff6fba53 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t6m.png and b/items/active/starbound/weapons/hammers/hylotl/t6m.png differ diff --git a/items/active/starbound/weapons/hammers/hylotl/t6s.png b/items/active/starbound/weapons/hammers/hylotl/t6s.png index dc3affcb..9a833441 100644 Binary files a/items/active/starbound/weapons/hammers/hylotl/t6s.png and b/items/active/starbound/weapons/hammers/hylotl/t6s.png differ diff --git a/items/active/starbound/weapons/hammers/shroomswoosh.png b/items/active/starbound/weapons/hammers/shroomswoosh.png index 894c8cec..311bc6e1 100644 Binary files a/items/active/starbound/weapons/hammers/shroomswoosh.png and b/items/active/starbound/weapons/hammers/shroomswoosh.png differ diff --git a/items/active/starbound/weapons/hammers/shroomswooshx.png b/items/active/starbound/weapons/hammers/shroomswooshx.png index 59b1bec5..5793476f 100644 Binary files a/items/active/starbound/weapons/hammers/shroomswooshx.png and b/items/active/starbound/weapons/hammers/shroomswooshx.png differ diff --git a/items/active/starbound/weapons/hammers/smashroom.png b/items/active/starbound/weapons/hammers/smashroom.png index 3247dd34..adc82f25 100644 Binary files a/items/active/starbound/weapons/hammers/smashroom.png and b/items/active/starbound/weapons/hammers/smashroom.png differ diff --git a/items/active/starbound/weapons/hammers/steelchair.png b/items/active/starbound/weapons/hammers/steelchair.png index e374edf5..96df6c3d 100644 Binary files a/items/active/starbound/weapons/hammers/steelchair.png and b/items/active/starbound/weapons/hammers/steelchair.png differ diff --git a/items/active/starbound/weapons/hammers/tarhammer.png b/items/active/starbound/weapons/hammers/tarhammer.png index fa1588d6..4edb68cb 100644 Binary files a/items/active/starbound/weapons/hammers/tarhammer.png and b/items/active/starbound/weapons/hammers/tarhammer.png differ diff --git a/items/active/starbound/weapons/hammers/tarswoosh.png b/items/active/starbound/weapons/hammers/tarswoosh.png index 9f03fa7a..5075f320 100644 Binary files a/items/active/starbound/weapons/hammers/tarswoosh.png and b/items/active/starbound/weapons/hammers/tarswoosh.png differ diff --git a/items/active/starbound/weapons/hammers/uncommoncrappyhammer.activeitem b/items/active/starbound/weapons/hammers/uncommoncrappyhammer.activeitem index 0e6f0bf9..5a31559e 100644 --- a/items/active/starbound/weapons/hammers/uncommoncrappyhammer.activeitem +++ b/items/active/starbound/weapons/hammers/uncommoncrappyhammer.activeitem @@ -1,103 +1,132 @@ { - "itemName" : "sb_uncommoncrappyhammer", - "price" : 25, - "maxStack" : 1, - "level" : 1, - "rarity" : "uncommon", - "description" : "", - "shortdescription" : "Uncommon Crappy Hammer", - "tooltipKind" : "sb_sword", - "category" : "hammer", - "tooltipFields" : {"subtitle":"Crappy Hammer"}, - "twoHanded" : true, - "itemTags" : ["weapon","melee","hammer","crappy","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/hammer.animation", + "itemName": "sb_uncommoncrappyhammer", + "price": 25, + "maxStack": 1, + "level": 1, + "rarity": "uncommon", + "description": "", + "shortdescription": "Uncommon Crappy Hammer", + "tooltipKind": "sb_sword", + "category": "hammer", + "tooltipFields": { + "subtitle": "Crappy Hammer" + }, + "twoHanded": true, + "itemTags": ["weapon", "melee", "hammer", "crappy", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/hammer.animation", - "animationCustom" : { - "lights":{"glow":{"color":[0,0,0]}}, - "animatedParts" : { "parts" : { - "swoosh":{ "properties" : {"offset" : [-1.0, 1.75]}}, - "blade":{"properties":{}}, - "handle":{"properties":{}}} - } + "animationCustom": { + "lights": { + "glow": { + "color": [0, 0, 0] + } + }, + "animatedParts": { + "parts": { + "swoosh": { + "properties": { + "offset": [-1.0, 1.75] + } + }, + "blade": { + "properties": {} + }, + "handle": { + "properties": {} + } + } + } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : -1.0, - "primaryAbilityType" : "sb_hammer", - "primaryAbility" : { - "fireTime" : [0.6,1.7], - "baseDps" : [6,8], - "damageConfig" : { - "knockbackRange" : [12,16] + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "aimOffset": -1.0, + "primaryAbilityType": "sb_hammer", + "primaryAbility": { + "fireTime": [0.6, 1.7], + "baseDps": [6, 8], + "damageConfig": { + "knockbackRange": [12, 16] }, - "stances" : { - "idle" : { - "weaponOffset" : [0.3, 1.5] + "stances": { + "idle": { + "weaponOffset": [0.3, 1.5] }, - "windup" : { - "duration" : 0.2, - "weaponOffset" : [0.3, 1.5] + "windup": { + "duration": 0.2, + "weaponOffset": [0.3, 1.5] }, - "fire" : { - "duration" : 0.4, - "weaponOffset" : [0.3, 1.5] + "fire": { + "duration": 0.4, + "weaponOffset": [0.3, 1.5] } } }, - "builderConfig" : [{ - "nameGenerator" : "crappyhammernames.config:nameGen", - "elementalType" : ["physical","fire","ice","electric","poison"], - "elementalConfig" : { - "fire" : { - "primaryAbility" : { - "damageConfig" : { - "damageSourceKind" : "firehammer", - "statusEffects" : [{"effect":"burning","duration":1}] - } - } - }, - "ice" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"frostslow","duration":2}], - "damageSourceKind" : "icehammer" - } - } + "builderConfig": [{ + "nameGenerator": "crappyhammernames.config:nameGen", + "elementalType": ["physical", "fire", "ice", "electric", "poison"], + "elementalConfig": { + "fire": { + "primaryAbility": { + "damageConfig": { + "damageSourceKind": "firehammer", + "statusEffects": [{ + "effect": "burning", + "duration": 1 + } + ] + } + } + }, + "ice": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "frostslow", + "duration": 2 + } + ], + "damageSourceKind": "icehammer" + } + } + }, + "poison": { + "primaryAbility": { + "damageConfig": { + "damageSourceKind": "poisonhammer", + "statusEffects": [{ + "effect": "weakpoison", + "duration": 2 + } + ] + } + } + }, + "electric": { + "primaryAbility": { + "damageConfig": { + "damageSourceKind": "electrichammer", + "statusEffects": ["electrified"] + } + } + } }, - "poison" : { - "primaryAbility" : { - "damageConfig" : { - "damageSourceKind" : "poisonhammer", - "statusEffects" : [{"effect":"weakpoison","duration":2}] - } - } + "animationParts": { + "blade": { + "path": "crappyhammer/blade/.png", + "variants": 7, + "paletteSwap": true + }, + "handle": { + "path": "crappyhammer/handle/.png", + "variants": 5, + "paletteSwap": true + } }, - "electric" : { - "primaryAbility" : { - "damageConfig" : { - "damageSourceKind" : "electrichammer", - "statusEffects" : ["electrified"] - } - } - } - }, - "animationParts" : { - "blade" : { - "path" : "crappyhammer/blade/.png", - "variants" : 7, - "paletteSwap" : true - }, - "handle" : { - "path" : "crappyhammer/handle/.png", - "variants" : 5, - "paletteSwap" : true - } - }, - "palette" : "/items/active/starbound/colors/crappy.weaponcolors", - "iconDrawables" : ["handle", "blade"] - }], + "palette": "/items/active/starbound/colors/crappy.weaponcolors", + "iconDrawables": ["handle", "blade"] + } + ], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/hammers/xterminitor.png b/items/active/starbound/weapons/hammers/xterminitor.png index 813538cd..35a5c766 100644 Binary files a/items/active/starbound/weapons/hammers/xterminitor.png and b/items/active/starbound/weapons/hammers/xterminitor.png differ diff --git a/items/active/starbound/weapons/meleeslash.weaponability b/items/active/starbound/weapons/meleeslash.weaponability index 658bfaf0..bde3bc90 100644 --- a/items/active/starbound/weapons/meleeslash.weaponability +++ b/items/active/starbound/weapons/meleeslash.weaponability @@ -27,7 +27,8 @@ "damageSourceKind": "broadsword", "knockbackMode": "aim", "knockback": 15, - "timeoutGroup": "primary" + "timeoutGroup": "primary", + "timeout": 0.5 }, "stepDamageConfig": [{ "baseDamageFactor": 1.0, diff --git a/items/active/starbound/weapons/meleeslash2.weaponability b/items/active/starbound/weapons/meleeslash2.weaponability index 8c9afef1..072e755d 100644 --- a/items/active/starbound/weapons/meleeslash2.weaponability +++ b/items/active/starbound/weapons/meleeslash2.weaponability @@ -19,7 +19,8 @@ "damageSourceKind": "shortsword", "knockbackMode": "aim", "knockback": 10, - "timeoutGroup": "primary" + "timeoutGroup": "primary", + "timeout": 0.5 }, "stances": { diff --git a/items/active/starbound/weapons/randomlygenerated/anklegrinder.png b/items/active/starbound/weapons/randomlygenerated/anklegrinder.png index 57913617..9b441f10 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/anklegrinder.png and b/items/active/starbound/weapons/randomlygenerated/anklegrinder.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/floranheatstick/handle/1.png b/items/active/starbound/weapons/randomlygenerated/floranheatstick/handle/1.png index 64d1d6fa..ed7074a7 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/floranheatstick/handle/1.png and b/items/active/starbound/weapons/randomlygenerated/floranheatstick/handle/1.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/floranmace.png b/items/active/starbound/weapons/randomlygenerated/floranmace.png index 8c4e2d74..d020e9e8 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/floranmace.png and b/items/active/starbound/weapons/randomlygenerated/floranmace.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/floranprod.png b/items/active/starbound/weapons/randomlygenerated/floranprod.png index 9e5b12e3..b87f0749 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/floranprod.png and b/items/active/starbound/weapons/randomlygenerated/floranprod.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/1.png b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/1.png index 179f4df9..76115cab 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/1.png and b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/1.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/2.png b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/2.png index eb83cf0f..0cdd7d73 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/2.png and b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/blade/2.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/1.png b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/1.png index 317ffdfc..dfb92716 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/1.png and b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/1.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/2.png b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/2.png index a6a3c7b4..db5fd039 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/2.png and b/items/active/starbound/weapons/randomlygenerated/glitchlargemace/handle/2.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchslargemace.activeitem b/items/active/starbound/weapons/randomlygenerated/glitchslargemace.activeitem index 4ce31d5c..819f83e4 100644 --- a/items/active/starbound/weapons/randomlygenerated/glitchslargemace.activeitem +++ b/items/active/starbound/weapons/randomlygenerated/glitchslargemace.activeitem @@ -1,50 +1,53 @@ { - "itemName" : "sb_glitchlargemace", - "level" : 1, - "price" : 180, - "maxStack" : 1, - "rarity" : "common", - "tooltipKind" : "sb_sword", - "category" : "hammer", - "tooltipFields" : {"subtitle":"Heavy Mace"}, - "description" : "", - "shortdescription" : "Heavy Mace", - "twoHanded" : true, - "sb_dyeable" : true, - "sb_backingDirectives" : "?replace;b6b6b6=ffca8a;7b7b7b=e0975c;373737=a85636", - "sb_extraDirectives" : "?replace;ffca8a=b6b6b6;e0975c=7b7b7b;a85636=373737", - "itemTags" : ["weapon","melee","mace","hammer","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/broadsword.animation", - "animationParts" : {}, - "animationCustom" : {}, + "itemName": "sb_glitchlargemace", + "level": 1, + "price": 180, + "maxStack": 1, + "rarity": "common", + "tooltipKind": "sb_sword", + "category": "hammer", + "tooltipFields": { + "subtitle": "Heavy Mace" + }, + "description": "", + "shortdescription": "Heavy Mace", + "twoHanded": true, + "sb_dyeable": true, + "sb_backingDirectives": "?replace;b6b6b6=ffca8a;7b7b7b=e0975c;373737=a85636", + "sb_extraDirectives": "?replace;ffca8a=b6b6b6;e0975c=7b7b7b;a85636=373737", + "itemTags": ["weapon", "melee", "mace", "hammer", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/broadsword.animation", + "animationParts": {}, + "animationCustom": {}, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "primaryAbilityType" : "sb_meleeslash", - "primaryAbility" : { - "fireTime" : [0.8,1.6], - "baseDps" : [5.5,7.8], - "damageConfig" : { - "damageSourceKind" : "hammer", - "knockback" : 28 + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "primaryAbilityType": "sb_meleeslash", + "primaryAbility": { + "fireTime": [0.8, 1.6], + "baseDps": [5.5, 7.8], + "damageConfig": { + "damageSourceKind": "hammer", + "knockback": 28 } }, - "builderConfig" : [{ - "nameGenerator" : "glitchmacenames.config:nameGen", - "elementalType" : "physical", - "animationParts" : { - "blade" : { - "path" : "glitchlargemace/blade/.png", - "variants" : 2, - "paletteSwap" : true + "builderConfig": [{ + "nameGenerator": "glitchmacenames.config:nameGen", + "elementalType": "physical", + "animationParts": { + "blade": { + "path": "glitchlargemace/blade/.png", + "variants": 2, + "paletteSwap": true + }, + "handle": { + "path": "glitchlargemace/handle/.png", + "variants": 2, + "paletteSwap": true + } }, - "handle" : { - "path" : "glitchlargemace/handle/.png", - "variants" : 2, - "paletteSwap" : true - } - }, - "iconDrawables" : ["handle", "blade"], - "altAbilities" : [] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "iconDrawables": ["handle", "blade"], + "altAbilities": [] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace.activeitem b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace.activeitem index 5fbd9633..afb07629 100644 --- a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace.activeitem +++ b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace.activeitem @@ -1,75 +1,82 @@ { - "itemName" : "sb_glitchsmallmace", - "level" : 1, - "price" : 90, - "maxStack" : 1, - "rarity" : "common", - "tooltipKind" : "sb_sword", - "category" : "dagger", - "tooltipFields" : {"subtitle":"Mace"}, - "description" : "", - "shortdescription" : "Mace", - "twoHanded" : false, - "sb_dyeable" : true, - "sb_backingDirectives" : "?replace;b6b6b6=ffca8a;7b7b7b=e0975c;373737=6f2919", - "sb_extraDirectives" : "?replace;ffca8a=b6b6b6;e0975c=7b7b7b;6f2919=373737", - "itemTags" : ["weapon","melee","mace","dagger","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/dagger.animation", - "animationParts" : {}, - "animationCustom" : { - "animatedParts" : { - "parts" : { - "swoosh" : { - "partStates" : { - "swoosh" : { - "fire" : { - "properties" : { - "offset" : [1.5,0.75] - } - } - } - } - } + "itemName": "sb_glitchsmallmace", + "level": 1, + "price": 90, + "maxStack": 1, + "rarity": "common", + "tooltipKind": "sb_sword", + "category": "dagger", + "tooltipFields": { + "subtitle": "Mace" + }, + "description": "", + "shortdescription": "Mace", + "twoHanded": false, + "sb_dyeable": true, + "sb_backingDirectives": "?replace;b6b6b6=ffca8a;7b7b7b=e0975c;373737=6f2919", + "sb_extraDirectives": "?replace;ffca8a=b6b6b6;e0975c=7b7b7b;6f2919=373737", + "itemTags": ["weapon", "melee", "mace", "dagger", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/dagger.animation", + "animationParts": {}, + "animationCustom": { + "animatedParts": { + "parts": { + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "offset": [1.5, 0.75] + } + } + } + } + } } } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "primaryAbilityType" : "sb_meleeslash2", - "primaryAbility" : { - "fireTime" : [0.8,1.3], - "baseDps" : [3.5,4.8], - "damageConfig" : { - "damageSourceKind" : "hammer", - "knockback" : 18 + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "primaryAbilityType": "sb_meleeslash2", + "primaryAbility": { + "fireTime": [0.8, 1.3], + "baseDps": [3.5, 4.8], + "damageConfig": { + "damageSourceKind": "hammer", + "knockback": 18 }, - "stances" : { - "idle" : {"weaponOffset" : [0, 1.4]}, - "fire" : {"weaponOffset" : [0, 1.4]}, - "windup" : { - "weaponOffset" : [0, 1.4], - "allowRotate" : true, - "duration" : 0.15 + "stances": { + "idle": { + "weaponOffset": [0, 1.4] + }, + "fire": { + "weaponOffset": [0, 1.4] + }, + "windup": { + "weaponOffset": [0, 1.4], + "allowRotate": true, + "duration": 0.15 } } }, - "builderConfig" : [{ - "nameGenerator" : "glitchmacenames.config:nameGen", - "elementalType" : "physical", - "animationParts" : { - "blade" : { - "path" : "glitchsmallmace/blade/.png", - "variants" : 2, - "paletteSwap" : true + "builderConfig": [{ + "nameGenerator": "glitchmacenames.config:nameGen", + "elementalType": "physical", + "animationParts": { + "blade": { + "path": "glitchsmallmace/blade/.png", + "variants": 2, + "paletteSwap": true + }, + "handle": { + "path": "glitchsmallmace/handle/.png", + "variants": 2, + "paletteSwap": true + } }, - "handle" : { - "path" : "glitchsmallmace/handle/.png", - "variants" : 2, - "paletteSwap" : true - } - }, - "iconDrawables" : ["handle", "blade"], - "altAbilities" : [] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "iconDrawables": ["handle", "blade"], + "altAbilities": [] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/1.png b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/1.png index 1dede603..87c9ca47 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/1.png and b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/1.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/2.png b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/2.png index d6a73ae4..a4a56515 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/2.png and b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/blade/2.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/1.png b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/1.png index c3cc3534..50b95ab7 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/1.png and b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/1.png differ diff --git a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/2.png b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/2.png index 93e09bd1..57c151d8 100644 Binary files a/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/2.png and b/items/active/starbound/weapons/randomlygenerated/glitchsmallmace/handle/2.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t1.png b/items/active/starbound/weapons/shortswords/apex/t1.png index 83b43664..11cb25a7 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t1.png and b/items/active/starbound/weapons/shortswords/apex/t1.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t2.png b/items/active/starbound/weapons/shortswords/apex/t2.png index 24a004c3..e44fac32 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t2.png and b/items/active/starbound/weapons/shortswords/apex/t2.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t3.png b/items/active/starbound/weapons/shortswords/apex/t3.png index b5d97007..0fe46c15 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t3.png and b/items/active/starbound/weapons/shortswords/apex/t3.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t4.png b/items/active/starbound/weapons/shortswords/apex/t4.png index 73b0ed9d..d15141d5 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t4.png and b/items/active/starbound/weapons/shortswords/apex/t4.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t5m.png b/items/active/starbound/weapons/shortswords/apex/t5m.png index dd76ffc3..cad9156a 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t5m.png and b/items/active/starbound/weapons/shortswords/apex/t5m.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t5s.png b/items/active/starbound/weapons/shortswords/apex/t5s.png index b401a584..62b4c792 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t5s.png and b/items/active/starbound/weapons/shortswords/apex/t5s.png differ diff --git a/items/active/starbound/weapons/shortswords/apex/t6a.png b/items/active/starbound/weapons/shortswords/apex/t6a.png index 81c77021..bca66b26 100644 Binary files a/items/active/starbound/weapons/shortswords/apex/t6a.png and b/items/active/starbound/weapons/shortswords/apex/t6a.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t1.png b/items/active/starbound/weapons/shortswords/avian/t1.png index 1e6f1ebb..4bb218e3 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t1.png and b/items/active/starbound/weapons/shortswords/avian/t1.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t2.png b/items/active/starbound/weapons/shortswords/avian/t2.png index 29a65bc5..02d8309f 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t2.png and b/items/active/starbound/weapons/shortswords/avian/t2.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t3.png b/items/active/starbound/weapons/shortswords/avian/t3.png index 951b36ff..7ba8adf6 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t3.png and b/items/active/starbound/weapons/shortswords/avian/t3.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t4.png b/items/active/starbound/weapons/shortswords/avian/t4.png index 691c0fc6..50e637de 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t4.png and b/items/active/starbound/weapons/shortswords/avian/t4.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t5a.png b/items/active/starbound/weapons/shortswords/avian/t5a.png index 1a814600..3998ff54 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t5a.png and b/items/active/starbound/weapons/shortswords/avian/t5a.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t5m.png b/items/active/starbound/weapons/shortswords/avian/t5m.png index dfa6adbf..efc2f8d7 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t5m.png and b/items/active/starbound/weapons/shortswords/avian/t5m.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t5s.png b/items/active/starbound/weapons/shortswords/avian/t5s.png index d38de831..9e09430e 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t5s.png and b/items/active/starbound/weapons/shortswords/avian/t5s.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t6a.png b/items/active/starbound/weapons/shortswords/avian/t6a.png index 6f90e5b3..03a143f5 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t6a.png and b/items/active/starbound/weapons/shortswords/avian/t6a.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t6m.png b/items/active/starbound/weapons/shortswords/avian/t6m.png index 98213618..aacc2ecd 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t6m.png and b/items/active/starbound/weapons/shortswords/avian/t6m.png differ diff --git a/items/active/starbound/weapons/shortswords/avian/t6s.png b/items/active/starbound/weapons/shortswords/avian/t6s.png index 3b1a6eb8..858e9ceb 100644 Binary files a/items/active/starbound/weapons/shortswords/avian/t6s.png and b/items/active/starbound/weapons/shortswords/avian/t6s.png differ diff --git a/items/active/starbound/weapons/shortswords/aviansword/blade/4.png b/items/active/starbound/weapons/shortswords/aviansword/blade/4.png index 182e0db8..4d37f6c4 100644 Binary files a/items/active/starbound/weapons/shortswords/aviansword/blade/4.png and b/items/active/starbound/weapons/shortswords/aviansword/blade/4.png differ diff --git a/items/active/starbound/weapons/shortswords/bonesword/blade/3.png b/items/active/starbound/weapons/shortswords/bonesword/blade/3.png index f86bf922..d50dabc4 100644 Binary files a/items/active/starbound/weapons/shortswords/bonesword/blade/3.png and b/items/active/starbound/weapons/shortswords/bonesword/blade/3.png differ diff --git a/items/active/starbound/weapons/shortswords/bonesword/blade/4.png b/items/active/starbound/weapons/shortswords/bonesword/blade/4.png index 4491f80e..a97a0172 100644 Binary files a/items/active/starbound/weapons/shortswords/bonesword/blade/4.png and b/items/active/starbound/weapons/shortswords/bonesword/blade/4.png differ diff --git a/items/active/starbound/weapons/shortswords/bonesword/handle/2.png b/items/active/starbound/weapons/shortswords/bonesword/handle/2.png index 8a57529c..7c5bf8b4 100644 Binary files a/items/active/starbound/weapons/shortswords/bonesword/handle/2.png and b/items/active/starbound/weapons/shortswords/bonesword/handle/2.png differ diff --git a/items/active/starbound/weapons/colorful/crayon.png b/items/active/starbound/weapons/shortswords/crayon.png similarity index 100% rename from items/active/starbound/weapons/colorful/crayon.png rename to items/active/starbound/weapons/shortswords/crayon.png diff --git a/items/active/starbound/weapons/colorful/crayonblue.activeitem b/items/active/starbound/weapons/shortswords/crayonblue.activeitem similarity index 100% rename from items/active/starbound/weapons/colorful/crayonblue.activeitem rename to items/active/starbound/weapons/shortswords/crayonblue.activeitem diff --git a/items/active/starbound/weapons/colorful/crayongreen.activeitem b/items/active/starbound/weapons/shortswords/crayongreen.activeitem similarity index 100% rename from items/active/starbound/weapons/colorful/crayongreen.activeitem rename to items/active/starbound/weapons/shortswords/crayongreen.activeitem diff --git a/items/active/starbound/weapons/colorful/crayonorange.activeitem b/items/active/starbound/weapons/shortswords/crayonorange.activeitem similarity index 100% rename from items/active/starbound/weapons/colorful/crayonorange.activeitem rename to items/active/starbound/weapons/shortswords/crayonorange.activeitem diff --git a/items/active/starbound/weapons/colorful/crayonpurple.activeitem b/items/active/starbound/weapons/shortswords/crayonpurple.activeitem similarity index 100% rename from items/active/starbound/weapons/colorful/crayonpurple.activeitem rename to items/active/starbound/weapons/shortswords/crayonpurple.activeitem diff --git a/items/active/starbound/weapons/colorful/crayonred.activeitem b/items/active/starbound/weapons/shortswords/crayonred.activeitem similarity index 100% rename from items/active/starbound/weapons/colorful/crayonred.activeitem rename to items/active/starbound/weapons/shortswords/crayonred.activeitem diff --git a/items/active/starbound/weapons/colorful/default.frames b/items/active/starbound/weapons/shortswords/crayonswoosh.frames similarity index 100% rename from items/active/starbound/weapons/colorful/default.frames rename to items/active/starbound/weapons/shortswords/crayonswoosh.frames diff --git a/items/active/starbound/weapons/shortswords/crayonswoosh.png b/items/active/starbound/weapons/shortswords/crayonswoosh.png new file mode 100644 index 00000000..146e0ac3 Binary files /dev/null and b/items/active/starbound/weapons/shortswords/crayonswoosh.png differ diff --git a/items/active/starbound/weapons/colorful/crayonyellow.activeitem b/items/active/starbound/weapons/shortswords/crayonyellow.activeitem similarity index 100% rename from items/active/starbound/weapons/colorful/crayonyellow.activeitem rename to items/active/starbound/weapons/shortswords/crayonyellow.activeitem diff --git a/items/active/starbound/weapons/shortswords/cutarrh.png b/items/active/starbound/weapons/shortswords/cutarrh.png index 98a12051..d05b1594 100644 Binary files a/items/active/starbound/weapons/shortswords/cutarrh.png and b/items/active/starbound/weapons/shortswords/cutarrh.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t1.png b/items/active/starbound/weapons/shortswords/floran/t1.png index 269b11c7..50c34198 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t1.png and b/items/active/starbound/weapons/shortswords/floran/t1.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t2.png b/items/active/starbound/weapons/shortswords/floran/t2.png index 9597ed91..bdcdb542 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t2.png and b/items/active/starbound/weapons/shortswords/floran/t2.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t3.png b/items/active/starbound/weapons/shortswords/floran/t3.png index 6ccc1be7..cf8f3b57 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t3.png and b/items/active/starbound/weapons/shortswords/floran/t3.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t4.png b/items/active/starbound/weapons/shortswords/floran/t4.png index 9cc21e05..5e104140 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t4.png and b/items/active/starbound/weapons/shortswords/floran/t4.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t5a.png b/items/active/starbound/weapons/shortswords/floran/t5a.png index 397a307e..bad5adef 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t5a.png and b/items/active/starbound/weapons/shortswords/floran/t5a.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t5m.png b/items/active/starbound/weapons/shortswords/floran/t5m.png index 67c267f2..b7171efc 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t5m.png and b/items/active/starbound/weapons/shortswords/floran/t5m.png differ diff --git a/items/active/starbound/weapons/shortswords/floran/t6s.png b/items/active/starbound/weapons/shortswords/floran/t6s.png index 0232ba09..17e96818 100644 Binary files a/items/active/starbound/weapons/shortswords/floran/t6s.png and b/items/active/starbound/weapons/shortswords/floran/t6s.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t0.png b/items/active/starbound/weapons/shortswords/glitch/t0.png index b5ea971a..3d615886 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t0.png and b/items/active/starbound/weapons/shortswords/glitch/t0.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t1.png b/items/active/starbound/weapons/shortswords/glitch/t1.png index 37fae1be..f77247e4 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t1.png and b/items/active/starbound/weapons/shortswords/glitch/t1.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t2.png b/items/active/starbound/weapons/shortswords/glitch/t2.png index aab23eee..f46179ff 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t2.png and b/items/active/starbound/weapons/shortswords/glitch/t2.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t3.png b/items/active/starbound/weapons/shortswords/glitch/t3.png index a09dddbe..a374f54f 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t3.png and b/items/active/starbound/weapons/shortswords/glitch/t3.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t4.png b/items/active/starbound/weapons/shortswords/glitch/t4.png index c309d7c8..a5e62c63 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t4.png and b/items/active/starbound/weapons/shortswords/glitch/t4.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t5s.png b/items/active/starbound/weapons/shortswords/glitch/t5s.png index 375465ce..4a35b204 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t5s.png and b/items/active/starbound/weapons/shortswords/glitch/t5s.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t6a.png b/items/active/starbound/weapons/shortswords/glitch/t6a.png index 15de4dc9..d912ecc1 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t6a.png and b/items/active/starbound/weapons/shortswords/glitch/t6a.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t6m.png b/items/active/starbound/weapons/shortswords/glitch/t6m.png index 850cbe31..6b60eaae 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t6m.png and b/items/active/starbound/weapons/shortswords/glitch/t6m.png differ diff --git a/items/active/starbound/weapons/shortswords/glitch/t6s.png b/items/active/starbound/weapons/shortswords/glitch/t6s.png index f65b95ee..15844ef9 100644 Binary files a/items/active/starbound/weapons/shortswords/glitch/t6s.png and b/items/active/starbound/weapons/shortswords/glitch/t6s.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t0.png b/items/active/starbound/weapons/shortswords/human/t0.png index 477df17e..9c77128d 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t0.png and b/items/active/starbound/weapons/shortswords/human/t0.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t1.png b/items/active/starbound/weapons/shortswords/human/t1.png index 062464ed..6928c290 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t1.png and b/items/active/starbound/weapons/shortswords/human/t1.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t2.png b/items/active/starbound/weapons/shortswords/human/t2.png index 1016c8ae..49422ff2 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t2.png and b/items/active/starbound/weapons/shortswords/human/t2.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t5m.png b/items/active/starbound/weapons/shortswords/human/t5m.png index 62916c6c..b3d6c23d 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t5m.png and b/items/active/starbound/weapons/shortswords/human/t5m.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t5s.png b/items/active/starbound/weapons/shortswords/human/t5s.png index 9dff1237..4df6c656 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t5s.png and b/items/active/starbound/weapons/shortswords/human/t5s.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t6a.png b/items/active/starbound/weapons/shortswords/human/t6a.png index 7b6920b9..64385ff5 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t6a.png and b/items/active/starbound/weapons/shortswords/human/t6a.png differ diff --git a/items/active/starbound/weapons/shortswords/human/t6s.png b/items/active/starbound/weapons/shortswords/human/t6s.png index e583d8e7..d10048c8 100644 Binary files a/items/active/starbound/weapons/shortswords/human/t6s.png and b/items/active/starbound/weapons/shortswords/human/t6s.png differ diff --git a/items/active/starbound/weapons/shortswords/huntingknife.png b/items/active/starbound/weapons/shortswords/huntingknife.png index ca99ed40..1eb626aa 100644 Binary files a/items/active/starbound/weapons/shortswords/huntingknife.png and b/items/active/starbound/weapons/shortswords/huntingknife.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t0.png b/items/active/starbound/weapons/shortswords/hylotl/t0.png index b0b2ad1b..142b10be 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t0.png and b/items/active/starbound/weapons/shortswords/hylotl/t0.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t1.png b/items/active/starbound/weapons/shortswords/hylotl/t1.png index 853c4b8c..6bd03565 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t1.png and b/items/active/starbound/weapons/shortswords/hylotl/t1.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t2.png b/items/active/starbound/weapons/shortswords/hylotl/t2.png index 01c4581c..0d716d62 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t2.png and b/items/active/starbound/weapons/shortswords/hylotl/t2.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t4.png b/items/active/starbound/weapons/shortswords/hylotl/t4.png index 82c073e4..91cb70ab 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t4.png and b/items/active/starbound/weapons/shortswords/hylotl/t4.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t5a.png b/items/active/starbound/weapons/shortswords/hylotl/t5a.png index 0391f7da..d8e2b0c8 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t5a.png and b/items/active/starbound/weapons/shortswords/hylotl/t5a.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t5s.png b/items/active/starbound/weapons/shortswords/hylotl/t5s.png index 993f4c12..33ab22cd 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t5s.png and b/items/active/starbound/weapons/shortswords/hylotl/t5s.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t6a.png b/items/active/starbound/weapons/shortswords/hylotl/t6a.png index 869bc881..da43854a 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t6a.png and b/items/active/starbound/weapons/shortswords/hylotl/t6a.png differ diff --git a/items/active/starbound/weapons/shortswords/hylotl/t6m.png b/items/active/starbound/weapons/shortswords/hylotl/t6m.png index 666f3ddb..506be7f8 100644 Binary files a/items/active/starbound/weapons/shortswords/hylotl/t6m.png and b/items/active/starbound/weapons/shortswords/hylotl/t6m.png differ diff --git a/items/active/starbound/weapons/shortswords/katarrhna.png b/items/active/starbound/weapons/shortswords/katarrhna.png index 88859f14..42254d2d 100644 Binary files a/items/active/starbound/weapons/shortswords/katarrhna.png and b/items/active/starbound/weapons/shortswords/katarrhna.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword.activeitem b/items/active/starbound/weapons/shortswords/mushroomsword.activeitem index 0d70f959..ed473f74 100644 --- a/items/active/starbound/weapons/shortswords/mushroomsword.activeitem +++ b/items/active/starbound/weapons/shortswords/mushroomsword.activeitem @@ -1,62 +1,84 @@ { - "itemName" : "sb_mushroomsword", - "level" : 1, - "maxStack" : 1, - "rarity" : "common", - "description" : "An enchanted mushroom shortsword.", //not actual magic - "shortdescription" : "Magic Shroom Sword", - "tooltipKind" : "sb_sword2", - "price" : 70, - "category" : "shortsword", - "tooltipFields" : {"subtitle":"Magic Shroom Sword"}, - "twoHanded" : false, - "itemTags" : ["weapon","melee","shortsword","mushroom","upgradeableWeapon"], - "handGrip" : "inside", - "animation" : "/items/active/starbound/weapons/shortsword.animation", - "animationParts" : {}, - "animationCustom" : { - "lights":{"glow":{"color":[0,0,0]}}, - "animatedParts":{ - "parts" : { - "blade" : {"properties" : {}}, - "handle" : {"properties" : {}}, - "swoosh":{"partStates":{"swoosh":{"fire":{"properties":{"image":"shortshroomswoosh.png:"}}}}} - }} + "itemName": "sb_mushroomsword", + "level": 1, + "maxStack": 1, + "rarity": "common", + "description": "An enchanted mushroom shortsword.", + "shortdescription": "Magic Shroom Sword", + "tooltipKind": "sb_sword2", + "price": 660, + "category": "shortsword", + "tooltipFields": { + "subtitle": "Magic Shroom Sword" + }, + "twoHanded": false, + "itemTags": ["weapon", "melee", "shortsword", "mushroom", "upgradeableWeapon"], + "handGrip": "inside", + "animation": "/items/active/starbound/weapons/shortsword.animation", + "animationParts": {}, + "animationCustom": { + "lights": { + "glow": { + "color": [0, 0, 0] + } + }, + "animatedParts": { + "parts": { + "blade": { + "properties": {} + }, + "handle": { + "properties": {} + }, + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "image": "shortshroomswoosh.png:" + } + } + } + } + } + } + } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : 0.0, - "primaryAbilityType" : "sb_meleeslash2", - "primaryAbility" : { - "projectileTypes" : ["sb_fireswirl","electricexplosion"], + "aimOffset": 0.0, + "primaryAbilityType": "sb_meleeslash2", + "primaryAbility": { + "projectileTypes": ["sb_fireswirl", "electricexplosion"], - "fireTime" : [0.333,0.666], - "baseDps" : [5.5,6.5], - "baseDamage" : [5.5,7.5], - "damageConfig" : { - "damageSourceKind" : "poisonshortsword" + "fireTime": [0.333, 0.666], + "baseDps": [5.5, 6.5], + "baseDamage": [5.5, 7.5], + "damageConfig": { + "damageSourceKind": "poisonshortsword" } }, - "builderConfig" : [{ - "nameGenerator" : "mushroomnames.config:nameGen", - "elementalType" : "poison", - "animationParts" : { - "blade" : { - "path" : "mushroomsword/blade/.png", - "variants" : 1, - "paletteSwap" : true + "builderConfig": [{ + "nameGenerator": "mushroomnames.config:nameGen", + "elementalType": "poison", + "animationParts": { + "blade": { + "path": "mushroomsword/blade/.png", + "variants": 1, + "paletteSwap": true + }, + "handle": { + "path": "mushroomsword/handle/.png", + "variants": 24, + "paletteSwap": true + } }, - "handle" : { - "path" : "mushroomsword/handle/.png", - "variants" : 24, - "paletteSwap" : true - } - }, - "iconDrawables" : ["handle", "blade"], - "palette" : "/items/active/starbound/colors/melee.weaponcolors", - "altAbilities" : [] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "iconDrawables": ["handle", "blade"], + "palette": "/items/active/starbound/colors/melee.weaponcolors", + "altAbilities": [] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/blade/1.png b/items/active/starbound/weapons/shortswords/mushroomsword/blade/1.png index 5a8ebc4c..51eb59a4 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/blade/1.png and b/items/active/starbound/weapons/shortswords/mushroomsword/blade/1.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/14.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/14.png index 2e0f26d2..c9e5148b 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/14.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/14.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/15.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/15.png index c8837e49..33231174 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/15.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/15.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/16.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/16.png index fe099ad8..d70d23cf 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/16.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/16.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/17.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/17.png index f53b436c..1b34d2c2 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/17.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/17.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/18.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/18.png index caa08f95..060c6bd4 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/18.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/18.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/2.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/2.png index bfbabcb9..98d64d2b 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/2.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/2.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/22.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/22.png index 53988eed..2c826a2c 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/22.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/22.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/23.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/23.png index 34554c91..c24b63a5 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/23.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/23.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword/handle/24.png b/items/active/starbound/weapons/shortswords/mushroomsword/handle/24.png index e3a83085..c460e3c7 100644 Binary files a/items/active/starbound/weapons/shortswords/mushroomsword/handle/24.png and b/items/active/starbound/weapons/shortswords/mushroomsword/handle/24.png differ diff --git a/items/active/starbound/weapons/shortswords/mushroomsword2.activeitem b/items/active/starbound/weapons/shortswords/mushroomsword2.activeitem index b0bb2b90..d28c41d2 100644 --- a/items/active/starbound/weapons/shortswords/mushroomsword2.activeitem +++ b/items/active/starbound/weapons/shortswords/mushroomsword2.activeitem @@ -1,39 +1,57 @@ { - "itemName" : "sb_mushroomsword2", - "level" : 1, - "maxStack" : 1, - "rarity" : "common", - "description" : "A solid mushroom shortsword. A shortshroom.", - "shortdescription" : "Mushroom Sword", - "tooltipKind" : "sb_sword2", - "price" : 70, - "category" : "shortsword", - "twoHanded" : false, - "sb_waBan" : true, - "itemTags" : ["weapon","melee","shortsword","mushroom","upgradeableWeapon"], - "handGrip" : "inside", - "inventoryIcon" : "mushroomsword.png", - "animation" : "/items/active/starbound/weapons/shortsword.animation", - "animationParts" : {"blade":"mushroomsword.png","handle":""}, - "animationCustom" : { - "lights":{"glow":{"color":[0,0,0]}}, - "animatedParts":{ - "parts" : { - "swoosh":{"partStates":{"swoosh":{"fire":{"properties":{"image":"shortshroomswoosh.png:"}}}}} - }} + "itemName": "sb_mushroomsword2", + "level": 1, + "maxStack": 1, + "rarity": "common", + "description": "A solid mushroom shortsword; a shortshroom.", + "shortdescription": "Toxic Mushroom Sword", + "tooltipKind": "sb_sword2", + "price": 660, + "category": "shortsword", + "twoHanded": false, + "sb_waBan": true, + "itemTags": ["weapon", "melee", "shortsword", "mushroom", "upgradeableWeapon"], + "handGrip": "inside", + "inventoryIcon": "mushroomsword.png", + "animation": "/items/active/starbound/weapons/shortsword.animation", + "animationParts": { + "blade": "mushroomsword.png", + "handle": "" + }, + "animationCustom": { + "lights": { + "glow": { + "color": [0, 0, 0] + } + }, + "animatedParts": { + "parts": { + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "image": "shortshroomswoosh.png:" + } + } + } + } + } + } + } }, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "aimOffset" : 0.0, - "primaryAbilityType" : "sb_meleeslash2", - "primaryAbility" : { - "projectileType" : "sb_multisporecloud", - "fireTime" : [0.333,0.666], - "baseDps" : [2.5,5.5], - "baseDamage" : [2.5,5.5], - "damageConfig" : { - "damageSourceKind" : "poisonshortsword" + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "aimOffset": 0.0, + "primaryAbilityType": "sb_meleeslash2", + "primaryAbility": { + "projectileType": "sb_multisporecloud", + "fireTime": [0.333, 0.666], + "baseDps": [2.5, 5.5], + "baseDamage": [2.5, 5.5], + "damageConfig": { + "damageSourceKind": "poisonshortsword" } }, - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/shortswords/overgrownmower.png b/items/active/starbound/weapons/shortswords/overgrownmower.png index 2a4982ee..b53c54fa 100644 Binary files a/items/active/starbound/weapons/shortswords/overgrownmower.png and b/items/active/starbound/weapons/shortswords/overgrownmower.png differ diff --git a/items/active/starbound/weapons/shortswords/rustsword.activeitem b/items/active/starbound/weapons/shortswords/rustsword.activeitem index 2686f621..bf1580a0 100644 --- a/items/active/starbound/weapons/shortswords/rustsword.activeitem +++ b/items/active/starbound/weapons/shortswords/rustsword.activeitem @@ -1,61 +1,69 @@ { - "itemName" : "sb_rustsword", - "level" : 1, - "price" : 85, - "maxStack" : 1, - "rarity" : "uncommon", - "tooltipKind" : "sb_sword", - "category" : "shortsword", - "tooltipFields" : {"subtitle":"Rust Sword"}, - "description" : "", - "shortdescription" : "Rust Sword", - "twoHanded" : false, - "itemTags" : ["weapon","melee","shortsword","rust","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/shortsword.animation", + "itemName": "sb_rustsword", + "level": 1, + "price": 85, + "maxStack": 1, + "rarity": "uncommon", + "tooltipKind": "sb_sword", + "category": "shortsword", + "tooltipFields": { + "subtitle": "Rust Sword" + }, + "description": "", + "shortdescription": "Rust Sword", + "twoHanded": false, + "itemTags": ["weapon", "melee", "shortsword", "rust", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/shortsword.animation", - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "primaryAbilityType" : "sb_meleeslash2", - "primaryAbility" : { - "fireTime" : [0.111,0.333], - "baseDps" : [7.6,9.2], - "baseDamage" : [5.5,7.8], - "damageConfig" : { - "damageSourceKind" : "slash" + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "primaryAbilityType": "sb_meleeslash2", + "primaryAbility": { + "fireTime": [0.111, 0.333], + "baseDps": [7.6, 9.2], + "baseDamage": [5.5, 7.8], + "damageConfig": { + "damageSourceKind": "slash" }, - "stances" : { - "idle" : { - "weaponOffset" : [0.3, 1.7] + "stances": { + "idle": { + "weaponOffset": [0.3, 1.7] }, - "windup" : { - "duration" : 0.2, - "weaponOffset" : [0.3, 1.7] + "windup": { + "duration": 0.2, + "weaponOffset": [0.3, 1.7] }, - "fire" : { - "duration" : 0.2, - "weaponOffset" : [0.3, 1.7] + "fire": { + "duration": 0.2, + "weaponOffset": [0.3, 1.7] } } }, - "builderConfig" : [{ - "nameGenerator" : "rustswordnames.config:nameGen", - "elementalType" : ["poison"], - "elementalConfig" : { - "poison" : { - "primaryAbility":{"damageConfig":{"statusEffects":["weakpoison"],"damageSourceKind":"poisonshortsword"}} - } - }, - "animationParts" : { - "blade" : { - "path" : "rustsword/blade/.png", - "variants" : 3 + "builderConfig": [{ + "nameGenerator": "rustswordnames.config:nameGen", + "elementalType": ["poison"], + "elementalConfig": { + "poison": { + "primaryAbility": { + "damageConfig": { + "statusEffects": ["weakpoison"], + "damageSourceKind": "poisonshortsword" + } + } + } }, - "handle" : { - "path" : "rustsword/handle/.png", - "variants" : 3 - } - }, - "iconDrawables" : ["handle", "blade"], - "altAbilities" : [] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "animationParts": { + "blade": { + "path": "rustsword/blade/.png", + "variants": 3 + }, + "handle": { + "path": "rustsword/handle/.png", + "variants": 3 + } + }, + "iconDrawables": ["handle", "blade"], + "altAbilities": [] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/shortswords/rustsword/blade/2.png b/items/active/starbound/weapons/shortswords/rustsword/blade/2.png index 4bf29b73..4c0ae3ac 100644 Binary files a/items/active/starbound/weapons/shortswords/rustsword/blade/2.png and b/items/active/starbound/weapons/shortswords/rustsword/blade/2.png differ diff --git a/items/active/starbound/weapons/shortswords/rustsword/blade/3.png b/items/active/starbound/weapons/shortswords/rustsword/blade/3.png index 0559f42d..3a787011 100644 Binary files a/items/active/starbound/weapons/shortswords/rustsword/blade/3.png and b/items/active/starbound/weapons/shortswords/rustsword/blade/3.png differ diff --git a/items/active/starbound/weapons/shortswords/rustsword/handle/1.png b/items/active/starbound/weapons/shortswords/rustsword/handle/1.png index 3fa38ece..988ee64f 100644 Binary files a/items/active/starbound/weapons/shortswords/rustsword/handle/1.png and b/items/active/starbound/weapons/shortswords/rustsword/handle/1.png differ diff --git a/items/active/starbound/weapons/shortswords/shortshroomswoosh.png b/items/active/starbound/weapons/shortswords/shortshroomswoosh.png index 42f9f11b..20d98bb2 100644 Binary files a/items/active/starbound/weapons/shortswords/shortshroomswoosh.png and b/items/active/starbound/weapons/shortswords/shortshroomswoosh.png differ diff --git a/items/active/starbound/weapons/shortswords/slavesword.activeitem b/items/active/starbound/weapons/shortswords/slavesword.activeitem index 64f4962b..a115c2b8 100644 --- a/items/active/starbound/weapons/shortswords/slavesword.activeitem +++ b/items/active/starbound/weapons/shortswords/slavesword.activeitem @@ -1,80 +1,83 @@ { - "itemName" : "sb_slavesword", - "maxStack" : 1, - "rarity" : "legendary", - "tooltipKind" : "sb_sword", - "description" : "", - "price" : 300, - "shortdescription" : "Slave Sword", - "category" : "shortsword", - "sb_waBan" : true, - "tooltipFields" : {"subtitle":"Slave Sword"}, - "itemTags" : ["weapon","melee","shortsword","upgradeableWeapon"], - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "animation" : "/items/active/starbound/weapons/shortsword.animation", - "inventoryIcon" : "slavesword.png", - "animationParts" : { - "handle" : "", - "blade" : "slavesword.png" + "itemName": "sb_slavesword", + "maxStack": 1, + "rarity": "legendary", + "tooltipKind": "sb_sword2", + "description": "It's a secret to everyone.", + "price": 300, + "shortdescription": "Slave Sword", + "category": "shortsword", + "sb_waBan": true, + "tooltipFields": { + "subtitle": "Slave Sword" }, - "animationCustom" : { - "sounds" : { - "physicalfire" : ["/sfx/melee/sb_slavesword_swing.ogg"] //TODO: see if this sound exists under a different name in vanilla - }, - "animatedParts" : { - "parts" : { - "swoosh" : { - "partStates" : { - "swoosh" : { - "fire" : { - "properties" : { - "image" : "", - "damageArea" : [[-0.5, 0.25],[2, 0.25],[2, -1.25],[-0.5, -1.25]] - } - } - } - } - } + "itemTags": ["weapon", "melee", "shortsword", "upgradeableWeapon"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "animation": "/items/active/starbound/weapons/shortsword.animation", + "inventoryIcon": "slavesword.png", + "animationParts": { + "handle": "", + "blade": "slavesword.png" + }, + "animationCustom": { + "sounds": { + "physicalfire": ["/sfx/melee/sb_slavesword_swing.ogg"]//TODO: see if this sound exists under a different name in vanilla + }, + "animatedParts": { + "parts": { + "swoosh": { + "partStates": { + "swoosh": { + "fire": { + "properties": { + "image": "", + "damageArea": [[-0.5, 0.25], [2, 0.25], [2, -1.25], [-0.5, -1.25]] + } + } + } + } + } } } }, - "elementalType" : "physical", - "primaryAbilityType" : "sb_meleeslash2", - "primaryAbility" : { - "projectileType" : "sb_swordshot", - "fireTime" : [0.4,1.2], - "baseDps" : [3.5,12.5], - "stances" : { - "idle" : { - "armRotation" : -84.5, - "weaponRotation" : 4.5, - "weaponOffset" : [-0.1, 1.4], - "twoHanded" : false + "elementalType": "physical", + "primaryAbilityType": "sb_meleeslash2", + "primaryAbility": { + "projectileType": "sb_swordshot", + "fireTime": [0.4, 1.2], + "baseDps": [3.5, 12.5], + "stances": { + "idle": { + "armRotation": -84.5, + "weaponRotation": 4.5, + "weaponOffset": [-0.1, 1.4], + "twoHanded": false }, - "windup" : { - "hold" : false, //is hold used? - "duration" : 0.3, - "armRotation" : -24.5, - "weaponRotation" : -24.5, - "weaponOffset" : [0, 1.25], - "allowRotate" : true + "windup": { + "hold": false, //is hold used? + "duration": 0.3, + "armRotation": -24.5, + "weaponRotation": -24.5, + "weaponOffset": [0, 1.25], + "allowRotate": true }, - "fire" : { - "hold" : true, //is hold-- - "duration" : 0.4, - "armRotation" : -125, - "weaponRotation" : 32, - "weaponOffset" : [0.1, 1.4], - "allowRotate" : true + "fire": { + "hold": true, //is hold-- + "duration": 0.4, + "armRotation": -125, + "weaponRotation": 32, + "weaponOffset": [0.1, 1.4], + "allowRotate": true } } }, - "builder" : "/items/buildscripts/starbound/buildweapon.lua", - "builderConfig" : [{ - "nameGenerator" : "slaveswordnames.config:nameGen", - "palette" : "/items/active/starbound/colors/slavesword.weaponcolors" - }], - "nameGenerator" : "slaveswordnames.config:nameGen" -} \ No newline at end of file + "builder": "/items/buildscripts/starbound/buildweapon.lua", + "builderConfig": [{ + "nameGenerator": "slaveswordnames.config:nameGen", + "palette": "/items/active/starbound/colors/slavesword.weaponcolors" + } + ], + "nameGenerator": "slaveswordnames.config:nameGen" +} diff --git a/items/active/starbound/weapons/shortswords/slimeswoosh.png b/items/active/starbound/weapons/shortswords/slimeswoosh.png index 43333fca..d56cc643 100644 Binary files a/items/active/starbound/weapons/shortswords/slimeswoosh.png and b/items/active/starbound/weapons/shortswords/slimeswoosh.png differ diff --git a/items/active/starbound/weapons/shortswords/slimeswooshx.png b/items/active/starbound/weapons/shortswords/slimeswooshx.png index 956b3b92..93d6603b 100644 Binary files a/items/active/starbound/weapons/shortswords/slimeswooshx.png and b/items/active/starbound/weapons/shortswords/slimeswooshx.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/1.png b/items/active/starbound/weapons/shortswords/sword/blade/1.png index 5fd556fe..1162e507 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/1.png and b/items/active/starbound/weapons/shortswords/sword/blade/1.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/10.png b/items/active/starbound/weapons/shortswords/sword/blade/10.png index b6e64f0f..e8a9b534 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/10.png and b/items/active/starbound/weapons/shortswords/sword/blade/10.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/11.png b/items/active/starbound/weapons/shortswords/sword/blade/11.png index 25cbc7a2..543591aa 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/11.png and b/items/active/starbound/weapons/shortswords/sword/blade/11.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/12.png b/items/active/starbound/weapons/shortswords/sword/blade/12.png index b0e48aaf..70f70320 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/12.png and b/items/active/starbound/weapons/shortswords/sword/blade/12.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/13.png b/items/active/starbound/weapons/shortswords/sword/blade/13.png index 4b4084d0..014a92c8 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/13.png and b/items/active/starbound/weapons/shortswords/sword/blade/13.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/14.png b/items/active/starbound/weapons/shortswords/sword/blade/14.png index c3992213..656e8f39 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/14.png and b/items/active/starbound/weapons/shortswords/sword/blade/14.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/15.png b/items/active/starbound/weapons/shortswords/sword/blade/15.png index 727f65e1..d33cbf39 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/15.png and b/items/active/starbound/weapons/shortswords/sword/blade/15.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/18.png b/items/active/starbound/weapons/shortswords/sword/blade/18.png index d1a18bcd..1139ea02 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/18.png and b/items/active/starbound/weapons/shortswords/sword/blade/18.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/19.png b/items/active/starbound/weapons/shortswords/sword/blade/19.png index 5c8e361c..e0b07ef9 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/19.png and b/items/active/starbound/weapons/shortswords/sword/blade/19.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/2.png b/items/active/starbound/weapons/shortswords/sword/blade/2.png index d08023d8..22650af3 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/2.png and b/items/active/starbound/weapons/shortswords/sword/blade/2.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/20.png b/items/active/starbound/weapons/shortswords/sword/blade/20.png index 9b71c157..26eb103a 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/20.png and b/items/active/starbound/weapons/shortswords/sword/blade/20.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/22.png b/items/active/starbound/weapons/shortswords/sword/blade/22.png index 2fd574b4..6f9974ee 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/22.png and b/items/active/starbound/weapons/shortswords/sword/blade/22.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/23.png b/items/active/starbound/weapons/shortswords/sword/blade/23.png index 90787aaa..c91de0fd 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/23.png and b/items/active/starbound/weapons/shortswords/sword/blade/23.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/24.png b/items/active/starbound/weapons/shortswords/sword/blade/24.png index f74a062d..3ed6beda 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/24.png and b/items/active/starbound/weapons/shortswords/sword/blade/24.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/26.png b/items/active/starbound/weapons/shortswords/sword/blade/26.png index 159995dd..97198435 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/26.png and b/items/active/starbound/weapons/shortswords/sword/blade/26.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/28.png b/items/active/starbound/weapons/shortswords/sword/blade/28.png index c83ebeb6..241d5bd0 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/28.png and b/items/active/starbound/weapons/shortswords/sword/blade/28.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/29.png b/items/active/starbound/weapons/shortswords/sword/blade/29.png index 95375b6d..38cb6411 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/29.png and b/items/active/starbound/weapons/shortswords/sword/blade/29.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/3.png b/items/active/starbound/weapons/shortswords/sword/blade/3.png index c26513c6..5089d237 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/3.png and b/items/active/starbound/weapons/shortswords/sword/blade/3.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/4.png b/items/active/starbound/weapons/shortswords/sword/blade/4.png index 9367f940..a34b8694 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/4.png and b/items/active/starbound/weapons/shortswords/sword/blade/4.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/5.png b/items/active/starbound/weapons/shortswords/sword/blade/5.png index d4920ca0..228d70b4 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/5.png and b/items/active/starbound/weapons/shortswords/sword/blade/5.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/6.png b/items/active/starbound/weapons/shortswords/sword/blade/6.png index 4e7392ce..f3f40d04 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/6.png and b/items/active/starbound/weapons/shortswords/sword/blade/6.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/7.png b/items/active/starbound/weapons/shortswords/sword/blade/7.png index b5ad32a1..79b117be 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/7.png and b/items/active/starbound/weapons/shortswords/sword/blade/7.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/8.png b/items/active/starbound/weapons/shortswords/sword/blade/8.png index c7c96772..9887c842 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/8.png and b/items/active/starbound/weapons/shortswords/sword/blade/8.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/blade/9.png b/items/active/starbound/weapons/shortswords/sword/blade/9.png index 34a971ff..bdb5b8f6 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/blade/9.png and b/items/active/starbound/weapons/shortswords/sword/blade/9.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/14.png b/items/active/starbound/weapons/shortswords/sword/handle/14.png index 2e0f26d2..c9e5148b 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/14.png and b/items/active/starbound/weapons/shortswords/sword/handle/14.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/15.png b/items/active/starbound/weapons/shortswords/sword/handle/15.png index c8837e49..33231174 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/15.png and b/items/active/starbound/weapons/shortswords/sword/handle/15.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/16.png b/items/active/starbound/weapons/shortswords/sword/handle/16.png index fe099ad8..d70d23cf 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/16.png and b/items/active/starbound/weapons/shortswords/sword/handle/16.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/17.png b/items/active/starbound/weapons/shortswords/sword/handle/17.png index f53b436c..1b34d2c2 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/17.png and b/items/active/starbound/weapons/shortswords/sword/handle/17.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/18.png b/items/active/starbound/weapons/shortswords/sword/handle/18.png index caa08f95..060c6bd4 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/18.png and b/items/active/starbound/weapons/shortswords/sword/handle/18.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/2.png b/items/active/starbound/weapons/shortswords/sword/handle/2.png index bfbabcb9..98d64d2b 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/2.png and b/items/active/starbound/weapons/shortswords/sword/handle/2.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/24.png b/items/active/starbound/weapons/shortswords/sword/handle/24.png index e3a83085..dbcd2404 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/24.png and b/items/active/starbound/weapons/shortswords/sword/handle/24.png differ diff --git a/items/active/starbound/weapons/shortswords/sword/handle/27.png b/items/active/starbound/weapons/shortswords/sword/handle/27.png index deb93fd1..618708e6 100644 Binary files a/items/active/starbound/weapons/shortswords/sword/handle/27.png and b/items/active/starbound/weapons/shortswords/sword/handle/27.png differ diff --git a/items/active/starbound/weapons/shortswords/undergrowthtrimmer.png b/items/active/starbound/weapons/shortswords/undergrowthtrimmer.png index 19f7eabc..0f0c278b 100644 Binary files a/items/active/starbound/weapons/shortswords/undergrowthtrimmer.png and b/items/active/starbound/weapons/shortswords/undergrowthtrimmer.png differ diff --git a/items/active/starbound/weapons/shortswords/wildswoosh.png b/items/active/starbound/weapons/shortswords/wildswoosh.png index fc538c31..d6e46f75 100644 Binary files a/items/active/starbound/weapons/shortswords/wildswoosh.png and b/items/active/starbound/weapons/shortswords/wildswoosh.png differ diff --git a/items/active/starbound/weapons/shortswords/wildswooshx.png b/items/active/starbound/weapons/shortswords/wildswooshx.png index 82c54abd..188c5294 100644 Binary files a/items/active/starbound/weapons/shortswords/wildswooshx.png and b/items/active/starbound/weapons/shortswords/wildswooshx.png differ diff --git a/items/active/starbound/weapons/spear.weaponability b/items/active/starbound/weapons/spear.weaponability index d9269855..280f30f8 100644 --- a/items/active/starbound/weapons/spear.weaponability +++ b/items/active/starbound/weapons/spear.weaponability @@ -15,7 +15,8 @@ "statusEffects": [], "knockbackMode": "aim", "knockback": 30, - "timeoutGroup": "primary" + "timeoutGroup": "primary", + "timeout": 0.5 }, "holdDamageMultiplier": 0.1, "holdDamageConfig": { diff --git a/items/active/starbound/weapons/spears/apex/t4.png b/items/active/starbound/weapons/spears/apex/t4.png index 14f57b2d..79b5c22c 100644 Binary files a/items/active/starbound/weapons/spears/apex/t4.png and b/items/active/starbound/weapons/spears/apex/t4.png differ diff --git a/items/active/starbound/weapons/spears/apex/t5a.png b/items/active/starbound/weapons/spears/apex/t5a.png index bb19f5b4..41d9d97a 100644 Binary files a/items/active/starbound/weapons/spears/apex/t5a.png and b/items/active/starbound/weapons/spears/apex/t5a.png differ diff --git a/items/active/starbound/weapons/spears/apex/t5m.png b/items/active/starbound/weapons/spears/apex/t5m.png index 59dcc028..0374a8a6 100644 Binary files a/items/active/starbound/weapons/spears/apex/t5m.png and b/items/active/starbound/weapons/spears/apex/t5m.png differ diff --git a/items/active/starbound/weapons/spears/apex/t5s.png b/items/active/starbound/weapons/spears/apex/t5s.png index fd8ff03b..6875f9e9 100644 Binary files a/items/active/starbound/weapons/spears/apex/t5s.png and b/items/active/starbound/weapons/spears/apex/t5s.png differ diff --git a/items/active/starbound/weapons/spears/apex/t6s.png b/items/active/starbound/weapons/spears/apex/t6s.png index 9b121c75..16e5f6a4 100644 Binary files a/items/active/starbound/weapons/spears/apex/t6s.png and b/items/active/starbound/weapons/spears/apex/t6s.png differ diff --git a/items/active/starbound/weapons/spears/avian/t3.png b/items/active/starbound/weapons/spears/avian/t3.png index 53336c3c..10d1ed0c 100644 Binary files a/items/active/starbound/weapons/spears/avian/t3.png and b/items/active/starbound/weapons/spears/avian/t3.png differ diff --git a/items/active/starbound/weapons/spears/avian/t4.png b/items/active/starbound/weapons/spears/avian/t4.png index 51dfa35f..d456112c 100644 Binary files a/items/active/starbound/weapons/spears/avian/t4.png and b/items/active/starbound/weapons/spears/avian/t4.png differ diff --git a/items/active/starbound/weapons/spears/avian/t5m.png b/items/active/starbound/weapons/spears/avian/t5m.png index b642ad7e..8d02bcc7 100644 Binary files a/items/active/starbound/weapons/spears/avian/t5m.png and b/items/active/starbound/weapons/spears/avian/t5m.png differ diff --git a/items/active/starbound/weapons/spears/avian/t5s.png b/items/active/starbound/weapons/spears/avian/t5s.png index e89875d2..65b4a9d6 100644 Binary files a/items/active/starbound/weapons/spears/avian/t5s.png and b/items/active/starbound/weapons/spears/avian/t5s.png differ diff --git a/items/active/starbound/weapons/spears/avian/t6a.png b/items/active/starbound/weapons/spears/avian/t6a.png index 7528d25b..7161f327 100644 Binary files a/items/active/starbound/weapons/spears/avian/t6a.png and b/items/active/starbound/weapons/spears/avian/t6a.png differ diff --git a/items/active/starbound/weapons/spears/avian/t6m.png b/items/active/starbound/weapons/spears/avian/t6m.png index a9dd8a57..bac6f664 100644 Binary files a/items/active/starbound/weapons/spears/avian/t6m.png and b/items/active/starbound/weapons/spears/avian/t6m.png differ diff --git a/items/active/starbound/weapons/spears/avian/t6s.png b/items/active/starbound/weapons/spears/avian/t6s.png index c125953c..5137a4f2 100644 Binary files a/items/active/starbound/weapons/spears/avian/t6s.png and b/items/active/starbound/weapons/spears/avian/t6s.png differ diff --git a/items/active/starbound/weapons/spears/avianspear.png b/items/active/starbound/weapons/spears/avianspear.png index 0e287a1d..8f27abbe 100644 Binary files a/items/active/starbound/weapons/spears/avianspear.png and b/items/active/starbound/weapons/spears/avianspear.png differ diff --git a/items/active/starbound/weapons/spears/crappyspear.activeitem b/items/active/starbound/weapons/spears/crappyspear.activeitem index 8aeb1f52..e0587e77 100644 --- a/items/active/starbound/weapons/spears/crappyspear.activeitem +++ b/items/active/starbound/weapons/spears/crappyspear.activeitem @@ -1,64 +1,67 @@ { - "itemName" : "sb_crappyspear", - "level" : 1, - "price" : 25, - "maxStack" : 1, - "rarity" : "common", - "tooltipKind" : "sb_sword", - "category" : "spear", - "tooltipFields" : {"subtitle":"Crappy Spear"}, - "description" : "", - "shortdescription" : "Common Crappy Spear", - "twoHanded" : true, - "itemTags" : ["weapon","melee","spear","crappy","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/spear.animation", - "animationParts" : {}, - "animationCustom" : {}, + "itemName": "sb_crappyspear", + "level": 1, + "price": 25, + "maxStack": 1, + "rarity": "common", + "tooltipKind": "sb_sword", + "category": "spear", + "tooltipFields": { + "subtitle": "Crappy Spear" + }, + "description": "", + "shortdescription": "Common Crappy Spear", + "twoHanded": true, + "itemTags": ["weapon", "melee", "spear", "crappy", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/spear.animation", + "animationParts": {}, + "animationCustom": {}, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "primaryAbilityType" : "sb_spear", - "primaryAbility" : { - "fireTime" : [0.8,1.01], - "baseDps" : [3.5,5.5], - "damageConfig" : { - "damageSourceKind" : "spear", - "statusEffects" : [ ], - "knockbackMode" : "aim", - "knockback" : 15, - "timeoutGroup" : "primary" + "primaryAbilityType": "sb_spear", + "primaryAbility": { + "fireTime": [0.8, 1.01], + "baseDps": [3.5, 5.5], + "damageConfig": { + "damageSourceKind": "spear", + "statusEffects": [], + "knockbackMode": "aim", + "knockback": 15, + "timeoutGroup": "primary" }, - "stances" : { - "idle" : { - "allowFlip" : true, - "allowRotate" : true, - "weaponOffset" : [0, 0.95] + "stances": { + "idle": { + "allowFlip": true, + "allowRotate": true, + "weaponOffset": [0, 0.95] }, - "fire" : { - "duration" : 0.24 + "fire": { + "duration": 0.24 }, - "windup" : { - "duration" : 0.2 + "windup": { + "duration": 0.2 } } }, - "builderConfig" : [{ - "nameGenerator" : "crappyspearnames.config:nameGen", - "elementalType" : "physical", - "animationParts" : { - "blade" : { - "path" : "crappyspear/blade/.png", - "variants" : 12, - "paletteSwap" : true + "builderConfig": [{ + "nameGenerator": "crappyspearnames.config:nameGen", + "elementalType": "physical", + "animationParts": { + "blade": { + "path": "crappyspear/blade/.png", + "variants": 12, + "paletteSwap": true + }, + "handle": { + "path": "crappyspear/handle/.png", + "variants": 7, + "paletteSwap": true + } }, - "handle" : { - "path" : "crappyspear/handle/.png", - "variants" : 7, - "paletteSwap" : true - } - }, - "iconDrawables" : ["handle", "blade"], - "palette" : "/items/active/starbound/colors/crappy.weaponcolors" - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "iconDrawables": ["handle", "blade"], + "palette": "/items/active/starbound/colors/crappy.weaponcolors" + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/spears/crappyspear/blade/2.png b/items/active/starbound/weapons/spears/crappyspear/blade/2.png index 8b1eff94..8dfbd2e7 100644 Binary files a/items/active/starbound/weapons/spears/crappyspear/blade/2.png and b/items/active/starbound/weapons/spears/crappyspear/blade/2.png differ diff --git a/items/active/starbound/weapons/spears/crappyspear/blade/7.png b/items/active/starbound/weapons/spears/crappyspear/blade/7.png index 8d62fb3a..6666c344 100644 Binary files a/items/active/starbound/weapons/spears/crappyspear/blade/7.png and b/items/active/starbound/weapons/spears/crappyspear/blade/7.png differ diff --git a/items/active/starbound/weapons/spears/crystalspear/blade/1.png b/items/active/starbound/weapons/spears/crystalspear/blade/1.png index 20015936..1d59907e 100644 Binary files a/items/active/starbound/weapons/spears/crystalspear/blade/1.png and b/items/active/starbound/weapons/spears/crystalspear/blade/1.png differ diff --git a/items/active/starbound/weapons/spears/floran/t2.png b/items/active/starbound/weapons/spears/floran/t2.png index f7fbc9bd..3ee168a0 100644 Binary files a/items/active/starbound/weapons/spears/floran/t2.png and b/items/active/starbound/weapons/spears/floran/t2.png differ diff --git a/items/active/starbound/weapons/spears/floran/t3.png b/items/active/starbound/weapons/spears/floran/t3.png index 0f67fbbf..d44daf36 100644 Binary files a/items/active/starbound/weapons/spears/floran/t3.png and b/items/active/starbound/weapons/spears/floran/t3.png differ diff --git a/items/active/starbound/weapons/spears/floran/t5m.png b/items/active/starbound/weapons/spears/floran/t5m.png index 60c60577..169c0e19 100644 Binary files a/items/active/starbound/weapons/spears/floran/t5m.png and b/items/active/starbound/weapons/spears/floran/t5m.png differ diff --git a/items/active/starbound/weapons/spears/floran/t5s.png b/items/active/starbound/weapons/spears/floran/t5s.png index 97a9cbba..25acce33 100644 Binary files a/items/active/starbound/weapons/spears/floran/t5s.png and b/items/active/starbound/weapons/spears/floran/t5s.png differ diff --git a/items/active/starbound/weapons/spears/floran/t6a.png b/items/active/starbound/weapons/spears/floran/t6a.png index 377da6e3..3b613b7b 100644 Binary files a/items/active/starbound/weapons/spears/floran/t6a.png and b/items/active/starbound/weapons/spears/floran/t6a.png differ diff --git a/items/active/starbound/weapons/spears/floran/t6m.png b/items/active/starbound/weapons/spears/floran/t6m.png index 914f1230..67c85560 100644 Binary files a/items/active/starbound/weapons/spears/floran/t6m.png and b/items/active/starbound/weapons/spears/floran/t6m.png differ diff --git a/items/active/starbound/weapons/spears/floran/t6s.png b/items/active/starbound/weapons/spears/floran/t6s.png index f1e3e03d..1803192b 100644 Binary files a/items/active/starbound/weapons/spears/floran/t6s.png and b/items/active/starbound/weapons/spears/floran/t6s.png differ diff --git a/items/active/starbound/weapons/spears/glitch/t5m.png b/items/active/starbound/weapons/spears/glitch/t5m.png index fac53e59..a18b939a 100644 Binary files a/items/active/starbound/weapons/spears/glitch/t5m.png and b/items/active/starbound/weapons/spears/glitch/t5m.png differ diff --git a/items/active/starbound/weapons/spears/glitch/t6a.png b/items/active/starbound/weapons/spears/glitch/t6a.png index ccf209fd..52b81dcd 100644 Binary files a/items/active/starbound/weapons/spears/glitch/t6a.png and b/items/active/starbound/weapons/spears/glitch/t6a.png differ diff --git a/items/active/starbound/weapons/spears/glitch/t6m.png b/items/active/starbound/weapons/spears/glitch/t6m.png index c71a6697..0688f64a 100644 Binary files a/items/active/starbound/weapons/spears/glitch/t6m.png and b/items/active/starbound/weapons/spears/glitch/t6m.png differ diff --git a/items/active/starbound/weapons/spears/glitch/t6s.png b/items/active/starbound/weapons/spears/glitch/t6s.png index cd9b1bdf..0220b024 100644 Binary files a/items/active/starbound/weapons/spears/glitch/t6s.png and b/items/active/starbound/weapons/spears/glitch/t6s.png differ diff --git a/items/active/starbound/weapons/spears/hackman.png b/items/active/starbound/weapons/spears/hackman.png index 78b4b3d9..577d6550 100644 Binary files a/items/active/starbound/weapons/spears/hackman.png and b/items/active/starbound/weapons/spears/hackman.png differ diff --git a/items/active/starbound/weapons/spears/hackmanight.png b/items/active/starbound/weapons/spears/hackmanight.png index 02f1b574..96c1687e 100644 Binary files a/items/active/starbound/weapons/spears/hackmanight.png and b/items/active/starbound/weapons/spears/hackmanight.png differ diff --git a/items/active/starbound/weapons/spears/human/t3.png b/items/active/starbound/weapons/spears/human/t3.png index 6c19be9c..8f3fea3f 100644 Binary files a/items/active/starbound/weapons/spears/human/t3.png and b/items/active/starbound/weapons/spears/human/t3.png differ diff --git a/items/active/starbound/weapons/spears/human/t4.png b/items/active/starbound/weapons/spears/human/t4.png index 107c03d0..5d2746bd 100644 Binary files a/items/active/starbound/weapons/spears/human/t4.png and b/items/active/starbound/weapons/spears/human/t4.png differ diff --git a/items/active/starbound/weapons/spears/human/t6a.png b/items/active/starbound/weapons/spears/human/t6a.png index c1274bcc..c5eaacf2 100644 Binary files a/items/active/starbound/weapons/spears/human/t6a.png and b/items/active/starbound/weapons/spears/human/t6a.png differ diff --git a/items/active/starbound/weapons/spears/human/t6m.png b/items/active/starbound/weapons/spears/human/t6m.png index 2830eb79..4c056715 100644 Binary files a/items/active/starbound/weapons/spears/human/t6m.png and b/items/active/starbound/weapons/spears/human/t6m.png differ diff --git a/items/active/starbound/weapons/spears/hylotl/t4.png b/items/active/starbound/weapons/spears/hylotl/t4.png index a4a398cf..6c493409 100644 Binary files a/items/active/starbound/weapons/spears/hylotl/t4.png and b/items/active/starbound/weapons/spears/hylotl/t4.png differ diff --git a/items/active/starbound/weapons/spears/hylotl/t5m.png b/items/active/starbound/weapons/spears/hylotl/t5m.png index 036b1402..0c9b04c2 100644 Binary files a/items/active/starbound/weapons/spears/hylotl/t5m.png and b/items/active/starbound/weapons/spears/hylotl/t5m.png differ diff --git a/items/active/starbound/weapons/spears/hylotl/t6a.png b/items/active/starbound/weapons/spears/hylotl/t6a.png index 279309d7..6525ac56 100644 Binary files a/items/active/starbound/weapons/spears/hylotl/t6a.png and b/items/active/starbound/weapons/spears/hylotl/t6a.png differ diff --git a/items/active/starbound/weapons/spears/rainbowspear.activeitem b/items/active/starbound/weapons/spears/rainbowspear.activeitem index f28e0ab9..c2cc99aa 100644 --- a/items/active/starbound/weapons/spears/rainbowspear.activeitem +++ b/items/active/starbound/weapons/spears/rainbowspear.activeitem @@ -1,65 +1,68 @@ { - "itemName" : "sb_rainbowspear", - "level" : 1, - "price" : 160, - "maxStack" : 1, - "rarity" : "uncommon", - "tooltipKind" : "sb_sword", - "category" : "spear", - "tooltipFields" : {"subtitle":"Rainbow Spear"}, - "description" : "", - "shortdescription" : "Rainbow Spear", - "twoHanded" : true, - "itemTags" : ["weapon","melee","spear","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/spear.animation", - "animationParts" : {}, + "itemName": "sb_rainbowspear", + "level": 1, + "price": 160, + "maxStack": 1, + "rarity": "uncommon", + "tooltipKind": "sb_sword", + "category": "spear", + "tooltipFields": { + "subtitle": "Rainbow Spear" + }, + "description": "", + "shortdescription": "Rainbow Spear", + "twoHanded": true, + "itemTags": ["weapon", "melee", "spear", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/spear.animation", + "animationParts": {}, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], - "elementalType" : "physical", - "primaryAbilityType" : "sb_spear", - "primaryAbility" : { - "projectileOffset" : [5,1], - "fireTime" : [0.83, 1.11], - "baseDps" : [9.5, 10.5], - "projectileType" : "rainbow", - "damageConfig" : { - "damageSourceKind" : "spear", - "statusEffects" : [], - "knockbackMode" : "aim", - "knockbackRange" : [25,30], - "timeoutGroup" : "primary" + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + "elementalType": "physical", + "primaryAbilityType": "sb_spear", + "primaryAbility": { + "projectileOffset": [5, 1], + "fireTime": [0.83, 1.11], + "baseDps": [9.5, 10.5], + "projectileType": "rainbow", + "damageConfig": { + "damageSourceKind": "spear", + "statusEffects": [], + "knockbackMode": "aim", + "knockbackRange": [25, 30], + "timeoutGroup": "primary" }, - "stances" : { - "idle" : { - "allowFlip" : true, - "allowRotate" : true, - "weaponOffset" : [0, 0.95] + "stances": { + "idle": { + "allowFlip": true, + "allowRotate": true, + "weaponOffset": [0, 0.95] }, - "fire" : { - "duration" : 0.24 + "fire": { + "duration": 0.24 }, - "windup" : { - "duration" : 0.2 + "windup": { + "duration": 0.2 } } }, - "builderConfig" : [{ - "nameGenerator" : "rainbowspearnames.config:nameGen", - "animationParts" : { - "blade" : { - "path" : "rainbowspear/blade/.png", - "variants" : 4 + "builderConfig": [{ + "nameGenerator": "rainbowspearnames.config:nameGen", + "animationParts": { + "blade": { + "path": "rainbowspear/blade/.png", + "variants": 4 + }, + "handle": { + "path": "rainbowspear/handle/.png", + "variants": 3 + } }, - "handle" : { - "path" : "rainbowspear/handle/.png", - "variants" : 3 - } - }, - "altAbilities" : [ - "flurry", - "spearspin" - ], - "iconDrawables" : ["handle", "blade"] - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "altAbilities": [ + "flurry", + "spearspin" + ], + "iconDrawables": ["handle", "blade"] + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/starbound/weapons/spears/rainbowspear/blade/1.png b/items/active/starbound/weapons/spears/rainbowspear/blade/1.png index 2b7208f3..e400186b 100644 Binary files a/items/active/starbound/weapons/spears/rainbowspear/blade/1.png and b/items/active/starbound/weapons/spears/rainbowspear/blade/1.png differ diff --git a/items/active/starbound/weapons/spears/rainbowspear/blade/2.png b/items/active/starbound/weapons/spears/rainbowspear/blade/2.png index bcbbc2ee..67247d7c 100644 Binary files a/items/active/starbound/weapons/spears/rainbowspear/blade/2.png and b/items/active/starbound/weapons/spears/rainbowspear/blade/2.png differ diff --git a/items/active/starbound/weapons/spears/rainbowspear/blade/3.png b/items/active/starbound/weapons/spears/rainbowspear/blade/3.png index 0fc10d4b..4f79e3a5 100644 Binary files a/items/active/starbound/weapons/spears/rainbowspear/blade/3.png and b/items/active/starbound/weapons/spears/rainbowspear/blade/3.png differ diff --git a/items/active/starbound/weapons/spears/sabertoothspear.png b/items/active/starbound/weapons/spears/sabertoothspear.png index 28371ba8..12d4a013 100644 Binary files a/items/active/starbound/weapons/spears/sabertoothspear.png and b/items/active/starbound/weapons/spears/sabertoothspear.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/1.png b/items/active/starbound/weapons/spears/spear/blade/1.png index 94437710..7fb00c54 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/1.png and b/items/active/starbound/weapons/spears/spear/blade/1.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/11.png b/items/active/starbound/weapons/spears/spear/blade/11.png index 96271877..ec7f3345 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/11.png and b/items/active/starbound/weapons/spears/spear/blade/11.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/12.png b/items/active/starbound/weapons/spears/spear/blade/12.png index 60c5708f..83571fb1 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/12.png and b/items/active/starbound/weapons/spears/spear/blade/12.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/17.png b/items/active/starbound/weapons/spears/spear/blade/17.png index a9accf7a..b4d9c35b 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/17.png and b/items/active/starbound/weapons/spears/spear/blade/17.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/18.png b/items/active/starbound/weapons/spears/spear/blade/18.png index bc8bde7b..8ef4d8e7 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/18.png and b/items/active/starbound/weapons/spears/spear/blade/18.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/19.png b/items/active/starbound/weapons/spears/spear/blade/19.png index 937eca24..a10941fa 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/19.png and b/items/active/starbound/weapons/spears/spear/blade/19.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/2.png b/items/active/starbound/weapons/spears/spear/blade/2.png index 4c3028bf..a95b93dc 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/2.png and b/items/active/starbound/weapons/spears/spear/blade/2.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/20.png b/items/active/starbound/weapons/spears/spear/blade/20.png index bb96feff..1e83f6a1 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/20.png and b/items/active/starbound/weapons/spears/spear/blade/20.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/22.png b/items/active/starbound/weapons/spears/spear/blade/22.png index 5ad9f4ea..a2af5f55 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/22.png and b/items/active/starbound/weapons/spears/spear/blade/22.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/23.png b/items/active/starbound/weapons/spears/spear/blade/23.png index 114f81ba..e4fbf5dd 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/23.png and b/items/active/starbound/weapons/spears/spear/blade/23.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/25.png b/items/active/starbound/weapons/spears/spear/blade/25.png index 8210663e..fd69c2b1 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/25.png and b/items/active/starbound/weapons/spears/spear/blade/25.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/26.png b/items/active/starbound/weapons/spears/spear/blade/26.png index 66f29d15..970f95a7 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/26.png and b/items/active/starbound/weapons/spears/spear/blade/26.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/27.png b/items/active/starbound/weapons/spears/spear/blade/27.png index 100b58a3..d7b39371 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/27.png and b/items/active/starbound/weapons/spears/spear/blade/27.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/28.png b/items/active/starbound/weapons/spears/spear/blade/28.png index 06f41d54..7eb58e91 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/28.png and b/items/active/starbound/weapons/spears/spear/blade/28.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/29.png b/items/active/starbound/weapons/spears/spear/blade/29.png index b39a92d7..fa6c775f 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/29.png and b/items/active/starbound/weapons/spears/spear/blade/29.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/30.png b/items/active/starbound/weapons/spears/spear/blade/30.png index 13003c61..6043c613 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/30.png and b/items/active/starbound/weapons/spears/spear/blade/30.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/31.png b/items/active/starbound/weapons/spears/spear/blade/31.png index da820b36..65f94c44 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/31.png and b/items/active/starbound/weapons/spears/spear/blade/31.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/33.png b/items/active/starbound/weapons/spears/spear/blade/33.png index acb24c90..9e7eaaa8 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/33.png and b/items/active/starbound/weapons/spears/spear/blade/33.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/34.png b/items/active/starbound/weapons/spears/spear/blade/34.png index e5736538..0619f7bb 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/34.png and b/items/active/starbound/weapons/spears/spear/blade/34.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/35.png b/items/active/starbound/weapons/spears/spear/blade/35.png index ed52369b..d7ffe051 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/35.png and b/items/active/starbound/weapons/spears/spear/blade/35.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/36.png b/items/active/starbound/weapons/spears/spear/blade/36.png index 62924010..b161586d 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/36.png and b/items/active/starbound/weapons/spears/spear/blade/36.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/4.png b/items/active/starbound/weapons/spears/spear/blade/4.png index e7e308ef..023eed84 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/4.png and b/items/active/starbound/weapons/spears/spear/blade/4.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/5.png b/items/active/starbound/weapons/spears/spear/blade/5.png index cab78ee6..0296f04b 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/5.png and b/items/active/starbound/weapons/spears/spear/blade/5.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/7.png b/items/active/starbound/weapons/spears/spear/blade/7.png index be3d6fd5..eb1ea33b 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/7.png and b/items/active/starbound/weapons/spears/spear/blade/7.png differ diff --git a/items/active/starbound/weapons/spears/spear/blade/9.png b/items/active/starbound/weapons/spears/spear/blade/9.png index d0305433..14b11892 100644 Binary files a/items/active/starbound/weapons/spears/spear/blade/9.png and b/items/active/starbound/weapons/spears/spear/blade/9.png differ diff --git a/items/active/starbound/weapons/spears/tarspearswoosh.png b/items/active/starbound/weapons/spears/tarspearswoosh.png index a71155ad..8955b975 100644 Binary files a/items/active/starbound/weapons/spears/tarspearswoosh.png and b/items/active/starbound/weapons/spears/tarspearswoosh.png differ diff --git a/items/active/starbound/weapons/spears/teslaspearswoosh.png b/items/active/starbound/weapons/spears/teslaspearswoosh.png index cc26f90f..48cbae32 100644 Binary files a/items/active/starbound/weapons/spears/teslaspearswoosh.png and b/items/active/starbound/weapons/spears/teslaspearswoosh.png differ diff --git a/items/active/starbound/weapons/spears/twistedspear.png b/items/active/starbound/weapons/spears/twistedspear.png index cbf7b796..3986a6fd 100644 Binary files a/items/active/starbound/weapons/spears/twistedspear.png and b/items/active/starbound/weapons/spears/twistedspear.png differ diff --git a/items/active/starbound/weapons/spears/twistedspearswoosh.png b/items/active/starbound/weapons/spears/twistedspearswoosh.png index 5600ded5..a56f1d28 100644 Binary files a/items/active/starbound/weapons/spears/twistedspearswoosh.png and b/items/active/starbound/weapons/spears/twistedspearswoosh.png differ diff --git a/items/active/starbound/weapons/spears/uncommoncrappyspear.activeitem b/items/active/starbound/weapons/spears/uncommoncrappyspear.activeitem index 56e16f05..fc9a36c4 100644 --- a/items/active/starbound/weapons/spears/uncommoncrappyspear.activeitem +++ b/items/active/starbound/weapons/spears/uncommoncrappyspear.activeitem @@ -1,99 +1,118 @@ { - "itemName" : "sb_uncommoncrappyspear", - "level" : 1, - "price" : 25, - "maxStack" : 1, - "rarity" : "uncommon", - "tooltipKind" : "sb_sword", - "category" : "spear", - "tooltipFields" : {"subtitle":"Crappy Spear"}, - "description" : "", - "shortdescription" : "Uncommon Crappy Spear", - "twoHanded" : true, - "itemTags" : ["weapon","melee","spear","upgradeableWeapon"], - "animation" : "/items/active/starbound/weapons/spear.animation", - "animationParts" : {}, - "animationCustom" : {}, + "itemName": "sb_uncommoncrappyspear", + "level": 1, + "price": 25, + "maxStack": 1, + "rarity": "uncommon", + "tooltipKind": "sb_sword", + "category": "spear", + "tooltipFields": { + "subtitle": "Crappy Spear" + }, + "description": "", + "shortdescription": "Uncommon Crappy Spear", + "twoHanded": true, + "itemTags": ["weapon", "melee", "spear", "upgradeableWeapon"], + "animation": "/items/active/starbound/weapons/spear.animation", + "animationParts": {}, + "animationCustom": {}, - "scripts" : ["/items/active/weapons/melee/meleeweapon.lua"], + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], - "primaryAbilityType" : "sb_spear", - "primaryAbility" : { - "projectileOffset" : [5,1], - "fireTime" : [0.93, 1.17], - "baseDps" : [7, 8], - "damageConfig" : { - "damageSourceKind" : "spear", - "statusEffects" : [ ], - "knockbackMode" : "aim", - "knockbackRange" : [25,30], - "timeoutGroup" : "primary" + "primaryAbilityType": "sb_spear", + "primaryAbility": { + "projectileOffset": [5, 1], + "fireTime": [0.93, 1.17], + "baseDps": [7, 8], + "damageConfig": { + "damageSourceKind": "spear", + "statusEffects": [], + "knockbackMode": "aim", + "knockbackRange": [25, 30], + "timeoutGroup": "primary" }, - "stances" : { - "idle" : { - "allowFlip" : true, - "allowRotate" : true, - "weaponOffset" : [0, 0.95] + "stances": { + "idle": { + "allowFlip": true, + "allowRotate": true, + "weaponOffset": [0, 0.95] }, - "fire" : { - "duration" : 0.24 + "fire": { + "duration": 0.24 }, - "windup" : { - "duration" : 0.2 + "windup": { + "duration": 0.2 } } }, - "builderConfig" : [{ - "nameGenerator" : "crappyspearnames.config:nameGen", - "elementalType" : ["physical","fire","ice","electric","poison"], - "elementalConfig" : { - "fire" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"burning","duration":2}], - "damageSourceKind" : "firespear" - } - } - }, - "ice" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"frostslow","duration":2}], - "damageSourceKind" : "icespear" - } - } + "builderConfig": [{ + "nameGenerator": "crappyspearnames.config:nameGen", + "elementalType": ["physical", "fire", "ice", "electric", "poison"], + "elementalConfig": { + "fire": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "burning", + "duration": 2 + } + ], + "damageSourceKind": "firespear" + } + } + }, + "ice": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "frostslow", + "duration": 2 + } + ], + "damageSourceKind": "icespear" + } + } + }, + "electric": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "electrified", + "duration": 2 + } + ], + "damageSourceKind": "electricspear" + } + } + }, + "poison": { + "primaryAbility": { + "damageConfig": { + "statusEffects": [{ + "effect": "weakpoison", + "duration": 2 + } + ], + "damageSourceKind": "poisonspear" + } + } + } }, - "electric" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"electrified","duration":2}], - "damageSourceKind" : "electricspear" - } - } - }, - "poison" : { - "primaryAbility" : { - "damageConfig" : { - "statusEffects" : [{"effect":"weakpoison","duration":2}], - "damageSourceKind" : "poisonspear" - } - } - } - }, - "animationParts" : { - "blade" : { - "path" : "crappyspear/blade/.png", - "variants" : 12, - "paletteSwap" : true + "animationParts": { + "blade": { + "path": "crappyspear/blade/.png", + "variants": 12, + "paletteSwap": true + }, + "handle": { + "path": "crappyspear/handle/.png", + "variants": 7, + "paletteSwap": true + } }, - "handle" : { - "path" : "crappyspear/handle/.png", - "variants" : 7, - "paletteSwap" : true - } - }, - "iconDrawables" : ["handle", "blade"], - "palette" : "/items/active/starbound/colors/crappy.weaponcolors" - }], - "builder" : "/items/buildscripts/starbound/buildweapon.lua" -} \ No newline at end of file + "iconDrawables": ["handle", "blade"], + "palette": "/items/active/starbound/colors/crappy.weaponcolors" + } + ], + "builder": "/items/buildscripts/starbound/buildweapon.lua" +} diff --git a/items/active/unsorted/HarvesterBeam/HarvesterBeam.activeitem.patch b/items/active/unsorted/HarvesterBeam/HarvesterBeam.activeitem.patch deleted file mode 100644 index 3e0914a7..00000000 --- a/items/active/unsorted/HarvesterBeam/HarvesterBeam.activeitem.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","path":"/scripts"},{"op":"add","path":"/scripts/-","value":"xrc.lua"}]] \ No newline at end of file diff --git a/items/active/unsorted/HarvesterBeam/xrc.lua b/items/active/unsorted/HarvesterBeam/xrc.lua deleted file mode 100644 index a9014bab..00000000 --- a/items/active/unsorted/HarvesterBeam/xrc.lua +++ /dev/null @@ -1,2 +0,0 @@ -local ini = init -function init() ini() root.materialPath=function(a) return root.materialConfig(a) and root.materialConfig(a).path end end \ No newline at end of file diff --git a/items/active/unsorted/arrester/sb_arrester.activeitem b/items/active/unsorted/arrester/sb_arrester.activeitem index adfb4de0..486c86c1 100644 --- a/items/active/unsorted/arrester/sb_arrester.activeitem +++ b/items/active/unsorted/arrester/sb_arrester.activeitem @@ -1,63 +1,65 @@ { - "itemName" : "sb_arrester", - "description" : "Used to freeze and incapacitate targets in their tracks.", - "shortdescription" : "Long Arm", - "level" : 1, - "price" : 2000, - "rarity" : "Legendary", - "tooltipKind" : "sb_object", - "category" : "tool", - "inventoryIcon" : [ - {"image" : "longarm.png:front"}, - {"image" : "longarm_fullbright.png:active.1"} + "itemName": "sb_arrester", + "description": "Used to freeze and incapacitate targets in their tracks.", + "shortdescription": "Long Arm", + "level": 1, + "price": 2000, + "rarity": "Legendary", + "tooltipKind": "sb_object", + "category": "tool", + "inventoryIcon": [{ + "image": "longarm.png:front" + }, { + "image": "longarm_fullbright.png:active.1" + } ], - "maxStack" : 1, - "twoHanded" : false, - "scripts" : ["sb_arrester.lua"], - "animationScripts" : ["arresteranimation.lua"], - "animation" : "arrester.animation", + "maxStack": 1, + "twoHanded": false, + "scripts": ["sb_arrester.lua"], + "animationScripts": ["arresteranimation.lua"], + "animation": "arrester.animation", - "targetInnerRadius" : 1.5, - "targetOuterRadius" : 6, - "targetRange" : 30, - "increaseRate" : 35, - "decreaseRate" : 60, - "minArrestFactor" : 0.5, - "damageInterruptFactor" : 2, - "energyUsage" : 40, + "targetInnerRadius": 1.5, + "targetOuterRadius": 6, + "targetRange": 30, + "increaseRate": 35, + "decreaseRate": 60, + "minArrestFactor": 0.5, + "damageInterruptFactor": 2, + "energyUsage": 40, - "stances" : { - "idle" : { - "armRotation" : 0, - "allowRotate" : true, - "allowFlip" : true, - "twoHanded" : false + "stances": { + "idle": { + "armRotation": 0, + "allowRotate": true, + "allowFlip": true, + "twoHanded": false }, - "active" : { - "armRotation" : 0, - "allowRotate" : true, - "allowFlip" : true, - "twoHanded" : false + "active": { + "armRotation": 0, + "allowRotate": true, + "allowFlip": true, + "twoHanded": false }, - "success" : { - "armRotation" : 0, - "allowRotate" : true, - "allowFlip" : true, - "twoHanded" : false, + "success": { + "armRotation": 0, + "allowRotate": true, + "allowFlip": true, + "twoHanded": false, - "duration" : 1, - "transition" : "idle", - "transitionFunction" : "reset" + "duration": 1, + "transition": "idle", + "transitionFunction": "reset" }, - "failure" : { - "armRotation" : 0, - "allowRotate" : true, - "allowFlip" : true, - "twoHanded" : false, + "failure": { + "armRotation": 0, + "allowRotate": true, + "allowFlip": true, + "twoHanded": false, - "duration" : 1, - "transition" : "idle", - "transitionFunction" : "reset" + "duration": 1, + "transition": "idle", + "transitionFunction": "reset" } } -} \ No newline at end of file +} diff --git a/items/active/unsorted/broom/broom.activeitem.patch b/items/active/unsorted/broom/broom.activeitem.patch new file mode 100644 index 00000000..a7f44766 --- /dev/null +++ b/items/active/unsorted/broom/broom.activeitem.patch @@ -0,0 +1,3 @@ +[ +[{"op":"add","path":"/scripts/-","value":"sb_broom.lua"}] +] \ No newline at end of file diff --git a/items/active/unsorted/broom/sb_broom.lua b/items/active/unsorted/broom/sb_broom.lua new file mode 100644 index 00000000..0d789c26 --- /dev/null +++ b/items/active/unsorted/broom/sb_broom.lua @@ -0,0 +1,26 @@ +local sb_sweep = sweep or function() end +local sb_activate = activate or function() end +local sb_update = update or function() end + +function activate(fireMode, shiftHeld) + sb_fireMode = fireMode + sb_activate(fireMode, shiftHeld) +end + +function update(dt, fireMode, shiftHeld) + aimAngle, aimDirection = activeItem.aimAngleAndDirection(0, activeItem.ownerAimPosition()) + activeItem.setFacingDirection(aimDirection) + sb_update(dt, fireMode, shiftHeld) +end + +function sweep() sb_sweep() + if not player then return end + local pos = mcontroller.position() + pos = {math.floor(pos[1]), math.floor(pos[2])} + brushArea = { + {pos[1], pos[2]-3}, + {pos[1]-1, pos[2]-3}, + {pos[1]+1, pos[2]-3} + } + world.damageTiles(brushArea, sb_fireMode == "primary" and "foreground" or "background", pos, "tilling", 0.001, 99, activeItem.ownerEntityId()) +end \ No newline at end of file diff --git a/items/active/unsorted/filledcapturepod/filledcapturepod.activeitem.patch b/items/active/unsorted/filledcapturepod/filledcapturepod.activeitem.patch new file mode 100644 index 00000000..7e7f9c7d --- /dev/null +++ b/items/active/unsorted/filledcapturepod/filledcapturepod.activeitem.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"rare"}] +] \ No newline at end of file diff --git a/items/active/unsorted/laserminer/laserminer.activeitem.patch b/items/active/unsorted/laserminer/laserminer.activeitem.patch index bd101142..d4871332 100644 --- a/items/active/unsorted/laserminer/laserminer.activeitem.patch +++ b/items/active/unsorted/laserminer/laserminer.activeitem.patch @@ -1,12 +1,13 @@ [ -[{"op":"test","path":"/sb_repairType","inverse":true},{"op":"add","path":"/sb_repairType","value":1}], -[{"op":"test","path":"/description","inverse":true},{"op":"add","path":"/description","value":""}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":""}], -[{"op":"test","path":"/largeImage","inverse":true},{"op":"add","path":"/largeImage","value":""}], +[{"op":"test","path":"/sb_repairType","inverse":true},{"op":"add","path":"/sb_repairType","value":"sb_battery-"}], +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], [{"op":"test","path":"/primaryAbility/energyUsage","inverse":true},{"op":"add","path":"/primaryAbility/energyUsage","value":0}], +[{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/merge.lua"}], [{"op":"replace","path":"/primaryAbility/energyUsage","value":0}], -[{"op":"replace","path":"/largeImage","value":"/items/active/unsorted/laserminer/sb_laserminerbig.png"}], -[{"op":"replace","path":"/description","value":"Pickaxes are so last millennium! Lasers are the future."}], -[{"op":"replace","path":"/tooltipKind","value":"sb_tool"}] +[{"op":"add","path":"/sb_merge","value":{"tooltipFields":{"objectImage":"/items/active/unsorted/laserminer/sb_laserminerbig.png"}}}], +[{"op":"test","path":"/description","value":"A disposable mining tool that drills with a focused microwave beam."}, +{"op":"replace","path":"/description","value":"Lasers are the future! This disposable mining tool drills with a focused microwave beam."}], +[{"op":"replace","path":"/tooltipKind","value":"sb_object4"}] ] \ No newline at end of file diff --git a/items/active/unsorted/laserminer/sb_laserminerbig.png b/items/active/unsorted/laserminer/sb_laserminerbig.png index 4c495dbe..0a2a1eb5 100644 Binary files a/items/active/unsorted/laserminer/sb_laserminerbig.png and b/items/active/unsorted/laserminer/sb_laserminerbig.png differ diff --git a/items/active/unsorted/oredetector/oredetector.activeitem.patch b/items/active/unsorted/oredetector/oredetector.activeitem.patch index b041d452..1735b002 100644 --- a/items/active/unsorted/oredetector/oredetector.activeitem.patch +++ b/items/active/unsorted/oredetector/oredetector.activeitem.patch @@ -12,7 +12,5 @@ [{"op":"test","path":"/pingDetectConfig/colors/sb_fossil","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/sb_fossil","value":[188,173,128,255]}], [{"op":"test","path":"/pingDetectConfig/colors/sulphur","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/sulphur","value":[249,237,136,255]}], [{"op":"test","path":"/pingDetectConfig/colors/lead","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/lead","value":[52,52,52,255]}], -[{"op":"test","path":"/pingDetectConfig/colors/moonstone","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/moonstone","value":[255,255,83,255]}], -[{"op":"test","path":"/pingDetectConfig/colors/ferroverium","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/ferroverium","value":[247,220,210,255]}], //??not ours why -[{"op":"test","path":"/pingDetectConfig/colors/hyverium","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/hyverium","value":[156,227,244]}] //??not ours why +[{"op":"test","path":"/pingDetectConfig/colors/moonstone","inverse":true},{"op":"add","path":"/pingDetectConfig/colors/moonstone","value":[255,255,83,255]}] ] \ No newline at end of file diff --git a/items/active/unsorted/papernote/papernote.activeitem.patch b/items/active/unsorted/papernote/papernote.activeitem.patch index 2e0f51b5..d406a9f9 100644 --- a/items/active/unsorted/papernote/papernote.activeitem.patch +++ b/items/active/unsorted/papernote/papernote.activeitem.patch @@ -1 +1,6 @@ -[{"op":"add","path":"/consumeOnUse","value":false},{"op":"add","path":"/sb_copybook","value":true}] \ No newline at end of file +[ +[{"op":"add","path":"/consumeOnUse","value":false}], + +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[{"op":"add","path":"/itemTags/-","value":"sb_copybook"}] +] \ No newline at end of file diff --git a/items/active/unsorted/railplatform/sb_solidrailplatform.activeitem b/items/active/unsorted/railplatform/sb_solidrailplatform.activeitem index efbada96..e85cf71b 100644 --- a/items/active/unsorted/railplatform/sb_solidrailplatform.activeitem +++ b/items/active/unsorted/railplatform/sb_solidrailplatform.activeitem @@ -1,22 +1,19 @@ { - "itemName" : "sb_solidrailplatform", - "price" : 675, - "rarity" : "rare", - "category" : "railPlatform", - "description" : "Places a solid, self-propelled platform that follows rails.", - "shortdescription" : "Solid Rail Platform", - "twoHanded" : true, - "maxStack" : 10, //why? is this to prevent infinite jumps? - "tooltipKind" : "sb_object", + "itemName": "sb_solidrailplatform", + "price": 675, + "rarity": "rare", + "category": "railPlatform", + "description": "Places a solid, self-propelled platform that follows rails.", + "shortdescription": "Solid Rail Platform", + "twoHanded": true, + "maxStack": 10, //why? is this to prevent infinite jumps? + "tooltipKind": "sb_object", - "inventoryIcon" : "sb_solidrailplatformicon.png", - - "scripts" : ["railplatform.lua"], - "animationScripts" : ["placementpreview.lua"], - - "placementRange" : 15, - "placementBounds" : [-3.75, 1, 3.75, -0.5], - "placementPreviewImage" : "/vehicles/railplatform/solidrailplatform.png:onRail.1", - - "platformType" : "solidrailplatform" + "inventoryIcon": "sb_solidrailplatformicon.png", + "scripts": ["railplatform.lua"], + "animationScripts": ["placementpreview.lua"], + "placementRange": 15, + "placementBounds": [-3.75, 1, 3.75, -0.5], + "placementPreviewImage": "/vehicles/railplatform/solidrailplatform.png:onRail.1", + "platformType": "solidrailplatform" } diff --git a/items/active/unsorted/railplatform/sb_solidrailplatformicon.png b/items/active/unsorted/railplatform/sb_solidrailplatformicon.png index 08e5e5c2..1412f7c7 100644 Binary files a/items/active/unsorted/railplatform/sb_solidrailplatformicon.png and b/items/active/unsorted/railplatform/sb_solidrailplatformicon.png differ diff --git a/items/active/unsorted/railplatform/sb_solidrailplatformicon2.png b/items/active/unsorted/railplatform/sb_solidrailplatformicon2.png index d13caca0..b4e49524 100644 Binary files a/items/active/unsorted/railplatform/sb_solidrailplatformicon2.png and b/items/active/unsorted/railplatform/sb_solidrailplatformicon2.png differ diff --git a/items/active/unsorted/relocator/relocator.activeitem.patch b/items/active/unsorted/relocator/relocator.activeitem.patch new file mode 100644 index 00000000..6b866f6f --- /dev/null +++ b/items/active/unsorted/relocator/relocator.activeitem.patch @@ -0,0 +1,3 @@ +[ +[{"op":"add","path":"/scripts/-","value":"/items/active/unsorted/relocator/sb_relocator.lua"}] +] \ No newline at end of file diff --git a/items/active/unsorted/relocator/sb_relocator.lua b/items/active/unsorted/relocator/sb_relocator.lua new file mode 100644 index 00000000..3499544f --- /dev/null +++ b/items/active/unsorted/relocator/sb_relocator.lua @@ -0,0 +1,29 @@ +local ini = init or function() end +local updat = update or function() end + +function init() ini() + if config.getParameter("sb_skip") then + update = updat + return + end + sb_lastSize = config.getParameter("scriptStorage", {}) + sb_lastSize = #(sb_lastSize.storedMonsters or '') +end + +function update(...) updat(...) + local currentSize = config.getParameter("scriptStorage", {}) + currentSize = #(currentSize.storedMonsters or '') + if currentSize ~= sb_lastSize then + local icon = config.getParameter("inventoryIcon") + --So activeItem.setInventoryIcon, along with not accepting anything but strings, also requires an absolute path, even though inventory icons can use local paths + --https://www.youtube.com/watch?v=S-ZeYX53ZY0 <- I listened to this while programming this part + if icon then + if icon:sub(1, 1) ~= "/" then + sb_path = root.itemConfig(config.getParameter("itemName")).directory + end + activeItem.setInventoryIcon((sb_path or "")..icon:gsub(":"..sb_lastSize, ":"..currentSize)) + sb_path = nil + end + end + sb_lastSize = currentSize +end \ No newline at end of file diff --git a/items/active/unsorted/rewardbag/sb_rewardbag.lua b/items/active/unsorted/rewardbag/sb_rewardbag.lua index dcfc42b0..811f63cf 100644 --- a/items/active/unsorted/rewardbag/sb_rewardbag.lua +++ b/items/active/unsorted/rewardbag/sb_rewardbag.lua @@ -1,8 +1,8 @@ local ini = init or 0 function init() if type(ini) == "function" then ini() end - sb_techTier = player.getProperty("sb_techTier") - if config.getParameter("sb_useTechTier",false) then + 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 root.createTreasure = function(pool, level, seed) return root.sb_createTreasure(pool, sb_techTier or level, seed) end end diff --git a/items/active/weapons/fist/sb_explosiveglove.activeitem b/items/active/weapons/fist/sb_explosiveglove.activeitem index b6a0e388..c44dadd4 100644 --- a/items/active/weapons/fist/sb_explosiveglove.activeitem +++ b/items/active/weapons/fist/sb_explosiveglove.activeitem @@ -1,116 +1,106 @@ { - "itemName" : "sb_explosiveglove", - "price" : 1000, - "level" : 5, - "maxStack" : 1, - "rarity" : "Legendary", - "description" : "PUNCH HIM SO HARD HE EXPLODES!", -//"description" : "Punch with the force of a hundred powder kegs!", - "shortdescription" : "Explosive Glove", - "tooltipKind" : "sb_fistweapon", - "category" : "fistWeapon", - "twoHanded" : false, - "itemTags" : ["weapon","upgradeableWeapon"], + "itemName": "sb_explosiveglove", + "price": 1000, + "level": 5, + "maxStack": 1, + "rarity": "Legendary", + "description": "PUNCH HIM SO HARD HE EXPLODES!", + //"description" : "Punch with the force of a hundred powder kegs!", + "shortdescription": "Explosive Glove", + "tooltipKind": "sb_fistweapon", + "category": "fistWeapon", + "twoHanded": false, + "itemTags": ["weapon", "upgradeableWeapon"], - "inventoryIcon" : "sb_explosiveglove.png:front", - "animation" : "fistweapon.animation", - "animationParts" : { - "weapon" : "sb_explosiveglove.png", - "swoosh" : "swoosh/bigphysicalswoosh.png" + "inventoryIcon": "sb_explosiveglove.png:front", + "animation": "fistweapon.animation", + "animationParts": { + "weapon": "sb_explosiveglove.png", + "swoosh": "swoosh/bigphysicalswoosh.png" }, - "animationCustom" : { - "sounds" : { - "fire" : ["/sfx/melee/swing_dagger.ogg"] + "animationCustom": { + "sounds": { + "fire": ["/sfx/melee/swing_dagger.ogg"] } }, - "scripts" : ["fistweapon.lua"], + "scripts": ["fistweapon.lua"], - "needsEdgeTrigger" : true, - "edgeTriggerGrace" : 0.1, + "needsEdgeTrigger": true, + "edgeTriggerGrace": 0.1, - "comboSteps" : 3, - "comboTiming" : [0.2, 0.5], - "comboCooldown" : 0.2, - "comboFinisherSource" : "/items/active/weapons/fist/combofinishers/sb_explosivepunch.combofinisher", + "comboSteps": 3, + "comboTiming": [0.2, 0.5], + "comboCooldown": 0.2, + "comboFinisherSource": "/items/active/weapons/fist/combofinishers/sb_explosivepunch.combofinisher", + "freezeLimit": 2, - "freezeLimit" : 2, + "primaryAbility": { + "scripts": ["/items/active/weapons/fist/punch.lua"], + "class": "Punch", - "primaryAbility" : { - "scripts" : ["/items/active/weapons/fist/punch.lua"], - "class" : "Punch", - - "freezeTime" : 0.15, - "fireTime" : 0.3, - "baseDps" : 10, - "damageConfig" : { - "statusEffects" : [], - "damageSourceKind" : "fist", - "knockback" : [0, 15], - "timeoutGroup" : "primary", - "timeout" : 0.1 + "freezeTime": 0.15, + "fireTime": 0.3, + "baseDps": 10, + "damageConfig": { + "statusEffects": [], + "damageSourceKind": "fist", + "knockback": [0, 15], + "timeoutGroup": "primary", + "timeout": 0.1 }, - "stances" : { - "idle" : { - "armRotation" : 0, - "weaponRotation" : 45, - "weaponRotationCenter" : [-1, 0], - "weaponOffset" : [-0.25, -0.575], - - "allowRotate" : false, - "allowFlip" : true, - - "frontArmFrame" : "run.2", - "backArmFrame" : "jump.3" + "stances": { + "idle": { + "armRotation": 0, + "weaponRotation": 45, + "weaponRotationCenter": [-1, 0], + "weaponOffset": [-0.25, -0.575], + "allowRotate": false, + "allowFlip": true, + "frontArmFrame": "run.2", + "backArmFrame": "jump.3" }, - "windup" : { - "duration" : 0.05, - "armRotation" : 0, - "weaponRotation" : 0, - "weaponRotationCenter" : [-1, 0], - "weaponOffset" : [-0.625, -0.125], - - "allowRotate" : false, - "allowFlip" : false, - - "frontArmFrame" : "swimIdle.1", - "backArmFrame" : "swim.1" + "windup": { + "duration": 0.05, + "armRotation": 0, + "weaponRotation": 0, + "weaponRotationCenter": [-1, 0], + "weaponOffset": [-0.625, -0.125], + "allowRotate": false, + "allowFlip": false, + "frontArmFrame": "swimIdle.1", + "backArmFrame": "swim.1" }, - "windup2" : { - "duration" : 0.05, - "armRotation" : 0, - "weaponRotation" : 0, - "weaponRotationCenter" : [-1, 0], - "weaponOffset" : [-0.75, -0.125], - - "allowRotate" : false, - "allowFlip" : false, - - "frontArmFrame" : "swimIdle.1", - "backArmFrame" : "swim.1", - - "recoil" : true + "windup2": { + "duration": 0.05, + "armRotation": 0, + "weaponRotation": 0, + "weaponRotationCenter": [-1, 0], + "weaponOffset": [-0.75, -0.125], + "allowRotate": false, + "allowFlip": false, + "frontArmFrame": "swimIdle.1", + "backArmFrame": "swim.1", + "recoil": true }, - "fire" : { - "duration" : 0.1, - "armRotation" : 0, - "weaponRotation" : 0, - "weaponRotationCenter" : [-1, 0], - "weaponOffset" : [0.125, -0.25], - - "allowRotate" : false, - "allowFlip" : false, - - "frontArmFrame" : "rotation", - "backArmFrame" : "rotation" + "fire": { + "duration": 0.1, + "armRotation": 0, + "weaponRotation": 0, + "weaponRotationCenter": [-1, 0], + "weaponOffset": [0.125, -0.25], + "allowRotate": false, + "allowFlip": false, + "frontArmFrame": "rotation", + "backArmFrame": "rotation" } } }, - "upgradeParameters" : { - "inventoryIcon" : "explosiveglove.png:front", - "animationParts" : { - "weapon" : "explosiveglove.png" + "upgradeParameters": { + "inventoryIcon": "explosiveglove.png:front", + "animationParts": { + "weapon": "explosiveglove.png" }, - "shortdescription" : "Explosive Glove ^yellow;^reset;" + "shortdescription": "Explosive Glove ^yellow;^reset;" }, - "builder" : "/items/buildscripts/starbound/buildfist.lua" -} \ No newline at end of file + "builder": "/items/buildscripts/starbound/buildfist.lua" +} diff --git a/items/active/weapons/fist/sb_fatalcircuitclaw.png b/items/active/weapons/fist/sb_fatalcircuitclaw.png index 66d8ca25..b8b325f1 100644 Binary files a/items/active/weapons/fist/sb_fatalcircuitclaw.png and b/items/active/weapons/fist/sb_fatalcircuitclaw.png differ diff --git a/items/armors/backitems/paperwings/paperwings.back.patch b/items/armors/backitems/paperwings/paperwings.back.patch index bcef9cd6..75e595fb 100644 --- a/items/armors/backitems/paperwings/paperwings.back.patch +++ b/items/armors/backitems/paperwings/paperwings.back.patch @@ -1,5 +1,4 @@ [ - [{"op":"test","path":"/price","value":5000},{"op":"replace","path":"/price","value":250}], [{"op":"test","path":"/rarity","value":"Legendary"},{"op":"replace","path":"/rarity","value":"Uncommon"}], [{"op":"test","path":"/inventoryIcon","value":"paperwingsicon.png"},{"op":"replace","path":"/inventoryIcon","value":"sb_icon.png"}] diff --git a/items/armors/backitems/paperwings/sb_icon.png b/items/armors/backitems/paperwings/sb_icon.png index bb622b2f..a0c2f687 100644 Binary files a/items/armors/backitems/paperwings/sb_icon.png and b/items/armors/backitems/paperwings/sb_icon.png differ diff --git a/items/armors/backitems/parachutepack/back.png b/items/armors/backitems/parachutepack/back.png index b553b779..074ad49f 100644 Binary files a/items/armors/backitems/parachutepack/back.png and b/items/armors/backitems/parachutepack/back.png differ diff --git a/items/armors/backitems/sb_airpocket/airpocketicon.png b/items/armors/backitems/sb_airpocket/airpocketicon.png index 4258af23..869f9119 100644 Binary files a/items/armors/backitems/sb_airpocket/airpocketicon.png and b/items/armors/backitems/sb_airpocket/airpocketicon.png differ diff --git a/items/armors/backitems/sb_airpocket/back.png b/items/armors/backitems/sb_airpocket/back.png index 6d0812b8..4f6fe6d3 100644 Binary files a/items/armors/backitems/sb_airpocket/back.png and b/items/armors/backitems/sb_airpocket/back.png differ diff --git a/items/armors/biome/eyepatch/sb_eyeball/bsleeve.png b/items/armors/biome/eyepatch/sb_eyeball/bsleeve.png index 343fc8ee..cb3459e0 100644 Binary files a/items/armors/biome/eyepatch/sb_eyeball/bsleeve.png and b/items/armors/biome/eyepatch/sb_eyeball/bsleeve.png differ diff --git a/items/armors/biome/eyepatch/sb_eyeball/chest.png b/items/armors/biome/eyepatch/sb_eyeball/chest.png index 02e8ffed..4b574f6d 100644 Binary files a/items/armors/biome/eyepatch/sb_eyeball/chest.png and b/items/armors/biome/eyepatch/sb_eyeball/chest.png differ diff --git a/items/armors/biome/eyepatch/sb_eyeball/fsleeve.png b/items/armors/biome/eyepatch/sb_eyeball/fsleeve.png index 60dc3632..96a9d875 100644 Binary files a/items/armors/biome/eyepatch/sb_eyeball/fsleeve.png and b/items/armors/biome/eyepatch/sb_eyeball/fsleeve.png differ diff --git a/items/armors/biome/eyepatch/sb_eyeball/headicon.png b/items/armors/biome/eyepatch/sb_eyeball/headicon.png index 2e50d2c7..737c4b66 100644 Binary files a/items/armors/biome/eyepatch/sb_eyeball/headicon.png and b/items/armors/biome/eyepatch/sb_eyeball/headicon.png differ diff --git a/items/armors/biome/eyepatch/sb_eyeball/icons.png b/items/armors/biome/eyepatch/sb_eyeball/icons.png index 1f26503f..f9fb0f2e 100644 Binary files a/items/armors/biome/eyepatch/sb_eyeball/icons.png and b/items/armors/biome/eyepatch/sb_eyeball/icons.png differ diff --git a/items/armors/biome/eyepatch/sb_eyeball/mask.png b/items/armors/biome/eyepatch/sb_eyeball/mask.png index 7a85f42a..753e5251 100644 Binary files a/items/armors/biome/eyepatch/sb_eyeball/mask.png and b/items/armors/biome/eyepatch/sb_eyeball/mask.png differ diff --git a/items/armors/biome/sb_frozenfire/lava/bsleeve.png b/items/armors/biome/sb_frozenfire/lava/bsleeve.png deleted file mode 100644 index 8200f725..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/bsleeve.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/chestf.png b/items/armors/biome/sb_frozenfire/lava/chestf.png deleted file mode 100644 index a0a02e84..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/chestf.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/chestm.png b/items/armors/biome/sb_frozenfire/lava/chestm.png deleted file mode 100644 index 28451117..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/chestm.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/fsleeve.png b/items/armors/biome/sb_frozenfire/lava/fsleeve.png deleted file mode 100644 index dbaa101f..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/fsleeve.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/head.png b/items/armors/biome/sb_frozenfire/lava/head.png deleted file mode 100644 index f7cb276c..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/head.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/icons.png b/items/armors/biome/sb_frozenfire/lava/icons.png deleted file mode 100644 index 94c6cd12..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/icons.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/lava.chest b/items/armors/biome/sb_frozenfire/lava/lava.chest deleted file mode 100644 index 16f46350..00000000 --- a/items/armors/biome/sb_frozenfire/lava/lava.chest +++ /dev/null @@ -1,44 +0,0 @@ -{ - "itemName" : "sb_lavachest", - "inventoryIcon" : "icons.png:chest", - "description" : "todo", - "shortdescription" : "Lava Shirt", - "maxStack" : 1, - "price" : 2500, - "category" : "chestwear", - "rarity" : "rare", - "tooltipKind" : "sb_armor", - - "maleFrames" : { - "body" : "chestm.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chestf.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "statusEffects" : [ - "lavaglow" - ], - - "colorOptions" : [ - { "ffca8a" : "fffffffe", "e0975c" : "f5ea2dfe", "a85636" : "f7a619fe", "6f2919" : "df4400fe" }, - { "ffca8a" : "727272fe", "e0975c" : "414141fe", "a85636" : "1c1c1cfe", "6f2919" : "0b0b0bfe" }, - { "ffca8a" : "e9e9e9fe", "e0975c" : "727272fe", "a85636" : "333333fe", "6f2919" : "161616fe" }, - { "ffca8a" : "e6e6e6fe", "e0975c" : "b6b6b6fe", "a85636" : "7b7b7bfe", "6f2919" : "373737fe" }, - { "ffca8a" : "fa5f53fe", "e0975c" : "bc1d1dfe", "a85636" : "76141bfe", "6f2919" : "460c12fe" }, - { "ffca8a" : "ffb05afe", "e0975c" : "c36a22fe", "a85636" : "833d12fe", "6f2919" : "512209fe" }, - { "ffca8a" : "fae153fe", "e0975c" : "b1981cfe", "a85636" : "7d6214fe", "6f2919" : "47340afe" }, - { "ffca8a" : "8ed563fe", "e0975c" : "498737fe", "a85636" : "1e4b19fe", "6f2919" : "0b200afe" }, - { "ffca8a" : "47c8f8fe", "e0975c" : "1b79b5fe", "a85636" : "10386dfe", "6f2919" : "091d3ffe" }, - { "ffca8a" : "be69f4fe", "e0975c" : "8532bffe", "a85636" : "4e187cfe", "6f2919" : "290c46fe" }, - { "ffca8a" : "fc72f8fe", "e0975c" : "a239a3fe", "a85636" : "681f6ffe", "6f2919" : "35103bfe" }, - { "ffca8a" : "bb8b4dfe", "e0975c" : "75522dfe", "a85636" : "463319fe", "6f2919" : "1c140afe" } - ] -} diff --git a/items/armors/biome/sb_frozenfire/lava/lava.head b/items/armors/biome/sb_frozenfire/lava/lava.head deleted file mode 100644 index 47771a2c..00000000 --- a/items/armors/biome/sb_frozenfire/lava/lava.head +++ /dev/null @@ -1,36 +0,0 @@ -{ - "itemName" : "sb_lavahead", - "inventoryIcon" : "icons.png:head", - "description" : "todo", - "shortdescription" : "Lava Mask", - "maxStack" : 1, - "rarity" : "rare", - "price" : 2500, - "category" : "headwear", - "tooltipKind" : "sb_armor", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "statusEffects" : [ - "lavaglow" - ], - - "colorOptions" : [ - { "ffca8a" : "fffffffe", "e0975c" : "f5ea2dfe", "a85636" : "f7a619fe", "6f2919" : "df4400fe" }, - { "ffca8a" : "727272fe", "e0975c" : "414141fe", "a85636" : "1c1c1cfe", "6f2919" : "0b0b0bfe" }, - { "ffca8a" : "e9e9e9fe", "e0975c" : "727272fe", "a85636" : "333333fe", "6f2919" : "161616fe" }, - { "ffca8a" : "e6e6e6fe", "e0975c" : "b6b6b6fe", "a85636" : "7b7b7bfe", "6f2919" : "373737fe" }, - { "ffca8a" : "fa5f53fe", "e0975c" : "bc1d1dfe", "a85636" : "76141bfe", "6f2919" : "460c12fe" }, - { "ffca8a" : "ffb05afe", "e0975c" : "c36a22fe", "a85636" : "833d12fe", "6f2919" : "512209fe" }, - { "ffca8a" : "fae153fe", "e0975c" : "b1981cfe", "a85636" : "7d6214fe", "6f2919" : "47340afe" }, - { "ffca8a" : "8ed563fe", "e0975c" : "498737fe", "a85636" : "1e4b19fe", "6f2919" : "0b200afe" }, - { "ffca8a" : "47c8f8fe", "e0975c" : "1b79b5fe", "a85636" : "10386dfe", "6f2919" : "091d3ffe" }, - { "ffca8a" : "be69f4fe", "e0975c" : "8532bffe", "a85636" : "4e187cfe", "6f2919" : "290c46fe" }, - { "ffca8a" : "fc72f8fe", "e0975c" : "a239a3fe", "a85636" : "681f6ffe", "6f2919" : "35103bfe" }, - { "ffca8a" : "bb8b4dfe", "e0975c" : "75522dfe", "a85636" : "463319fe", "6f2919" : "1c140afe" } - ] -} diff --git a/items/armors/biome/sb_frozenfire/lava/lava.legs b/items/armors/biome/sb_frozenfire/lava/lava.legs deleted file mode 100644 index 8a6312f3..00000000 --- a/items/armors/biome/sb_frozenfire/lava/lava.legs +++ /dev/null @@ -1,35 +0,0 @@ -{ - "itemName" : "sb_lavalegs", - "inventoryIcon" : "icons.png:pants", - "description" : "todo", - "shortdescription" : "Lava Pants", - "maxStack" : 1, - "rarity" : "rare", - "tooltipKind" : "sb_armor", - "price" : 2500, - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "statusEffects" : [ - "lavaglow" - ], - - "colorOptions" : [ - { "ffca8a" : "fffffffe", "e0975c" : "f5ea2dfe", "a85636" : "f7a619fe", "6f2919" : "df4400fe" }, - { "ffca8a" : "727272fe", "e0975c" : "414141fe", "a85636" : "1c1c1cfe", "6f2919" : "0b0b0bfe" }, - { "ffca8a" : "e9e9e9fe", "e0975c" : "727272fe", "a85636" : "333333fe", "6f2919" : "161616fe" }, - { "ffca8a" : "e6e6e6fe", "e0975c" : "b6b6b6fe", "a85636" : "7b7b7bfe", "6f2919" : "373737fe" }, - { "ffca8a" : "fa5f53fe", "e0975c" : "bc1d1dfe", "a85636" : "76141bfe", "6f2919" : "460c12fe" }, - { "ffca8a" : "ffb05afe", "e0975c" : "c36a22fe", "a85636" : "833d12fe", "6f2919" : "512209fe" }, - { "ffca8a" : "fae153fe", "e0975c" : "b1981cfe", "a85636" : "7d6214fe", "6f2919" : "47340afe" }, - { "ffca8a" : "8ed563fe", "e0975c" : "498737fe", "a85636" : "1e4b19fe", "6f2919" : "0b200afe" }, - { "ffca8a" : "47c8f8fe", "e0975c" : "1b79b5fe", "a85636" : "10386dfe", "6f2919" : "091d3ffe" }, - { "ffca8a" : "be69f4fe", "e0975c" : "8532bffe", "a85636" : "4e187cfe", "6f2919" : "290c46fe" }, - { "ffca8a" : "fc72f8fe", "e0975c" : "a239a3fe", "a85636" : "681f6ffe", "6f2919" : "35103bfe" }, - { "ffca8a" : "bb8b4dfe", "e0975c" : "75522dfe", "a85636" : "463319fe", "6f2919" : "1c140afe" } - ] -} diff --git a/items/armors/biome/sb_frozenfire/lava/mask.png b/items/armors/biome/sb_frozenfire/lava/mask.png deleted file mode 100644 index 72007e31..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/mask.png and /dev/null differ diff --git a/items/armors/biome/sb_frozenfire/lava/pants.png b/items/armors/biome/sb_frozenfire/lava/pants.png deleted file mode 100644 index 8a5f18e6..00000000 Binary files a/items/armors/biome/sb_frozenfire/lava/pants.png and /dev/null differ diff --git a/items/armors/decorative/costumes/adventurerobot/head.png b/items/armors/decorative/costumes/adventurerobot/head.png index 3d075109..f7c06095 100644 Binary files a/items/armors/decorative/costumes/adventurerobot/head.png and b/items/armors/decorative/costumes/adventurerobot/head.png differ diff --git a/items/armors/decorative/costumes/cupids/cupids.back.patch b/items/armors/decorative/costumes/cupids/cupids.back.patch new file mode 100644 index 00000000..0cdbd5ec --- /dev/null +++ b/items/armors/decorative/costumes/cupids/cupids.back.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildarmor.lua"}] +] \ No newline at end of file diff --git a/items/armors/decorative/costumes/cupids/cupids.chest.patch b/items/armors/decorative/costumes/cupids/cupids.chest.patch new file mode 100644 index 00000000..0cdbd5ec --- /dev/null +++ b/items/armors/decorative/costumes/cupids/cupids.chest.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildarmor.lua"}] +] \ No newline at end of file diff --git a/items/armors/decorative/costumes/cupids/cupids.head.patch b/items/armors/decorative/costumes/cupids/cupids.head.patch new file mode 100644 index 00000000..0cdbd5ec --- /dev/null +++ b/items/armors/decorative/costumes/cupids/cupids.head.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildarmor.lua"}] +] \ No newline at end of file diff --git a/items/armors/decorative/costumes/cupids/cupids.legs.patch b/items/armors/decorative/costumes/cupids/cupids.legs.patch new file mode 100644 index 00000000..0cdbd5ec --- /dev/null +++ b/items/armors/decorative/costumes/cupids/cupids.legs.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildarmor.lua"}] +] \ No newline at end of file diff --git a/items/armors/decorative/costumes/sb_techmaster/chest.png b/items/armors/decorative/costumes/sb_techmaster/chest.png index f5c9e147..1aa6b4be 100644 Binary files a/items/armors/decorative/costumes/sb_techmaster/chest.png and b/items/armors/decorative/costumes/sb_techmaster/chest.png differ diff --git a/items/armors/decorative/costumes/sb_techmaster/icons.png b/items/armors/decorative/costumes/sb_techmaster/icons.png index b6bcab35..b9e1e6ad 100644 Binary files a/items/armors/decorative/costumes/sb_techmaster/icons.png and b/items/armors/decorative/costumes/sb_techmaster/icons.png differ diff --git a/items/armors/decorative/costumes/sb_techmaster/pants.png b/items/armors/decorative/costumes/sb_techmaster/pants.png index 5019f000..e29f18ad 100644 Binary files a/items/armors/decorative/costumes/sb_techmaster/pants.png and b/items/armors/decorative/costumes/sb_techmaster/pants.png differ diff --git a/items/armors/decorative/developers/sb_ban/ban.chest b/items/armors/decorative/developers/sb_ban/ban.chest deleted file mode 100644 index 418368e6..00000000 --- a/items/armors/decorative/developers/sb_ban/ban.chest +++ /dev/null @@ -1,39 +0,0 @@ -{ - "itemName" : "sb_banchest", - "inventoryIcon" : "icons.png:chest", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "No staring.", - "shortdescription" : "Ban's Chest", - "tooltipKind" : "sb_armor", - "category" : "chestwear", - - "maleFrames" : { - "body" : "chestm.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chestf.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_ban/ban.head b/items/armors/decorative/developers/sb_ban/ban.head deleted file mode 100644 index f11ee048..00000000 --- a/items/armors/decorative/developers/sb_ban/ban.head +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_banhead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "300% Hair.", - "shortdescription" : "Ban's Hair", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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" } - ] -} \ No newline at end of file diff --git a/items/armors/decorative/developers/sb_ban/ban.legs b/items/armors/decorative/developers/sb_ban/ban.legs deleted file mode 100644 index a2eed419..00000000 --- a/items/armors/decorative/developers/sb_ban/ban.legs +++ /dev/null @@ -1,29 +0,0 @@ -{ - "itemName" : "sb_banlegs", - "inventoryIcon" : "icons.png:pants", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Kinky boots.", - "shortdescription" : "Ban's Boots", - "tooltipKind" : "sb_armor", - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "eab3db", "e0975c" : "d35eae", "a85636" : "97276d", "6f2919" : "59163f" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_ban/bsleeve.png b/items/armors/decorative/developers/sb_ban/bsleeve.png deleted file mode 100644 index 3ce6eb9b..00000000 Binary files a/items/armors/decorative/developers/sb_ban/bsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/chestf.png b/items/armors/decorative/developers/sb_ban/chestf.png deleted file mode 100644 index 04197c6b..00000000 Binary files a/items/armors/decorative/developers/sb_ban/chestf.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/chestm.png b/items/armors/decorative/developers/sb_ban/chestm.png deleted file mode 100644 index 88686b05..00000000 Binary files a/items/armors/decorative/developers/sb_ban/chestm.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/fsleeve.png b/items/armors/decorative/developers/sb_ban/fsleeve.png deleted file mode 100644 index 3ce6eb9b..00000000 Binary files a/items/armors/decorative/developers/sb_ban/fsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/head.png b/items/armors/decorative/developers/sb_ban/head.png deleted file mode 100644 index 48c0dfe6..00000000 Binary files a/items/armors/decorative/developers/sb_ban/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/icons.png b/items/armors/decorative/developers/sb_ban/icons.png deleted file mode 100644 index c45671a2..00000000 Binary files a/items/armors/decorative/developers/sb_ban/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/mask.png b/items/armors/decorative/developers/sb_ban/mask.png deleted file mode 100644 index 72007e31..00000000 Binary files a/items/armors/decorative/developers/sb_ban/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_ban/pants.png b/items/armors/decorative/developers/sb_ban/pants.png deleted file mode 100644 index 44562d08..00000000 Binary files a/items/armors/decorative/developers/sb_ban/pants.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_bartwe/bartwe.head b/items/armors/decorative/developers/sb_bartwe/bartwe.head deleted file mode 100644 index 5bc9bc12..00000000 --- a/items/armors/decorative/developers/sb_bartwe/bartwe.head +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_bartwehead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "May or may not grant Code-Vision(tm).", - "shortdescription" : "Bartwe's Glasses", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_bartwe/head.png b/items/armors/decorative/developers/sb_bartwe/head.png deleted file mode 100644 index 6bd240d1..00000000 Binary files a/items/armors/decorative/developers/sb_bartwe/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_bartwe/icons.png b/items/armors/decorative/developers/sb_bartwe/icons.png deleted file mode 100644 index 781b30c2..00000000 Binary files a/items/armors/decorative/developers/sb_bartwe/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_bartwe/mask.png b/items/armors/decorative/developers/sb_bartwe/mask.png deleted file mode 100644 index ff0b08a7..00000000 Binary files a/items/armors/decorative/developers/sb_bartwe/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/chestf.png b/items/armors/decorative/developers/sb_george/chestf.png deleted file mode 100644 index 27c9f668..00000000 Binary files a/items/armors/decorative/developers/sb_george/chestf.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/chestm.png b/items/armors/decorative/developers/sb_george/chestm.png deleted file mode 100644 index 4aa3332e..00000000 Binary files a/items/armors/decorative/developers/sb_george/chestm.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/george.chest b/items/armors/decorative/developers/sb_george/george.chest deleted file mode 100644 index e701510f..00000000 --- a/items/armors/decorative/developers/sb_george/george.chest +++ /dev/null @@ -1,40 +0,0 @@ -{ - "itemName" : "sb_georgechest", - "inventoryIcon" : "icons.png:chest", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "A sexy combination of an awesome jacket and a stylish green shirt made specifically for George. Be in awe!", - "shortdescription" : "George's Chest Swag", - "tooltipKind" : "sb_armor", - "category" : "chestwear", - - "maleFrames" : { - "body" : "chestm.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chestf.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - -//"effectSources" : [ "cat" ], - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_george/george.head b/items/armors/decorative/developers/sb_george/george.head deleted file mode 100644 index 52fba33a..00000000 --- a/items/armors/decorative/developers/sb_george/george.head +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_georgehead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Some sexy glasses that belong to George. Can you handle them!?", - "shortdescription" : "George's Foxy Glasses", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_george/george.legs b/items/armors/decorative/developers/sb_george/george.legs deleted file mode 100644 index 3667b2d8..00000000 --- a/items/armors/decorative/developers/sb_george/george.legs +++ /dev/null @@ -1,29 +0,0 @@ -{ - "itemName" : "sb_georgelegs", - "inventoryIcon" : "icons.png:pants", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Some form fitting and sexy pants made specifically for George's bodacious curves! Bask in the glory!", - "shortdescription" : "George's Sexy Pants", - "tooltipKind" : "sb_armor", - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_george/george2.head b/items/armors/decorative/developers/sb_george/george2.head deleted file mode 100644 index 4a5bdcce..00000000 --- a/items/armors/decorative/developers/sb_george/george2.head +++ /dev/null @@ -1,29 +0,0 @@ -{ - "itemName" : "sb_georgehead2", - "inventoryIcon" : "icon.png", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Some sexy glasses that belong to George. Can you handle them!?", - "shortdescription" : "George's Foxy Glasses", - "tooltipKind" : "sb_armor", - "category" : "headwear", - "sb_convertTo" : "georgedevhead", - "builder" : "/items/buildscripts/starbound/convert.lua", - "maleFrames" : "head2.png", - "femaleFrames" : "head2.png", - "mask" : "mask.png", - "colorOptions" : [ - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_george/head.png b/items/armors/decorative/developers/sb_george/head.png deleted file mode 100644 index fd4e8b0f..00000000 Binary files a/items/armors/decorative/developers/sb_george/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/head2.frames b/items/armors/decorative/developers/sb_george/head2.frames deleted file mode 100644 index c8317be8..00000000 --- a/items/armors/decorative/developers/sb_george/head2.frames +++ /dev/null @@ -1,7 +0,0 @@ -{ - "image" : "head.png", - "frameList" : { - "normal" : [43, 0, 86, 43], - "climb" : [43, 172, 86, 215] - } -} diff --git a/items/armors/decorative/developers/sb_george/head2.png b/items/armors/decorative/developers/sb_george/head2.png deleted file mode 100644 index 6c4b26c9..00000000 Binary files a/items/armors/decorative/developers/sb_george/head2.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/icon.png b/items/armors/decorative/developers/sb_george/icon.png deleted file mode 100644 index de5a0592..00000000 Binary files a/items/armors/decorative/developers/sb_george/icon.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/icons.png b/items/armors/decorative/developers/sb_george/icons.png deleted file mode 100644 index 7fed1f27..00000000 Binary files a/items/armors/decorative/developers/sb_george/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/mask.png b/items/armors/decorative/developers/sb_george/mask.png deleted file mode 100644 index ff0b08a7..00000000 Binary files a/items/armors/decorative/developers/sb_george/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_george/pants.png b/items/armors/decorative/developers/sb_george/pants.png deleted file mode 100644 index bdf97380..00000000 Binary files a/items/armors/decorative/developers/sb_george/pants.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/bsleeve.png b/items/armors/decorative/developers/sb_kyren/bsleeve.png deleted file mode 100644 index a2a606ea..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/bsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/chestf.png b/items/armors/decorative/developers/sb_kyren/chestf.png deleted file mode 100644 index a7311f12..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/chestf.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/chestm.png b/items/armors/decorative/developers/sb_kyren/chestm.png deleted file mode 100644 index 6d64541a..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/chestm.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/fsleeve.png b/items/armors/decorative/developers/sb_kyren/fsleeve.png deleted file mode 100644 index 5fca9921..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/fsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/head.png b/items/armors/decorative/developers/sb_kyren/head.png deleted file mode 100644 index fa44e2d9..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/icons.png b/items/armors/decorative/developers/sb_kyren/icons.png deleted file mode 100644 index 477b4e80..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/kyren.chest b/items/armors/decorative/developers/sb_kyren/kyren.chest deleted file mode 100644 index 41affc05..00000000 --- a/items/armors/decorative/developers/sb_kyren/kyren.chest +++ /dev/null @@ -1,38 +0,0 @@ -{ - "itemName" : "sb_kyrenchest", - "inventoryIcon" : "icons.png:chest", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Look like Kyren with this top.", - "shortdescription" : "Kyren's Top", - "tooltipKind" : "sb_armor", - "category" : "chestwear", - - "maleFrames" : { - "body" : "chestm.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chestf.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "ffbf68", "e0975c" : "ffbf68", "a85636" : "c7815b", "6f2919" : "642f00" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_kyren/kyren.head b/items/armors/decorative/developers/sb_kyren/kyren.head deleted file mode 100644 index eb469f57..00000000 --- a/items/armors/decorative/developers/sb_kyren/kyren.head +++ /dev/null @@ -1,34 +0,0 @@ -{ - "itemName" : "sb_kyrenhead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Look like Kyren with these glasses.", - "shortdescription" : "Kyren's Glasses", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "statusEffects" : [ - {"stat" : "breathProtection","amount" : 1} - ], - - "colorOptions" : [ - { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_kyren/kyren.legs b/items/armors/decorative/developers/sb_kyren/kyren.legs deleted file mode 100644 index 422d258e..00000000 --- a/items/armors/decorative/developers/sb_kyren/kyren.legs +++ /dev/null @@ -1,29 +0,0 @@ -{ - "itemName" : "sb_kyrenlegs", - "inventoryIcon" : "icons.png:pants", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Look like Kyren with this skirt.", - "shortdescription" : "Kyren's Skirt", - "tooltipKind" : "sb_armor", - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "e6e6e6", "e0975c" : "9c495f", "a85636" : "772936", "6f2919" : "581e28" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_kyren/mask.png b/items/armors/decorative/developers/sb_kyren/mask.png deleted file mode 100644 index ff0b08a7..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_kyren/pants.png b/items/armors/decorative/developers/sb_kyren/pants.png deleted file mode 100644 index e5d234cb..00000000 Binary files a/items/armors/decorative/developers/sb_kyren/pants.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/bsleeve.png b/items/armors/decorative/developers/sb_molly/bsleeve.png deleted file mode 100644 index f84dfb46..00000000 Binary files a/items/armors/decorative/developers/sb_molly/bsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/chestf.png b/items/armors/decorative/developers/sb_molly/chestf.png deleted file mode 100644 index b65bfcc4..00000000 Binary files a/items/armors/decorative/developers/sb_molly/chestf.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/chestm.png b/items/armors/decorative/developers/sb_molly/chestm.png deleted file mode 100644 index bd58f239..00000000 Binary files a/items/armors/decorative/developers/sb_molly/chestm.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/fsleeve.png b/items/armors/decorative/developers/sb_molly/fsleeve.png deleted file mode 100644 index 15135fc0..00000000 Binary files a/items/armors/decorative/developers/sb_molly/fsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/head.png b/items/armors/decorative/developers/sb_molly/head.png deleted file mode 100644 index 76ef4b98..00000000 Binary files a/items/armors/decorative/developers/sb_molly/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/icons.png b/items/armors/decorative/developers/sb_molly/icons.png deleted file mode 100644 index 562c8471..00000000 Binary files a/items/armors/decorative/developers/sb_molly/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/mask.png b/items/armors/decorative/developers/sb_molly/mask.png deleted file mode 100644 index ff0b08a7..00000000 Binary files a/items/armors/decorative/developers/sb_molly/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_molly/molly.chest b/items/armors/decorative/developers/sb_molly/molly.chest deleted file mode 100644 index 48d2142a..00000000 --- a/items/armors/decorative/developers/sb_molly/molly.chest +++ /dev/null @@ -1,37 +0,0 @@ -{ - "itemName" : "sb_mollychest", - "inventoryIcon" : "icons.png:chest", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Look like Molly with this dress top.", - "shortdescription" : "Molly's Dress", - "tooltipKind" : "sb_armor", - "category" : "chestwear", - - "maleFrames" : { - "body" : "chestm.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chestf.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "e6e6e6", "e0975c" : "fdd935", "a85636" : "d8a518", "6f2919" : "b37914" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_molly/molly.head b/items/armors/decorative/developers/sb_molly/molly.head deleted file mode 100644 index 8017819f..00000000 --- a/items/armors/decorative/developers/sb_molly/molly.head +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_mollyhead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "These glasses give +10 to Hipster.", - "shortdescription" : "Molly's Glasses", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "ccae7c", "e0975c" : "a47844", "a85636" : "754c23", "6f2919" : "472b13" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_molly/molly.legs b/items/armors/decorative/developers/sb_molly/molly.legs deleted file mode 100644 index 0401c075..00000000 --- a/items/armors/decorative/developers/sb_molly/molly.legs +++ /dev/null @@ -1,29 +0,0 @@ -{ - "itemName" : "sb_mollylegs", - "inventoryIcon" : "icons.png:pants", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "Look like Molly with this dress.", - "shortdescription" : "Molly's Dress", - "tooltipKind" : "sb_armor", - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "e6e6e6", "e0975c" : "fdd935", "a85636" : "d8a518", "6f2919" : "b37914" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_molly/pants.png b/items/armors/decorative/developers/sb_molly/pants.png deleted file mode 100644 index b998d9d4..00000000 Binary files a/items/armors/decorative/developers/sb_molly/pants.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/bsleeve.png b/items/armors/decorative/developers/sb_rhopunzel/bsleeve.png deleted file mode 100644 index 2c7b0646..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/bsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/chest.png b/items/armors/decorative/developers/sb_rhopunzel/chest.png deleted file mode 100644 index f549c849..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/chest.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/chestm.png b/items/armors/decorative/developers/sb_rhopunzel/chestm.png deleted file mode 100644 index bd52d11f..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/chestm.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/fsleeve.png b/items/armors/decorative/developers/sb_rhopunzel/fsleeve.png deleted file mode 100644 index ead6ff7e..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/fsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/head.png b/items/armors/decorative/developers/sb_rhopunzel/head.png deleted file mode 100644 index e6340167..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/icons.png b/items/armors/decorative/developers/sb_rhopunzel/icons.png deleted file mode 100644 index abf34a57..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/mask.png b/items/armors/decorative/developers/sb_rhopunzel/mask.png deleted file mode 100644 index ff0b08a7..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/pants.png b/items/armors/decorative/developers/sb_rhopunzel/pants.png deleted file mode 100644 index 2d3713af..00000000 Binary files a/items/armors/decorative/developers/sb_rhopunzel/pants.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_rhopunzel/rho.chest b/items/armors/decorative/developers/sb_rhopunzel/rho.chest deleted file mode 100644 index cff12fe9..00000000 --- a/items/armors/decorative/developers/sb_rhopunzel/rho.chest +++ /dev/null @@ -1,39 +0,0 @@ -{ - "itemName" : "sb_rhochest", - "inventoryIcon" : "icons.png:chest", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "THE ONE, THE ONLY.", - "shortdescription" : "Rho", - "tooltipKind" : "sb_armor", - "category" : "chestwear", - - "maleFrames" : { - "body" : "chestm.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chest.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "d29ce7", "e0975c" : "994398", "a85636" : "6a2f69", "6f2919" : "3c1a3b" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_rhopunzel/rho.head b/items/armors/decorative/developers/sb_rhopunzel/rho.head deleted file mode 100644 index 2e31423f..00000000 --- a/items/armors/decorative/developers/sb_rhopunzel/rho.head +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_rhohead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "NOW YOU GOT GLOWY EYES.", - "shortdescription" : "Rho", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - "colorOptions" : [ - { "ffca8a" : "02dad8", "e0975c" : "994398", "a85636" : "6a2f69", "6f2919" : "3c1a3b" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_rhopunzel/rho.legs b/items/armors/decorative/developers/sb_rhopunzel/rho.legs deleted file mode 100644 index b425aa02..00000000 --- a/items/armors/decorative/developers/sb_rhopunzel/rho.legs +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_rholegs", - "inventoryIcon" : "icons.png:pants", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "THOSE SHOES ARE MINE BETCH.", - "shortdescription" : "Rho", - "tooltipKind" : "sb_armor", - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "d29ce7", "e0975c" : "994398", "a85636" : "6a2f69", "6f2919" : "3c1a3b" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_tiy/bsleeve.png b/items/armors/decorative/developers/sb_tiy/bsleeve.png deleted file mode 100644 index c32b024c..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/bsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/chest.png b/items/armors/decorative/developers/sb_tiy/chest.png deleted file mode 100644 index d5dcc9bb..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/chest.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/fsleeve.png b/items/armors/decorative/developers/sb_tiy/fsleeve.png deleted file mode 100644 index 49fec4e1..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/fsleeve.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/head.png b/items/armors/decorative/developers/sb_tiy/head.png deleted file mode 100644 index cf99526c..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/head.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/icons.png b/items/armors/decorative/developers/sb_tiy/icons.png deleted file mode 100644 index 6849c748..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/icons.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/mask.png b/items/armors/decorative/developers/sb_tiy/mask.png deleted file mode 100644 index 299e9f1d..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/mask.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/pants.png b/items/armors/decorative/developers/sb_tiy/pants.png deleted file mode 100644 index 07d169cb..00000000 Binary files a/items/armors/decorative/developers/sb_tiy/pants.png and /dev/null differ diff --git a/items/armors/decorative/developers/sb_tiy/tiy.chest b/items/armors/decorative/developers/sb_tiy/tiy.chest deleted file mode 100644 index 44cf1d6d..00000000 --- a/items/armors/decorative/developers/sb_tiy/tiy.chest +++ /dev/null @@ -1,41 +0,0 @@ -{ - "itemName" : "sb_tiychest", - "inventoryIcon" : "icons.png:chest", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "This shirt belongs to Tiy, what are you doing with it?", - "shortdescription" : "Tiy's Shirt and Scarf", - "tooltipKind" : "sb_armor", - "category" : "chestwear", - - "maleFrames" : { - "body" : "chest.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "femaleFrames" : { - "body" : "chest.png", - "backSleeve" : "bsleeve.png", - "frontSleeve" : "fsleeve.png" - }, - - "statusEffects" : ["stafflowgrav","glow"], - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "e6e6e6", "e0975c" : "91b1bf", "a85636" : "5d808f", "6f2919" : "395661" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_tiy/tiy.head b/items/armors/decorative/developers/sb_tiy/tiy.head deleted file mode 100644 index 137219f3..00000000 --- a/items/armors/decorative/developers/sb_tiy/tiy.head +++ /dev/null @@ -1,31 +0,0 @@ -{ - "itemName" : "sb_tiyhead", - "inventoryIcon" : "icons.png:head", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "This hat belongs to Tiy, what are you doing with it?", - "shortdescription" : "Tiy's Hat", - "tooltipKind" : "sb_armor", - "category" : "headwear", - - "maleFrames" : "head.png", - "femaleFrames" : "head.png", - "mask" : "mask.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "cccaab", "e0975c" : "cccaab", "a85636" : "76775e", "6f2919" : "76775e" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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/decorative/developers/sb_tiy/tiy.legs b/items/armors/decorative/developers/sb_tiy/tiy.legs deleted file mode 100644 index d04d87f4..00000000 --- a/items/armors/decorative/developers/sb_tiy/tiy.legs +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_tiylegs", - "inventoryIcon" : "icons.png:pants", - "maxStack" : 1, - "rarity" : "legendary", - "description" : "These pants belong to Tiy, what are you doing with them?", - "shortdescription" : "Tiy's Pants", - "tooltipKind" : "sb_armor", - "category" : "legwear", - - "maleFrames" : "pants.png", - "femaleFrames" : "pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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" } - ] -} \ No newline at end of file diff --git a/items/armors/decorative/hats/eyepatch/eyepatch.head.patch b/items/armors/decorative/hats/eyepatch/eyepatch.head.patch new file mode 100644 index 00000000..2c2342ee --- /dev/null +++ b/items/armors/decorative/hats/eyepatch/eyepatch.head.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/price","value":2500},{"op":"replace","path":"/price","value":160}], +[{"op":"test","path":"/rarity","value":"Rare"},{"op":"replace","path":"/rarity","value":"uncommon"}] +] \ No newline at end of file diff --git a/items/armors/decorative/hats/sb_braincage/head.png b/items/armors/decorative/hats/sb_braincage/head.png index a5537e39..6de78b4a 100644 Binary files a/items/armors/decorative/hats/sb_braincage/head.png and b/items/armors/decorative/hats/sb_braincage/head.png differ diff --git a/items/armors/decorative/hats/sb_braincage/icon.png b/items/armors/decorative/hats/sb_braincage/icon.png index ac603a84..7fc6c650 100644 Binary files a/items/armors/decorative/hats/sb_braincage/icon.png and b/items/armors/decorative/hats/sb_braincage/icon.png differ diff --git a/items/armors/decorative/hats/sb_braincage/mask.png b/items/armors/decorative/hats/sb_braincage/mask.png index d1b500f0..a4bd7fc0 100644 Binary files a/items/armors/decorative/hats/sb_braincage/mask.png and b/items/armors/decorative/hats/sb_braincage/mask.png differ diff --git a/items/armors/decorative/hats/sb_cone/head.png b/items/armors/decorative/hats/sb_cone/head.png index 5b70e5f7..628b8676 100644 Binary files a/items/armors/decorative/hats/sb_cone/head.png and b/items/armors/decorative/hats/sb_cone/head.png differ diff --git a/items/armors/decorative/hats/sb_cone/icon.png b/items/armors/decorative/hats/sb_cone/icon.png index 29c3dc65..210d379c 100644 Binary files a/items/armors/decorative/hats/sb_cone/icon.png and b/items/armors/decorative/hats/sb_cone/icon.png differ diff --git a/items/armors/decorative/hats/sb_cone/mask.png b/items/armors/decorative/hats/sb_cone/mask.png index 7f267752..753e5251 100644 Binary files a/items/armors/decorative/hats/sb_cone/mask.png and b/items/armors/decorative/hats/sb_cone/mask.png differ diff --git a/items/armors/decorative/hats/sb_odd/head.png b/items/armors/decorative/hats/sb_odd/head.png index 79c4a2c8..7192c0c1 100644 Binary files a/items/armors/decorative/hats/sb_odd/head.png and b/items/armors/decorative/hats/sb_odd/head.png differ diff --git a/items/armors/decorative/hats/sb_odd/icon.png b/items/armors/decorative/hats/sb_odd/icon.png index f4533307..1925aab9 100644 Binary files a/items/armors/decorative/hats/sb_odd/icon.png and b/items/armors/decorative/hats/sb_odd/icon.png differ diff --git a/items/armors/decorative/hats/sb_odd/mask.png b/items/armors/decorative/hats/sb_odd/mask.png index 63b738a1..70f71bcd 100644 Binary files a/items/armors/decorative/hats/sb_odd/mask.png and b/items/armors/decorative/hats/sb_odd/mask.png differ diff --git a/items/armors/decorative/hats/sb_scrap/head.png b/items/armors/decorative/hats/sb_scrap/head.png index 05501056..221cafad 100644 Binary files a/items/armors/decorative/hats/sb_scrap/head.png and b/items/armors/decorative/hats/sb_scrap/head.png differ diff --git a/items/armors/decorative/hats/sb_scrap/mask.png b/items/armors/decorative/hats/sb_scrap/mask.png index c4cf1d9b..59a60a35 100644 Binary files a/items/armors/decorative/hats/sb_scrap/mask.png and b/items/armors/decorative/hats/sb_scrap/mask.png differ diff --git a/items/armors/human/human-cool/sb_bsleeve.png b/items/armors/human/human-cool/sb_bsleeve.png deleted file mode 100644 index 3fea525b..00000000 Binary files a/items/armors/human/human-cool/sb_bsleeve.png and /dev/null differ diff --git a/items/armors/human/human-cool/sb_chestf.png b/items/armors/human/human-cool/sb_chestf.png deleted file mode 100644 index 5cd26585..00000000 Binary files a/items/armors/human/human-cool/sb_chestf.png and /dev/null differ diff --git a/items/armors/human/human-cool/sb_chestm.png b/items/armors/human/human-cool/sb_chestm.png deleted file mode 100644 index 301a4f05..00000000 Binary files a/items/armors/human/human-cool/sb_chestm.png and /dev/null differ diff --git a/items/armors/human/human-cool/sb_cool.chest b/items/armors/human/human-cool/sb_cool.chest deleted file mode 100644 index 9265680c..00000000 --- a/items/armors/human/human-cool/sb_cool.chest +++ /dev/null @@ -1,40 +0,0 @@ -{ - "itemName" : "sb_coolchest", - "price" : 75, - "inventoryIcon" : "sb_icon.png", - "maxStack" : 1, - "rarity" : "Common", - "category" : "chestwear", - "description" : "A cool jacket, too cool for drycleaning.", - "shortdescription" : "Cool Jacket", - "tooltipKind" : "sb_armor", - - "maleFrames" : { - "body" : "sb_chestm.png", - "backSleeve" : "sb_bsleeve.png", - "frontSleeve" : "sb_fsleeve.png" - }, - - "femaleFrames" : { - "body" : "sb_chestf.png", - "backSleeve" : "sb_bsleeve.png", - "frontSleeve" : "sb_fsleeve.png" - }, - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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" } - ] -} \ No newline at end of file diff --git a/items/armors/human/human-cool/sb_fsleeve.png b/items/armors/human/human-cool/sb_fsleeve.png deleted file mode 100644 index 6c07c3a1..00000000 Binary files a/items/armors/human/human-cool/sb_fsleeve.png and /dev/null differ diff --git a/items/armors/human/human-sweatervest/sb_bsleeve.png b/items/armors/human/human-sweatervest/sb_bsleeve.png deleted file mode 100644 index 74c627c0..00000000 Binary files a/items/armors/human/human-sweatervest/sb_bsleeve.png and /dev/null differ diff --git a/items/armors/human/human-sweatervest/sb_fsleeve.png b/items/armors/human/human-sweatervest/sb_fsleeve.png deleted file mode 100644 index e87624e7..00000000 Binary files a/items/armors/human/human-sweatervest/sb_fsleeve.png and /dev/null differ diff --git a/items/armors/human/human-sweatervest/sb_icons.png b/items/armors/human/human-sweatervest/sb_icons.png deleted file mode 100644 index 0bb2415f..00000000 Binary files a/items/armors/human/human-sweatervest/sb_icons.png and /dev/null differ diff --git a/items/armors/human/human-sweatervest/sb_pants.png b/items/armors/human/human-sweatervest/sb_pants.png deleted file mode 100644 index ec4213dc..00000000 Binary files a/items/armors/human/human-sweatervest/sb_pants.png and /dev/null differ diff --git a/items/armors/human/human-sweatervest/sb_sweatervest.chest b/items/armors/human/human-sweatervest/sb_sweatervest.chest deleted file mode 100644 index 163e3b58..00000000 --- a/items/armors/human/human-sweatervest/sb_sweatervest.chest +++ /dev/null @@ -1,40 +0,0 @@ -{ - "itemName" : "sb_sweatervestchest", - "price" : 75, - "inventoryIcon" : "sb_icons.png:chest", - "maxStack" : 1, - "rarity" : "Common", - "category" : "chestwear", - "description" : "A classy sweater vest. It's business casual.", - "shortdescription" : "Work Shirt", - "tooltipKind" : "sb_armor", - - "maleFrames" : { - "body" : "sb_chestm.png", - "backSleeve" : "sb_bsleeve.png", - "frontSleeve" : "sb_fsleeve.png" - }, - - "femaleFrames" : { - "body" : "sb_chestf.png", - "backSleeve" : "sb_bsleeve.png", - "frontSleeve" : "sb_fsleeve.png" - }, - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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" } - ] -} \ No newline at end of file diff --git a/items/armors/human/human-sweatervest/sb_sweatervest.legs b/items/armors/human/human-sweatervest/sb_sweatervest.legs deleted file mode 100644 index 210e8074..00000000 --- a/items/armors/human/human-sweatervest/sb_sweatervest.legs +++ /dev/null @@ -1,31 +0,0 @@ -{ - "itemName" : "sb_sweatervestlegs", - "inventoryIcon" : "sb_icons.png:pants", - "description" : "They're business casual.", - "shortdescription" : "Work Pants", - "maxStack" : 1, - "rarity" : "common", - "tooltipKind" : "sb_armor", - "price" : 35, - "category" : "legwear", - - "maleFrames" : "sb_pants.png", - "femaleFrames" : "sb_pants.png", - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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" } - ] -} \ No newline at end of file diff --git a/items/armors/human/human-workout/sb_bsleeve.png b/items/armors/human/human-workout/sb_bsleeve.png deleted file mode 100644 index 9dbf3d1d..00000000 Binary files a/items/armors/human/human-workout/sb_bsleeve.png and /dev/null differ diff --git a/items/armors/human/human-workout/sb_chestf.png b/items/armors/human/human-workout/sb_chestf.png deleted file mode 100644 index 2ccd1709..00000000 Binary files a/items/armors/human/human-workout/sb_chestf.png and /dev/null differ diff --git a/items/armors/human/human-workout/sb_chestm.png b/items/armors/human/human-workout/sb_chestm.png deleted file mode 100644 index 77eeda7b..00000000 Binary files a/items/armors/human/human-workout/sb_chestm.png and /dev/null differ diff --git a/items/armors/human/human-workout/sb_fsleeve.png b/items/armors/human/human-workout/sb_fsleeve.png deleted file mode 100644 index 9dbf3d1d..00000000 Binary files a/items/armors/human/human-workout/sb_fsleeve.png and /dev/null differ diff --git a/items/armors/human/human-workout/sb_icon.png b/items/armors/human/human-workout/sb_icon.png deleted file mode 100644 index 98e6de8d..00000000 Binary files a/items/armors/human/human-workout/sb_icon.png and /dev/null differ diff --git a/items/armors/human/human-workout/sb_workout.chest b/items/armors/human/human-workout/sb_workout.chest deleted file mode 100644 index 66a1e272..00000000 --- a/items/armors/human/human-workout/sb_workout.chest +++ /dev/null @@ -1,40 +0,0 @@ -{ - "itemName" : "sb_workoutchest", - "price" : 75, - "inventoryIcon" : "sb_icon.png", - "maxStack" : 1, - "rarity" : "Common", - "category" : "chestwear", - "description" : "A sweatshirt... It smells.", - "shortdescription" : "Sweatshirt", - "tooltipKind" : "sb_armor", - - "maleFrames" : { - "body" : "sb_chestm.png", - "backSleeve" : "sb_bsleeve.png", - "frontSleeve" : "sb_fsleeve.png" - }, - - "femaleFrames" : { - "body" : "sb_chestf.png", - "backSleeve" : "sb_bsleeve.png", - "frontSleeve" : "sb_fsleeve.png" - }, - - "builder" : "/items/buildscripts/starbound/buildarmor.lua", - - "colorOptions" : [ - { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, - { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, - { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, - { "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" } - ] -} \ No newline at end of file diff --git a/items/armors/decorative/developers/sb_george/bsleeve.png b/items/armors/human/sb_human-cool/bsleeve.png similarity index 100% rename from items/armors/decorative/developers/sb_george/bsleeve.png rename to items/armors/human/sb_human-cool/bsleeve.png diff --git a/items/armors/human/sb_human-cool/chestf.png b/items/armors/human/sb_human-cool/chestf.png new file mode 100644 index 00000000..b332c766 Binary files /dev/null and b/items/armors/human/sb_human-cool/chestf.png differ diff --git a/items/armors/human/sb_human-cool/chestm.png b/items/armors/human/sb_human-cool/chestm.png new file mode 100644 index 00000000..2f1e029e Binary files /dev/null and b/items/armors/human/sb_human-cool/chestm.png differ diff --git a/items/armors/human/sb_human-cool/cool.chest b/items/armors/human/sb_human-cool/cool.chest new file mode 100644 index 00000000..d9631b12 --- /dev/null +++ b/items/armors/human/sb_human-cool/cool.chest @@ -0,0 +1,40 @@ +{ + "itemName" : "sb_coolchest", + "price" : 75, + "inventoryIcon" : "icon.png", + "maxStack" : 1, + "rarity" : "Common", + "category" : "chestwear", + "description" : "A cool jacket, too cool for drycleaning.", + "shortdescription" : "Cool Jacket", + "tooltipKind" : "sb_armor", + + "maleFrames" : { + "body" : "chestm.png", + "backSleeve" : "bsleeve.png", + "frontSleeve" : "fsleeve.png" + }, + + "femaleFrames" : { + "body" : "chestf.png", + "backSleeve" : "bsleeve.png", + "frontSleeve" : "fsleeve.png" + }, + + "builder" : "/items/buildscripts/starbound/buildarmor.lua", + + "colorOptions" : [ + { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, + { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, + { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, + { "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" } + ] +} \ No newline at end of file diff --git a/items/armors/decorative/developers/sb_george/fsleeve.png b/items/armors/human/sb_human-cool/fsleeve.png similarity index 100% rename from items/armors/decorative/developers/sb_george/fsleeve.png rename to items/armors/human/sb_human-cool/fsleeve.png diff --git a/items/armors/human/human-cool/sb_icon.png b/items/armors/human/sb_human-cool/icon.png similarity index 100% rename from items/armors/human/human-cool/sb_icon.png rename to items/armors/human/sb_human-cool/icon.png diff --git a/items/armors/human/sb_human-work/bsleeve.png b/items/armors/human/sb_human-work/bsleeve.png new file mode 100644 index 00000000..dd6a1c97 Binary files /dev/null and b/items/armors/human/sb_human-work/bsleeve.png differ diff --git a/items/armors/human/human-sweatervest/sb_chestf.png b/items/armors/human/sb_human-work/chestf.png similarity index 100% rename from items/armors/human/human-sweatervest/sb_chestf.png rename to items/armors/human/sb_human-work/chestf.png diff --git a/items/armors/human/human-sweatervest/sb_chestm.png b/items/armors/human/sb_human-work/chestm.png similarity index 100% rename from items/armors/human/human-sweatervest/sb_chestm.png rename to items/armors/human/sb_human-work/chestm.png diff --git a/items/armors/human/sb_human-work/fsleeve.png b/items/armors/human/sb_human-work/fsleeve.png new file mode 100644 index 00000000..429a051a Binary files /dev/null and b/items/armors/human/sb_human-work/fsleeve.png differ diff --git a/items/armors/human/sb_human-work/icons.png b/items/armors/human/sb_human-work/icons.png new file mode 100644 index 00000000..bb49e464 Binary files /dev/null and b/items/armors/human/sb_human-work/icons.png differ diff --git a/items/armors/human/sb_human-work/pants.png b/items/armors/human/sb_human-work/pants.png new file mode 100644 index 00000000..a600ffa7 Binary files /dev/null and b/items/armors/human/sb_human-work/pants.png differ diff --git a/items/armors/human/sb_human-work/work.chest b/items/armors/human/sb_human-work/work.chest new file mode 100644 index 00000000..fd1df501 --- /dev/null +++ b/items/armors/human/sb_human-work/work.chest @@ -0,0 +1,40 @@ +{ + "itemName" : "sb_workchest", + "price" : 75, + "inventoryIcon" : "icons.png:chest", + "maxStack" : 1, + "rarity" : "Common", + "category" : "chestwear", + "description" : "A classy sweater vest. It's business casual.", + "shortdescription" : "Work Shirt", + "tooltipKind" : "sb_armor", + + "maleFrames" : { + "body" : "chestm.png", + "backSleeve" : "bsleeve.png", + "frontSleeve" : "fsleeve.png" + }, + + "femaleFrames" : { + "body" : "chestf.png", + "backSleeve" : "bsleeve.png", + "frontSleeve" : "fsleeve.png" + }, + + "builder" : "/items/buildscripts/starbound/buildarmor.lua", + + "colorOptions" : [ + { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, + { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, + { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, + { "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" } + ] +} \ No newline at end of file diff --git a/items/armors/human/sb_human-work/work.legs b/items/armors/human/sb_human-work/work.legs new file mode 100644 index 00000000..0adb1140 --- /dev/null +++ b/items/armors/human/sb_human-work/work.legs @@ -0,0 +1,31 @@ +{ + "itemName" : "sb_worklegs", + "inventoryIcon" : "icons.png:pants", + "description" : "They're business casual.", + "shortdescription" : "Work Pants", + "maxStack" : 1, + "rarity" : "common", + "tooltipKind" : "sb_armor", + "price" : 35, + "category" : "legwear", + + "maleFrames" : "pants.png", + "femaleFrames" : "pants.png", + + "builder" : "/items/buildscripts/starbound/buildarmor.lua", + + "colorOptions" : [ + { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, + { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, + { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, + { "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" } + ] +} \ No newline at end of file diff --git a/items/armors/human/sb_human-workout/bsleeve.png b/items/armors/human/sb_human-workout/bsleeve.png new file mode 100644 index 00000000..9b165ff4 Binary files /dev/null and b/items/armors/human/sb_human-workout/bsleeve.png differ diff --git a/items/armors/human/sb_human-workout/chestf.png b/items/armors/human/sb_human-workout/chestf.png new file mode 100644 index 00000000..916b7aaa Binary files /dev/null and b/items/armors/human/sb_human-workout/chestf.png differ diff --git a/items/armors/human/sb_human-workout/chestm.png b/items/armors/human/sb_human-workout/chestm.png new file mode 100644 index 00000000..12900eae Binary files /dev/null and b/items/armors/human/sb_human-workout/chestm.png differ diff --git a/items/armors/human/sb_human-workout/fsleeve.png b/items/armors/human/sb_human-workout/fsleeve.png new file mode 100644 index 00000000..9b165ff4 Binary files /dev/null and b/items/armors/human/sb_human-workout/fsleeve.png differ diff --git a/items/armors/human/sb_human-workout/icon.png b/items/armors/human/sb_human-workout/icon.png new file mode 100644 index 00000000..59f5cac9 Binary files /dev/null and b/items/armors/human/sb_human-workout/icon.png differ diff --git a/items/armors/human/sb_human-workout/workout.chest b/items/armors/human/sb_human-workout/workout.chest new file mode 100644 index 00000000..8bc44cdc --- /dev/null +++ b/items/armors/human/sb_human-workout/workout.chest @@ -0,0 +1,40 @@ +{ + "itemName" : "sb_workoutchest", + "price" : 75, + "inventoryIcon" : "icon.png", + "maxStack" : 1, + "rarity" : "Common", + "category" : "chestwear", + "description" : "A sweatshirt... It smells.", + "shortdescription" : "Sweatshirt", + "tooltipKind" : "sb_armor", + + "maleFrames" : { + "body" : "chestm.png", + "backSleeve" : "bsleeve.png", + "frontSleeve" : "fsleeve.png" + }, + + "femaleFrames" : { + "body" : "chestf.png", + "backSleeve" : "bsleeve.png", + "frontSleeve" : "fsleeve.png" + }, + + "builder" : "/items/buildscripts/starbound/buildarmor.lua", + + "colorOptions" : [ + { "ffca8a" : "96cbe7", "e0975c" : "5588d4", "a85636" : "344495", "6f2919" : "1a1c51" }, + { "ffca8a" : "838383", "e0975c" : "555", "a85636" : "383838", "6f2919" : "151515" }, + { "ffca8a" : "b5b5b5", "e0975c" : "808080", "a85636" : "555", "6f2919" : "303030" }, + { "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" } + ] +} \ No newline at end of file diff --git a/items/armors/other/sb_cultist/head.png b/items/armors/other/sb_cultist/head.png index 82615aca..396192c1 100644 Binary files a/items/armors/other/sb_cultist/head.png and b/items/armors/other/sb_cultist/head.png differ diff --git a/items/armors/other/sb_cultist/icons.png b/items/armors/other/sb_cultist/icons.png index f878eb55..2ce6e006 100644 Binary files a/items/armors/other/sb_cultist/icons.png and b/items/armors/other/sb_cultist/icons.png differ diff --git a/items/armors/other/sb_cultist/mask.png b/items/armors/other/sb_cultist/mask.png index 2c15e37f..753e5251 100644 Binary files a/items/armors/other/sb_cultist/mask.png and b/items/armors/other/sb_cultist/mask.png differ diff --git a/items/armors/other/sb_spacemarine/bsleeve.png b/items/armors/other/sb_spacemarine/bsleeve.png index 65e4611a..7d48880c 100644 Binary files a/items/armors/other/sb_spacemarine/bsleeve.png and b/items/armors/other/sb_spacemarine/bsleeve.png differ diff --git a/items/armors/other/sb_spacemarine/chest.png b/items/armors/other/sb_spacemarine/chest.png index d5a600bc..c432ed43 100644 Binary files a/items/armors/other/sb_spacemarine/chest.png and b/items/armors/other/sb_spacemarine/chest.png differ diff --git a/items/armors/other/sb_spacemarine/fsleeve.png b/items/armors/other/sb_spacemarine/fsleeve.png index e75ec7a6..b98e52dc 100644 Binary files a/items/armors/other/sb_spacemarine/fsleeve.png and b/items/armors/other/sb_spacemarine/fsleeve.png differ diff --git a/items/armors/other/sb_spacemarine/head.png b/items/armors/other/sb_spacemarine/head.png index 7500eb76..4c5852f1 100644 Binary files a/items/armors/other/sb_spacemarine/head.png and b/items/armors/other/sb_spacemarine/head.png differ diff --git a/items/armors/other/sb_spacemarine/icons.png b/items/armors/other/sb_spacemarine/icons.png index 8f291740..ae39702f 100644 Binary files a/items/armors/other/sb_spacemarine/icons.png and b/items/armors/other/sb_spacemarine/icons.png differ diff --git a/items/armors/other/sb_spacemarine/mask.png b/items/armors/other/sb_spacemarine/mask.png index 54f2c7a7..6197e56b 100644 Binary files a/items/armors/other/sb_spacemarine/mask.png and b/items/armors/other/sb_spacemarine/mask.png differ diff --git a/items/armors/other/sb_spacemarine/pants.png b/items/armors/other/sb_spacemarine/pants.png index 4aa396bd..711c6097 100644 Binary files a/items/armors/other/sb_spacemarine/pants.png and b/items/armors/other/sb_spacemarine/pants.png differ diff --git a/items/armors/penguin/sb_empty/bsleeve.png b/items/armors/penguin/sb_empty/bsleeve.png index 3ce6eb9b..ce9e494f 100644 Binary files a/items/armors/penguin/sb_empty/bsleeve.png and b/items/armors/penguin/sb_empty/bsleeve.png differ diff --git a/items/armors/penguin/sb_empty/chest.png b/items/armors/penguin/sb_empty/chest.png index ad417255..401f185d 100644 Binary files a/items/armors/penguin/sb_empty/chest.png and b/items/armors/penguin/sb_empty/chest.png differ diff --git a/items/armors/penguin/sb_empty/fsleeve.png b/items/armors/penguin/sb_empty/fsleeve.png index 3ce6eb9b..ce9e494f 100644 Binary files a/items/armors/penguin/sb_empty/fsleeve.png and b/items/armors/penguin/sb_empty/fsleeve.png differ diff --git a/items/armors/penguin/sb_empty/head.png b/items/armors/penguin/sb_empty/head.png index 014cef2e..0822596f 100644 Binary files a/items/armors/penguin/sb_empty/head.png and b/items/armors/penguin/sb_empty/head.png differ diff --git a/items/armors/penguin/sb_empty/icons.png b/items/armors/penguin/sb_empty/icons.png index 0faba96a..de0daf84 100644 Binary files a/items/armors/penguin/sb_empty/icons.png and b/items/armors/penguin/sb_empty/icons.png differ diff --git a/items/armors/penguin/sb_empty/pants.png b/items/armors/penguin/sb_empty/pants.png index 438f38a0..078837e8 100644 Binary files a/items/armors/penguin/sb_empty/pants.png and b/items/armors/penguin/sb_empty/pants.png differ diff --git a/items/armors/sb_bsleeve.frames b/items/armors/sb_bsleeve.frames deleted file mode 100644 index f1ce473f..00000000 --- a/items/armors/sb_bsleeve.frames +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameGrid" : { - "size" : [43, 43], - "dimensions" : [9, 8], - - "names" : [ - [ null, "idle.1", "idle.2", "idle.3", "idle.4", "idle.5", null, null, "duck.1" ], - [ null, null, "walk.1", "walk.2", "walk.3", "walk.4", "walk.5", null, "rotation" ], - [ null, null, "run.1", "run.2", "run.3", "run.4", "run.5", null, null ], - [ null, "jump.1", "jump.2", "jump.3", "jump.4", "fall.1", "fall.2", "fall.3", "fall.4" ], - [ null, null, null, null, null, null, null, null, null ], - [ null, "swimIdle.1", "swimIdle.2", null, "swim.1", "swim.2", "swim.3", "swim.4", "swim.5" ], - [ null, null, null, "idleMelee", null, null, null, null, "duckMelee" ] - ] - }, - "aliases" : { - "swim.6" : "swimIdle.1", - "swim.7" : "swimIdle.2", - "sit.1" : "idle.1", - "lay.1" : "idle.1" - } -} diff --git a/items/armors/sb_chest.frames b/items/armors/sb_chest.frames deleted file mode 100644 index 0b40880f..00000000 --- a/items/armors/sb_chest.frames +++ /dev/null @@ -1,18 +0,0 @@ -{ - "frameList" : { - "chest.1" : [43, 0, 86, 43], - "chest.2" : [0, 43, 43, 86], - "chest.3" : [43, 43, 86, 86], - "run" : [43, 86, 86, 129], - "duck" : [43, 129, 86, 172], - "swim" : [43, 215, 86, 258] - }, - "aliases" : { - "idle.1" : "chest.1", - "idle.2" : "chest.2", - "idle.3" : "chest.3", - "idle.4" : "chest.2", - "idle.5" : "chest.1", - "duck.1" : "duck" - } -} diff --git a/items/armors/sb_chestf.frames b/items/armors/sb_chestf.frames deleted file mode 100644 index 0b40880f..00000000 --- a/items/armors/sb_chestf.frames +++ /dev/null @@ -1,18 +0,0 @@ -{ - "frameList" : { - "chest.1" : [43, 0, 86, 43], - "chest.2" : [0, 43, 43, 86], - "chest.3" : [43, 43, 86, 86], - "run" : [43, 86, 86, 129], - "duck" : [43, 129, 86, 172], - "swim" : [43, 215, 86, 258] - }, - "aliases" : { - "idle.1" : "chest.1", - "idle.2" : "chest.2", - "idle.3" : "chest.3", - "idle.4" : "chest.2", - "idle.5" : "chest.1", - "duck.1" : "duck" - } -} diff --git a/items/armors/sb_chestm.frames b/items/armors/sb_chestm.frames deleted file mode 100644 index 0b40880f..00000000 --- a/items/armors/sb_chestm.frames +++ /dev/null @@ -1,18 +0,0 @@ -{ - "frameList" : { - "chest.1" : [43, 0, 86, 43], - "chest.2" : [0, 43, 43, 86], - "chest.3" : [43, 43, 86, 86], - "run" : [43, 86, 86, 129], - "duck" : [43, 129, 86, 172], - "swim" : [43, 215, 86, 258] - }, - "aliases" : { - "idle.1" : "chest.1", - "idle.2" : "chest.2", - "idle.3" : "chest.3", - "idle.4" : "chest.2", - "idle.5" : "chest.1", - "duck.1" : "duck" - } -} diff --git a/items/armors/sb_fsleeve.frames b/items/armors/sb_fsleeve.frames deleted file mode 100644 index f1ce473f..00000000 --- a/items/armors/sb_fsleeve.frames +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameGrid" : { - "size" : [43, 43], - "dimensions" : [9, 8], - - "names" : [ - [ null, "idle.1", "idle.2", "idle.3", "idle.4", "idle.5", null, null, "duck.1" ], - [ null, null, "walk.1", "walk.2", "walk.3", "walk.4", "walk.5", null, "rotation" ], - [ null, null, "run.1", "run.2", "run.3", "run.4", "run.5", null, null ], - [ null, "jump.1", "jump.2", "jump.3", "jump.4", "fall.1", "fall.2", "fall.3", "fall.4" ], - [ null, null, null, null, null, null, null, null, null ], - [ null, "swimIdle.1", "swimIdle.2", null, "swim.1", "swim.2", "swim.3", "swim.4", "swim.5" ], - [ null, null, null, "idleMelee", null, null, null, null, "duckMelee" ] - ] - }, - "aliases" : { - "swim.6" : "swimIdle.1", - "swim.7" : "swimIdle.2", - "sit.1" : "idle.1", - "lay.1" : "idle.1" - } -} diff --git a/items/armors/sb_head.frames b/items/armors/sb_head.frames deleted file mode 100644 index 2abbebaa..00000000 --- a/items/armors/sb_head.frames +++ /dev/null @@ -1 +0,0 @@ -{"image":"sb_head.png","frameList":{"normal":[43,0,86,43],"climb":[43,172,86,215]}} \ No newline at end of file diff --git a/items/armors/sb_icons.frames b/items/armors/sb_icons.frames deleted file mode 100644 index e293839a..00000000 --- a/items/armors/sb_icons.frames +++ /dev/null @@ -1,8 +0,0 @@ -{ - "frameList" : { - "head" : [0, 0, 16, 16], - "chest" : [16, 0, 32, 16], - "pants" : [32, 0, 48, 16], - "back" : [48, 0, 64, 16] - } -} \ No newline at end of file diff --git a/items/armors/sb_pants.frames b/items/armors/sb_pants.frames deleted file mode 100644 index 7b94fe74..00000000 --- a/items/armors/sb_pants.frames +++ /dev/null @@ -1,22 +0,0 @@ -{ - "frameGrid" : { - "size" : [43, 43], - "dimensions" : [9, 6], - - "names" : [ - [ null, "idle.1", "idle.2", "idle.3", "idle.4", "idle.5", "sit.1", null, "duck.1" ], - [ null, "walk.1", "walk.2", "walk.3", "walk.4", "walk.5", "walk.6", "walk.7", "walk.8" ], - [ null, "run.1", "run.2", "run.3", "run.4", "run.5", "run.6", "run.7", "run.8" ], - [ null, "jump.1", "jump.2", "jump.3", "jump.4", "fall.1", "fall.2", "fall.3", "fall.4" ], - [ null, "climb.1", "climb.2", "climb.3", "climb.4", "climb.5", "climb.6", "climb.7", "climb.8" ], - [ null, "swimIdle.1", null, null, "swim.1", "swim.2", "swim.3", "swim.4", null ] - ] - }, - "aliases" : { - "swimIdle.2" : "swimIdle.1", - "swim.5" : "swimIdle.1", - "swim.6" : "swimIdle.2", - "swim.7" : "swimIdle.2", - "lay.1" : "idle.1" - } -} diff --git a/items/augments/back/sb_energyregenaugment.png b/items/augments/back/sb_energyregenaugment.png index ec6afad2..c05e634b 100644 Binary files a/items/augments/back/sb_energyregenaugment.png and b/items/augments/back/sb_energyregenaugment.png differ diff --git a/items/augments/pet/sb_thornscollar.augment b/items/augments/pet/sb_thornscollar.augment index ec8ebc55..f446c4ba 100644 --- a/items/augments/pet/sb_thornscollar.augment +++ b/items/augments/pet/sb_thornscollar.augment @@ -1,19 +1,19 @@ { - "itemName" : "sb_thornscollar", - "price" : 2500, - "rarity" : "Uncommon", - "tooltipKind" : "sb_object4b", - "category" : "petCollar", - "inventoryIcon" : "thornscollar.png", - "description" : "A collar that causes your pet to reflect damage back at nearby enemies.\n^gray;Equip to capture pod with right-click^reset;", - "shortdescription" : "Thorns Collar", + "itemName": "sb_thornscollar", + "price": 2500, + "rarity": "Uncommon", + "tooltipKind": "sb_object4b", + "category": "petCollar", + "inventoryIcon": "thornscollar.png", + "description": "A collar that causes your pet to reflect damage back at nearby enemies.\n^gray;Equip to capture pod with right-click^reset;", + "shortdescription": "Thorns Collar", - "collar" : { - "name" : "sb_thorns", - "displayName" : "Thorns", - "displayIcon" : "/items/augments/pet/thornscollar.png", - "effects" : ["thornsaugment"] + "collar": { + "name": "sb_thorns", + "displayName": "Thorns", + "displayIcon": "/items/augments/pet/thornscollar.png", + "effects": ["thornsaugment"] }, - "radioMessagesOnPickup" : ["pickupcollar"], - "scripts" : ["/scripts/augments/collar.lua"] -} \ No newline at end of file + "radioMessagesOnPickup": ["pickupcollar"], + "scripts": ["/scripts/augments/collar.lua"] +} diff --git a/items/augments/sb_miningtool/aegisalt.augment b/items/augments/sb_miningtool/aegisalt.augment index 9ecc069d..3cb79788 100644 --- a/items/augments/sb_miningtool/aegisalt.augment +++ b/items/augments/sb_miningtool/aegisalt.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_aegisalt_repair", - "price" : 60, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 280, - "inventoryIcon" : "aegisalt.png", - "description" : "It's an aegisalt repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Aegisalt Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_aegisalt_repair", + "price": 60, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 280, + "inventoryIcon": "aegisalt.png", + "description": "It's an aegisalt repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Aegisalt Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/cerulium.augment b/items/augments/sb_miningtool/cerulium.augment index 885135cb..6f94d55e 100644 --- a/items/augments/sb_miningtool/cerulium.augment +++ b/items/augments/sb_miningtool/cerulium.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_cerulium_repair", - "price" : 150, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 350, - "inventoryIcon" : "cerulium.png", - "description" : "It's a cerulium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Cerulium Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_cerulium_repair", + "price": 150, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 350, + "inventoryIcon": "cerulium.png", + "description": "It's a cerulium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Cerulium Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/copper.augment b/items/augments/sb_miningtool/copper.augment index fa2f8c66..c2ce8eaf 100644 --- a/items/augments/sb_miningtool/copper.augment +++ b/items/augments/sb_miningtool/copper.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_copper_repair", - "price" : 10, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 75, - "inventoryIcon" : "copper.png", - "description" : "It's a copper repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Copper Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_copper_repair", + "price": 10, + "tooltipKind": "sb_object", + "rarity": "Common", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 75, + "inventoryIcon": "copper.png", + "description": "It's a copper repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Copper Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/diamond.augment b/items/augments/sb_miningtool/diamond.augment index b53872ca..3c74b85b 100644 --- a/items/augments/sb_miningtool/diamond.augment +++ b/items/augments/sb_miningtool/diamond.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_diamond_repair", - "price" : 300, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 225, - "inventoryIcon" : "diamond.png", - "description" : "It's a diamond repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Diamond Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_diamond_repair", + "price": 300, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 225, + "inventoryIcon": "diamond.png", + "description": "It's a diamond repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Diamond Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/durasteel.augment b/items/augments/sb_miningtool/durasteel.augment index af904e21..a6358860 100644 --- a/items/augments/sb_miningtool/durasteel.augment +++ b/items/augments/sb_miningtool/durasteel.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_durasteel_repair", - "price" : 50, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 260, - "inventoryIcon" : "durasteel.png", - "description" : "It's a durasteel repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Durasteel Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_durasteel_repair", + "price": 50, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 260, + "inventoryIcon": "durasteel.png", + "description": "It's a durasteel repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Durasteel Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/ferozium.augment b/items/augments/sb_miningtool/ferozium.augment index e083afcb..71760588 100644 --- a/items/augments/sb_miningtool/ferozium.augment +++ b/items/augments/sb_miningtool/ferozium.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_ferozium_repair", - "price" : 60, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 280, - "inventoryIcon" : "ferozium.png", - "description" : "It's a ferozium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Ferozium Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_ferozium_repair", + "price": 60, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 280, + "inventoryIcon": "ferozium.png", + "description": "It's a ferozium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Ferozium Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/gold.augment b/items/augments/sb_miningtool/gold.augment index b9e1753d..2c0b3187 100644 --- a/items/augments/sb_miningtool/gold.augment +++ b/items/augments/sb_miningtool/gold.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_gold_repair", - "price" : 20, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 150, - "inventoryIcon" : "gold.png", - "description" : "It's a gold repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Gold Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_gold_repair", + "price": 20, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 150, + "inventoryIcon": "gold.png", + "description": "It's a gold repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Gold Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/iron.augment b/items/augments/sb_miningtool/iron.augment index c2c45e8d..e3f4ad0f 100644 --- a/items/augments/sb_miningtool/iron.augment +++ b/items/augments/sb_miningtool/iron.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_iron_repair", - "price" : 20, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 90, - "inventoryIcon" : "iron.png", - "description" : "It's an iron repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Iron Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_iron_repair", + "price": 20, + "tooltipKind": "sb_object", + "rarity": "Common", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 90, + "inventoryIcon": "iron.png", + "description": "It's an iron repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Iron Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/peacekeeper.augment b/items/augments/sb_miningtool/peacekeeper.augment index e41247a3..f7bdde4e 100644 --- a/items/augments/sb_miningtool/peacekeeper.augment +++ b/items/augments/sb_miningtool/peacekeeper.augment @@ -1,14 +1,16 @@ { - "itemName" : "sb_peacekeeper_repair", - "price" : 60, - "tooltipKind" : "sb_object4b", - "rarity" : "uncommon", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : -375, - "sb_repairType" : 1, - "inventoryIcon" : "peacekeeper.png", - "description" : "This battery can be used to recharge Peacekeeper devices.\n^gray;Select battery and right-click mining laser.", - "shortdescription" : "Peacekeeper Battery", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_peacekeeper_repair", + "price": 60, + "tooltipKind": "sb_object4b", + "rarity": "uncommon", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": -375, + "sb_repairType": "sb_battery-", + "inventoryIcon": "peacekeeper.png", + "description": "This battery can be used to recharge Peacekeeper devices.\n^gray;Select battery and right-click mining laser", + "shortdescription": "Peacekeeper Battery", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/platinum.augment b/items/augments/sb_miningtool/platinum.augment index beb1a8ea..67dbe48a 100644 --- a/items/augments/sb_miningtool/platinum.augment +++ b/items/augments/sb_miningtool/platinum.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_platinum_repair", - "price" : 50, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 200, - "inventoryIcon" : "platinum.png", - "description" : "It's a platinum repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Platinum Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_platinum_repair", + "price": 50, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 200, + "inventoryIcon": "platinum.png", + "description": "It's a platinum repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Platinum Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/rubium.augment b/items/augments/sb_miningtool/rubium.augment index f454098a..a3e44324 100644 --- a/items/augments/sb_miningtool/rubium.augment +++ b/items/augments/sb_miningtool/rubium.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_rubium_repair", - "price" : 60, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 280, - "inventoryIcon" : "rubium.png", - "description" : "It's a rubium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Rubium Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_rubium_repair", + "price": 60, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 280, + "inventoryIcon": "rubium.png", + "description": "It's a rubium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Rubium Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/silver.augment b/items/augments/sb_miningtool/silver.augment index 3fe801aa..15017e16 100644 --- a/items/augments/sb_miningtool/silver.augment +++ b/items/augments/sb_miningtool/silver.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_silver_repair", - "price" : 15, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 110, - "inventoryIcon" : "silver.png", - "description" : "It's a silver repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Silver Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_silver_repair", + "price": 15, + "tooltipKind": "sb_object", + "rarity": "Common", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 110, + "inventoryIcon": "silver.png", + "description": "It's a silver repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Silver Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/solarium.augment b/items/augments/sb_miningtool/solarium.augment index 9330a106..4abe1310 100644 --- a/items/augments/sb_miningtool/solarium.augment +++ b/items/augments/sb_miningtool/solarium.augment @@ -1,14 +1,16 @@ { - "itemName" : "sb_solarium_repair", - "price" : 30, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 350, - "fuelAmount" : 8, - "inventoryIcon" : "solarium.png", - "description" : "It's a solarium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Solarium Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_solarium_repair", + "price": 30, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 350, + "fuelAmount": 8, + "inventoryIcon": "solarium.png", + "description": "It's a solarium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Solarium Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/titanium.augment b/items/augments/sb_miningtool/titanium.augment index 637a4113..cd74d42b 100644 --- a/items/augments/sb_miningtool/titanium.augment +++ b/items/augments/sb_miningtool/titanium.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_titanium_repair", - "price" : 40, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 240, - "inventoryIcon" : "titanium.png", - "description" : "It's a titanium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Titanium Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_titanium_repair", + "price": 40, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 240, + "inventoryIcon": "titanium.png", + "description": "It's a titanium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Titanium Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/tungsten.augment b/items/augments/sb_miningtool/tungsten.augment index 34cf117e..fe63a94c 100644 --- a/items/augments/sb_miningtool/tungsten.augment +++ b/items/augments/sb_miningtool/tungsten.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_tungsten_repair", - "price" : 30, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 180, - "inventoryIcon" : "tungsten.png", - "description" : "It's a tungsten repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Tungsten Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_tungsten_repair", + "price": 30, + "tooltipKind": "sb_object", + "rarity": "Common", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 180, + "inventoryIcon": "tungsten.png", + "description": "It's a tungsten repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Tungsten Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/violium.augment b/items/augments/sb_miningtool/violium.augment index e8de68fb..f38fa3b9 100644 --- a/items/augments/sb_miningtool/violium.augment +++ b/items/augments/sb_miningtool/violium.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_violium_repair", - "price" : 60, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 280, - "inventoryIcon" : "violium.png", - "description" : "It's a violium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Violium Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_violium_repair", + "price": 60, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 280, + "inventoryIcon": "violium.png", + "description": "It's a violium repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Violium Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_miningtool/wreck.augment b/items/augments/sb_miningtool/wreck.augment index 92102f6d..6fcc75d4 100644 --- a/items/augments/sb_miningtool/wreck.augment +++ b/items/augments/sb_miningtool/wreck.augment @@ -1,13 +1,15 @@ { - "itemName" : "sb_wreck_repair", - "price" : 10, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "category" : "Tool", - "tooltipFields" : {"subtitle":"Repair Tool"}, - "durabilityRegen" : 40, - "inventoryIcon" : "wreck.png", - "description" : "It's a salvaged repair tool.\n^gray;Select repair tool and right-click pickaxe or drill.", - "shortdescription" : "Salvaged Repair Tool", - "scripts" : ["/scripts/augments/sb_ore.lua"] -} \ No newline at end of file + "itemName": "sb_wreck_repair", + "price": 10, + "tooltipKind": "sb_object", + "rarity": "Common", + "category": "Tool", + "tooltipFields": { + "subtitle": "Repair Tool" + }, + "durabilityRegen": 40, + "inventoryIcon": "wreck.png", + "description": "It's a salvaged repair tool.\n^gray;Select repair tool and right-click pickaxe or drill", + "shortdescription": "Salvaged Repair Tool", + "scripts": ["/scripts/augments/sb_repair.lua"] +} diff --git a/items/augments/sb_misc/blankblueprint.augment b/items/augments/sb_misc/blankblueprint.augment index db408e3e..0b3ad6ac 100644 --- a/items/augments/sb_misc/blankblueprint.augment +++ b/items/augments/sb_misc/blankblueprint.augment @@ -1,12 +1,16 @@ { - "itemName" : "sb_blankblueprint", - "price" : 25, - "tooltipKind" : "sb_object4", - "rarity" : "uncommon", - "category" : "Blueprint", - "inventoryIcon" : "/items/generated/blueprintinhand.png", - "description" : "It's a blank blueprint. Use it to copy another blueprint.\n^gray;Select item and right-click blueprint.", - "shortdescription" : "Blank Blueprint", - "sb_copybookTypes" : ["blueprint","sb_copyblueprint","sb_blueprint"], - "scripts" : ["/scripts/augments/sb_copybook.lua"] -} \ No newline at end of file + "itemName": "sb_blankblueprint", + "price": 25, + "tooltipKind": "sb_object4", + "rarity": "uncommon", + "category": "Blueprint", + "inventoryIcon": "/items/generated/blueprintinhand.png", + "description": "It's a blank blueprint. Use it to copy another blueprint.\n^gray;Select item and right-click blueprint", + "shortdescription": "Blank Blueprint", + "sb_uncopyable": true, + "sb_copybookConditions": { + "categories": ["blueprint"], + "itemTags": ["blueprint"] + }, + "scripts": ["/scripts/augments/sb_copybook.lua"] +} diff --git a/items/augments/sb_misc/copybook.augment b/items/augments/sb_misc/copybook.augment index 5ad73d98..65f0135a 100644 --- a/items/augments/sb_misc/copybook.augment +++ b/items/augments/sb_misc/copybook.augment @@ -1,11 +1,16 @@ { - "itemName" : "sb_copybook", - "price" : 25, - "tooltipKind" : "sb_object4", - "rarity" : "Common", - "category" : "codex", - "inventoryIcon" : "copybook.png", - "description" : "It's a copybook. Use it to copy a book, codex, or blueprint.\n^gray;Select copybook and right-click document.", - "shortdescription" : "Copybook", - "scripts" : ["/scripts/augments/sb_copybook.lua"] -} \ No newline at end of file + "itemName": "sb_copybook", + "price": 25, + "tooltipKind": "sb_object4", + "rarity": "Common", + "category": "codex", + "inventoryIcon": "copybook.png", + "description": "It's a copybook. Use it to copy a book, codex, or blueprint.\n^gray;Select copybook and right-click document", + "shortdescription": "Copybook", + "sb_uncopyable": true, + "sb_copybookConditions": { + "categories": ["codex", "blueprint"], + "itemTags": ["sb_copybook", "blueprint"] + }, + "scripts": ["/scripts/augments/sb_copybook.lua"] +} diff --git a/items/augments/sb_misc/flashfreeze.augment b/items/augments/sb_misc/flashfreeze.augment new file mode 100644 index 00000000..78103454 --- /dev/null +++ b/items/augments/sb_misc/flashfreeze.augment @@ -0,0 +1,36 @@ +{ + "itemName": "sb_flashfreeze", + "price": 200, + "tooltipKind": "sb_object4b", + "rarity": "uncommon", + "category": "preparedFood", + "tooltipFields": { + "subtitle": "Other" + }, + "inventoryIcon": "flashfreeze.png", + "description": "Completely prevents food from rotting, but renders it unusable for cooking.\n^gray;Select preservatives and right-click item", + "shortdescription": "Flash Freeze Spray", + + "fade": "?fade=99e2f3;0.15", + "foodValueReduction": 0.8, + "applyParameters": { + "sb_preserved2": true + }, + "uniqueApplyParameters": {}, + "persistentParameters": [ + "shortdescription", + "blockingEffects", + "inventoryIcon", + "tooltipFields", + "description", + "tooltipKind", + "returnItem", + "foodValue", + "category", + "effects", + "rarity", + "price", + "emote" + ], + "scripts": ["/scripts/augments/sb_flashfreeze.lua"] +} diff --git a/items/augments/sb_misc/flashfreeze.png b/items/augments/sb_misc/flashfreeze.png new file mode 100644 index 00000000..9c87ea36 Binary files /dev/null and b/items/augments/sb_misc/flashfreeze.png differ diff --git a/items/augments/sb_misc/lids.png b/items/augments/sb_misc/lids.png index 2ceba04f..3eb05f22 100644 Binary files a/items/augments/sb_misc/lids.png and b/items/augments/sb_misc/lids.png differ diff --git a/items/augments/sb_misc/preservatives.augment b/items/augments/sb_misc/preservatives.augment index c1b8327e..bebb4f0b 100644 --- a/items/augments/sb_misc/preservatives.augment +++ b/items/augments/sb_misc/preservatives.augment @@ -8,37 +8,7 @@ "subtitle": "Other" }, "inventoryIcon": "preservatives.png", - "description": "Completely prevents food from rotting, but renders it unusable for cooking.\n^gray;Select preservatives and right-click item", + "description": "Effectively freshens food when applied, resetting the time before it rots.\n^gray;Select preservatives and right-click item", "shortdescription": "Preservatives", - "radioMessagesOnPickup": ["sb_pickuppreservatives"], - - "fade": "?fade=f9ed88;0.1", - "foodValueReduction": 0.8, - "applyParameters": { - "tooltipFields": { - "subtitle": "Preserved Food" - }, - "sb_preserved2": true - }, - "drinkApplyParameters": { - "tooltipFields": { - "subtitle": "Preserved Drink" - } - }, - "persistentParameters": [ - "shortdescription", - "blockingEffects", - "inventoryIcon", - "tooltipFields", - "description", - "tooltipKind", - "returnItem", - "foodValue", - "category", - "effects", - "rarity", - "price", - "emote" - ], "scripts": ["/scripts/augments/sb_preservatives.lua"] } diff --git a/items/augments/sb_misc/wrappingpaper.augment b/items/augments/sb_misc/wrappingpaper.augment index e971c550..b5d96546 100644 --- a/items/augments/sb_misc/wrappingpaper.augment +++ b/items/augments/sb_misc/wrappingpaper.augment @@ -1,11 +1,18 @@ { - "itemName" : "sb_wrappingpaper", - "price" : 10, - "tooltipKind" : "sb_object4b", - "rarity" : "Common", - "category" : "other", - "inventoryIcon" : [{"image":"wrappingpaper.png"},{"position":[6,0],"image":"/items/generic/crafting/thread.png"}], - "description" : "It's an empty parcel. Use it to wrap an item, then dye the ribbon!\n^gray;Select parcel and right-click item.", - "shortdescription" : "Empty Parcel", - "scripts" : ["/scripts/augments/sb_wrappingpaper.lua"] -} \ No newline at end of file + "itemName": "sb_wrappingpaper", + "price": 10, + "tooltipKind": "sb_object4b", + "rarity": "Common", + "category": "other", + "inventoryIcon": [{ + "image": "wrappingpaper.png" + }, { + "position": [6, 0], + "image": "/items/generic/crafting/thread.png" + } + ], + "description": "It's an empty parcel. Use it to wrap an item, then dye the ribbon!\n^gray;Select parcel and right-click item", + "shortdescription": "Empty Parcel", + "scripts": ["/scripts/augments/sb_wrappingpaper.lua"] + //I'd like to make it randomly select a color, though wouldn't that be annoying for people wrapping unstackable items? Could we use the itemName as a seed? +} diff --git a/items/augments/sb_weaponupgrade/2.augment b/items/augments/sb_weaponupgrade/2.augment index ef1bec27..079a3f06 100644 --- a/items/augments/sb_weaponupgrade/2.augment +++ b/items/augments/sb_weaponupgrade/2.augment @@ -5,10 +5,10 @@ "rarity" : "legendary", "itemTags" : ["weapon","ranged","revolver","pistol","gun"], "category" : "pistol", - "tooltipFields" : {"subtitle":"Other"}, + "tooltipFields" : {"subtitle":"Weapon Upgrade Kit"}, "newLevel" : 2, "inventoryIcon" : "2.png", - "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 2!^reset;\n^gray;Select kit and right-click weapon.", + "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 2!^reset;\n^gray;Select kit and right-click weapon", "shortdescription" : "Novice Upgrade Kit", "scripts" : ["/scripts/augments/sb_upgrade.lua"] } \ No newline at end of file diff --git a/items/augments/sb_weaponupgrade/2.png b/items/augments/sb_weaponupgrade/2.png index cde542af..2a250c99 100644 Binary files a/items/augments/sb_weaponupgrade/2.png and b/items/augments/sb_weaponupgrade/2.png differ diff --git a/items/augments/sb_weaponupgrade/3.augment b/items/augments/sb_weaponupgrade/3.augment index f09848ca..b4e707fd 100644 --- a/items/augments/sb_weaponupgrade/3.augment +++ b/items/augments/sb_weaponupgrade/3.augment @@ -5,10 +5,10 @@ "rarity" : "legendary", "itemTags" : ["weapon","ranged","revolver","pistol","gun"], "category" : "pistol", - "tooltipFields" : {"subtitle":"Other"}, + "tooltipFields" : {"subtitle":"Weapon Upgrade Kit"}, "newLevel" : 3, "inventoryIcon" : "3.png", - "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 3!^reset;\n^gray;Select kit and right-click weapon.", + "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 3!^reset;\n^gray;Select kit and right-click weapon", "shortdescription" : "Advanced Upgrade Kit", "scripts" : ["/scripts/augments/sb_upgrade.lua"] } \ No newline at end of file diff --git a/items/augments/sb_weaponupgrade/4.augment b/items/augments/sb_weaponupgrade/4.augment index 17491a3c..4c7f33f2 100644 --- a/items/augments/sb_weaponupgrade/4.augment +++ b/items/augments/sb_weaponupgrade/4.augment @@ -5,10 +5,10 @@ "rarity" : "legendary", "itemTags" : ["weapon","ranged","revolver","pistol","gun"], "category" : "pistol", - "tooltipFields" : {"subtitle":"Other"}, + "tooltipFields" : {"subtitle":"Weapon Upgrade Kit"}, "newLevel" : 4, "inventoryIcon" : "4.png", - "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 4!^reset;\n^gray;Select kit and right-click weapon.", + "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 4!^reset;\n^gray;Select kit and right-click weapon", "shortdescription" : "Proficient Upgrade Kit", "scripts" : ["/scripts/augments/sb_upgrade.lua"] } \ No newline at end of file diff --git a/items/augments/sb_weaponupgrade/5.augment b/items/augments/sb_weaponupgrade/5.augment index 8881b08a..2bd50457 100644 --- a/items/augments/sb_weaponupgrade/5.augment +++ b/items/augments/sb_weaponupgrade/5.augment @@ -5,10 +5,10 @@ "rarity" : "legendary", "itemTags" : ["weapon","ranged","revolver","pistol","gun"], "category" : "pistol", - "tooltipFields" : {"subtitle":"Other"}, + "tooltipFields" : {"subtitle":"Weapon Upgrade Kit"}, "newLevel" : 5, "inventoryIcon" : "5.png", - "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 5!^reset;\n^gray;Select kit and right-click weapon.", + "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 5!^reset;\n^gray;Select kit and right-click weapon", "shortdescription" : "Expert Upgrade Kit", "scripts" : ["/scripts/augments/sb_upgrade.lua"] } \ No newline at end of file diff --git a/items/augments/sb_weaponupgrade/6.augment b/items/augments/sb_weaponupgrade/6.augment index a043684e..154c2a00 100644 --- a/items/augments/sb_weaponupgrade/6.augment +++ b/items/augments/sb_weaponupgrade/6.augment @@ -5,10 +5,10 @@ "rarity" : "legendary", "itemTags" : ["weapon","ranged","revolver","pistol","gun"], "category" : "pistol", - "tooltipFields" : {"subtitle":"Other"}, + "tooltipFields" : {"subtitle":"Weapon Upgrade Kit"}, "newLevel" : 6, "inventoryIcon" : "6.png", - "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 6!^reset;\n^gray;Select kit and right-click weapon.", + "description" : "A weapon upgrade kit. It can bring most weapons up to ^orange;level 6!^reset;\n^gray;Select kit and right-click weapon", "shortdescription" : "Masterful Upgrade Kit", "scripts" : ["/scripts/augments/sb_upgrade.lua"] } \ No newline at end of file diff --git a/items/augments/sb_weaponupgrade/6.png b/items/augments/sb_weaponupgrade/6.png index c33c0e4f..a964e4db 100644 Binary files a/items/augments/sb_weaponupgrade/6.png and b/items/augments/sb_weaponupgrade/6.png differ diff --git a/items/buildscripts/starbound/buildammo.lua b/items/buildscripts/starbound/buildammo.lua index 25e7afc7..bed07f30 100644 --- a/items/buildscripts/starbound/buildammo.lua +++ b/items/buildscripts/starbound/buildammo.lua @@ -6,6 +6,9 @@ function build(directory, config, parameters) table.insert(config.inventoryIcon, {image = sb_assetmissing("/interface/sb_tooltips/"..parameters.projectileType..".png", "/interface/sb_tooltips/assetmissing.png")}) if root.assetJson("/items/defaultParameters.config:defaultMaxStack") < 9999 then config.maxStack = 9999 end config = sb.jsonMerge(config,getDescriptor(parameters.projectileType)) + if parameters.level then + parameters.level = nil + end return config, parameters end diff --git a/items/buildscripts/starbound/buildarmor.lua b/items/buildscripts/starbound/buildarmor.lua index 7bfc5910..4b3542ca 100644 --- a/items/buildscripts/starbound/buildarmor.lua +++ b/items/buildscripts/starbound/buildarmor.lua @@ -1,4 +1,3 @@ -require "/scripts/util.lua" require "/items/buildscripts/starbound/definition.lua" function build(directory, config, parameters) diff --git a/items/buildscripts/starbound/buildfood.lua b/items/buildscripts/starbound/buildfood.lua index 7b3e4693..d944173d 100644 --- a/items/buildscripts/starbound/buildfood.lua +++ b/items/buildscripts/starbound/buildfood.lua @@ -1,7 +1,7 @@ function build(directory, config, parameters) + config.effects = parameters.effects or config.effects --fix for IFD only checking config for status effects require("/items/buildscripts/buildfood.lua") config, parameters = build(directory, config, parameters) - local foodTooltip = root.assetJson("/interface/tooltips/food.tooltip") local fields = config.tooltipFields or {} if foodTooltip.effectLabel then --check for IFD @@ -13,12 +13,16 @@ function build(directory, config, parameters) else local foodValue = parameters.foodValue or config.foodValue if foodValue then - local untrailingValue = string.format("%.0f",foodValue,0) - fields.foodValueLabel = "Food: "..untrailingValue - fields.foodAmountLabel = "Food: "..untrailingValue + fields.foodValueLabel = "Food: "..foodValue + fields.foodAmountLabel = "Food: "..foodValue end end + local subtitle = parameters.subtitle or config.subtitle + if subtitle then + local subtitles = root.assetJson("/items/categories.config:labels") + fields.subtitle = subtitles[subtitle] or subtitles["other"] + end parameters.tooltipFields = fields if not config.itemAgingScripts then diff --git a/items/buildscripts/starbound/buildfood2.lua b/items/buildscripts/starbound/buildfood2.lua deleted file mode 100644 index 8d2fa133..00000000 --- a/items/buildscripts/starbound/buildfood2.lua +++ /dev/null @@ -1,8 +0,0 @@ -function build(directory, config, parameters) - build = nil - require("/items/buildscripts/buildfood.lua") - config, parameters = build(directory, config, parameters) - config.tooltipFields = config.tooltipFields or {} - config.tooltipFields["rotTimeLabel"] = "" - return config, parameters -end \ No newline at end of file diff --git a/items/buildscripts/starbound/buildpaint.lua b/items/buildscripts/starbound/buildpaint.lua index 116ab836..c6fcb17d 100644 --- a/items/buildscripts/starbound/buildpaint.lua +++ b/items/buildscripts/starbound/buildpaint.lua @@ -31,4 +31,7 @@ function build(directory, config, parameters) return config, parameters end -function cropImage(a) if root.imageSize(a)[1]==16 and root.imageSize(a)[2]==16 then return a.."?crop=;4;4;12;16" else return a end end \ No newline at end of file +function cropImage(a) + local imageSize = root.imageSize(a) + if imageSize[1]==16 and imageSize[2]==16 then return a.."?crop=;4;4;12;16" else return a end +end \ No newline at end of file diff --git a/items/buildscripts/starbound/buildthrowable.lua b/items/buildscripts/starbound/buildthrowable.lua new file mode 100644 index 00000000..1d57534b --- /dev/null +++ b/items/buildscripts/starbound/buildthrowable.lua @@ -0,0 +1,18 @@ +function build(directory, config, parameters, level, seed) + local configParameter = function(keyName, defaultValue) return parameters[keyName] or config[keyName] or defaultValue end + build = nil + if config.sb_builder then + require(config.sb_builder) + config, parameters = build(directory, config, parameters, level, seed) + end + config.tooltipFields = config.tooltipFields or {} + local level = string.format("%.0f",configParameter("level", 1)) + if string.find((config.tooltipKind or "base"), "sb_") then + config.tooltipFields.levelLabel = "^shadow;Lvl "..level + config.tooltipFields.level2Label = "Lvl "..level + else + config.tooltipFields.sb_levelLabel = "^shadow;Lvl "..level + config.tooltipFields.sb_level2Label = "Lvl "..level + end + return config, parameters +end \ No newline at end of file diff --git a/items/buildscripts/starbound/merge.lua b/items/buildscripts/starbound/merge.lua new file mode 100644 index 00000000..e9ca0130 --- /dev/null +++ b/items/buildscripts/starbound/merge.lua @@ -0,0 +1,10 @@ +function build(directory, config, parameters, level, seed) + local configParameter = function(keyName, defaultValue) return parameters[keyName] or config[keyName] or defaultValue end + build = nil + if config.sb_builder then + require(config.sb_builder) + config, parameters = build(directory, config, parameters, level, seed) + end + config = util.mergeTable(config, configParameter("sb_merge", {})) + return config, parameters +end \ No newline at end of file diff --git a/items/buildscripts/starbound/randomdrop.lua b/items/buildscripts/starbound/randomdrop.lua index 7e50976a..5bdf4cfb 100644 --- a/items/buildscripts/starbound/randomdrop.lua +++ b/items/buildscripts/starbound/randomdrop.lua @@ -1,4 +1,4 @@ function build(_, config, parameters, level) - config.itemName = root.createTreasure(parameters.pool or config.pool, level or 0, math.random(1, 4294967295))[1].name + config.itemName = root.createTreasure(parameters.pool or config.pool, level or 0)[1].name return config, {} end \ No newline at end of file diff --git a/items/buildscripts/starbound/tech.config b/items/buildscripts/starbound/tech.config index adf0d13b..64ab955d 100644 --- a/items/buildscripts/starbound/tech.config +++ b/items/buildscripts/starbound/tech.config @@ -1,22 +1,29 @@ { -//Old prefix was gg - "gg_noprotectionTech":"sb_noprotection" -,"gg_breathprotectionTech":"sb_breathprotection", "sb_breathprotectionimplant":"sb_breathprotection" -,"gg_radiationprotectionTech":"sb_radiationprotection", "sb_radiationprotectionimplant":"sb_radiationprotection" -,"gg_coldprotectionTech":"sb_coldprotection", "sb_coldprotectionimplant":"sb_coldprotection" -,"gg_heatprotectionTech":"sb_heatprotection", "sb_heatprotectionimplant":"sb_heatprotection" -,"gg_dashimplantTech":"sb_speed", "sb_speedimplant":"sb_speed" -,"gg_jumpimplantTech":"sb_jump", "sb_jumpimplant":"sb_jump" -,"gg_glowimplantTech":"sb_glow", "sb_glowimplant":"sb_glow" -,"gg_gravityimplantTech":"sb_gravity", "sb_gravityimplant":"sb_gravity" - -,"sb_defupimplant":"sb_protection" -,"sb_energyimplant":"sb_energy" -,"sb_gritimplant":"sb_grit" -,"sb_healthimplant":"sb_health" -,"sb_mobilityimplant":"sb_mobility" -,"sb_sgenergyshieldimplant":"sb_sgenergyshield" -,"sb_regenerationimplant":"sb_regeneration" -,"sb_energyregenimplant":"sb_energyregen" -,"sb_shieldimplant":"sb_shield" -} \ No newline at end of file + //Old prefix was gg + "gg_noprotectionTech": "sb_noprotection", + "gg_breathprotectionTech": "sb_breathprotection", + "sb_breathprotectionimplant": "sb_breathprotection", + "gg_radiationprotectionTech": "sb_radiationprotection", + "sb_radiationprotectionimplant": "sb_radiationprotection", + "gg_coldprotectionTech": "sb_coldprotection", + "sb_coldprotectionimplant": "sb_coldprotection", + "gg_heatprotectionTech": "sb_heatprotection", + "sb_heatprotectionimplant": "sb_heatprotection", + "gg_dashimplantTech": "sb_speed", + "sb_speedimplant": "sb_speed", + "gg_jumpimplantTech": "sb_jump", + "sb_jumpimplant": "sb_jump", + "gg_glowimplantTech": "sb_glow", + "sb_glowimplant": "sb_glow", + "gg_gravityimplantTech": "sb_gravity", + "sb_gravityimplant": "sb_gravity", + "sb_defupimplant": "sb_protection", + "sb_energyimplant": "sb_energy", + "sb_gritimplant": "sb_grit", + "sb_healthimplant": "sb_health", + "sb_mobilityimplant": "sb_mobility", + "sb_sgenergyshieldimplant": "sb_sgenergyshield", + "sb_regenerationimplant": "sb_regeneration", + "sb_energyregenimplant": "sb_energyregen", + "sb_shieldimplant": "sb_shield" +} diff --git a/items/buildscripts/starbound/updatetech.lua b/items/buildscripts/starbound/updatetech.lua index 7178b11e..363b0857 100644 --- a/items/buildscripts/starbound/updatetech.lua +++ b/items/buildscripts/starbound/updatetech.lua @@ -10,8 +10,8 @@ function build(directory, config, parameters) if parameters.techModule then if parameters.inventoryIcon then if type(parameters.inventoryIcon) == "table" then - local newIcon = sb_assetmissing(root.hasTech(parameters.techModule) and root.techConfig(parameters.techModule).icon or missingImage, missingImage) - parameters.inventoryIcon[2].image = sb_assetmissing(parameters.inventoryIcon[2].image, newIcon) + local newIcon = sb_assetmissing(root.hasTech(parameters.techModule) and root.techConfig(parameters.techModule).icon or missingImage, missingImage) + parameters.inventoryIcon[2].image = sb_assetmissing(parameters.inventoryIcon[2].image, newIcon) end end end @@ -19,9 +19,9 @@ function build(directory, config, parameters) if parameters.techModules and parameters.tooltipFields then for i = 1, 2 do if parameters.tooltipFields then - local newIcon = sb_assetmissing(root.hasTech(parameters.techModules[i]) and root.techConfig(parameters.techModules[i]).icon or missingImage, missingImage) - local target = "object"..(i==1 and 'B' or 'C').."Image" - parameters.tooltipFields[target] = sb_assetmissing(parameters.tooltipFields[target], newIcon) + local newIcon = sb_assetmissing(root.hasTech(parameters.techModules[i]) and root.techConfig(parameters.techModules[i]).icon or missingImage, missingImage) + local target = "object"..(i==1 and 'B' or 'C').."Image" + parameters.tooltipFields[target] = sb_assetmissing(parameters.tooltipFields[target], newIcon) end end end diff --git a/items/buildscripts/weaponabilities.config.patch b/items/buildscripts/weaponabilities.config.patch index dc418891..dbdd25f3 100644 --- a/items/buildscripts/weaponabilities.config.patch +++ b/items/buildscripts/weaponabilities.config.patch @@ -11,5 +11,7 @@ [{"op":"add","path":"/sb_dagger","value":"/items/active/starbound/weapons/dagger.weaponability"}], [{"op":"add","path":"/sb_parry","value":"/items/active/starbound/weapons/parry.weaponability"}], [{"op":"add","path":"/sb_spear","value":"/items/active/starbound/weapons/spear.weaponability"}], -[{"op":"add","path":"/sb_bustershot","value":"/items/active/starbound/bows/bustershot.weaponability"}] +[{"op":"add","path":"/sb_bustershot","value":"/items/active/starbound/bows/bustershot.weaponability"}], +[{"op":"add","path":"/sb_miningtool","value":"/items/tools/miningtools/sb_miningtool.weaponability"}], +[{"op":"add","path":"/sb_drill","value":"/items/tools/miningtools/sb_drill.weaponability"}] ] \ No newline at end of file diff --git a/items/categories.config.patch b/items/categories.config.patch new file mode 100644 index 00000000..d362e35f --- /dev/null +++ b/items/categories.config.patch @@ -0,0 +1,10 @@ +[ + //NOTE: Betabound uses these as custom tooltipField subtitles, and uses *only vanilla categories* as the category! + //This means that the category shown to the player is different than the actual category used by Starbound to sort items in the inventory. + //So, you don't need to do anything for your custom inventory mod. + {"op":"add","path":"/labels/sb_preservedFood","value":"Preserved Food"}, + {"op":"add","path":"/labels/sb_preservedDrink","value":"Preserved Drink"}, + {"op":"add","path":"/labels/sb_preservedAlcohol","value":"Preserved Alcohol"}, + {"op":"add","path":"/labels/sb_preservedItem","value":"Preserved Item"}, + {"op":"add","path":"/labels/sb_alcohol","value":"Alcohol"} +] \ No newline at end of file diff --git a/items/currency/sb_goldcoin.currency b/items/currency/sb_goldcoin.currency index cc4f7a7a..f3495b88 100644 --- a/items/currency/sb_goldcoin.currency +++ b/items/currency/sb_goldcoin.currency @@ -1,18 +1,18 @@ { - "itemName" : "sb_goldcoin", - "price" : 10, - "value" : 10, - "tooltipKind" : "sb_object", - "rarity" : "common", - "category" : "currency", - "currency" : "money", - "pickupSoundsSmall" : ["/sfx/objects/coinstack_small1.ogg","/sfx/objects/coinstack_small2.ogg","/sfx/objects/coinstack_small3.ogg"], - "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.", - "shortdescription" : "Gold Coin", - "smallStackLimit" : 999, - "mediumStackLimit" : 4999, - "maxStack" : 16777216 -} \ No newline at end of file + "itemName": "sb_goldcoin", + "price": 10, + "value": 10, + "tooltipKind": "sb_object", + "rarity": "common", + "category": "currency", + "currency": "money", + "pickupSoundsSmall": ["/sfx/objects/coinstack_small1.ogg", "/sfx/objects/coinstack_small2.ogg", "/sfx/objects/coinstack_small3.ogg"], + "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.", + "shortdescription": "Gold Coin", + "smallStackLimit": 999, + "mediumStackLimit": 4999, + "maxStack": 16777216 +} diff --git a/items/currency/sb_goldcoin.png b/items/currency/sb_goldcoin.png index 44e79e08..decfe20f 100644 Binary files a/items/currency/sb_goldcoin.png and b/items/currency/sb_goldcoin.png differ diff --git a/items/fossils/humanoid/floranfossil1.item.patch b/items/fossils/humanoid/floaranfossil1.item.patch similarity index 100% rename from items/fossils/humanoid/floranfossil1.item.patch rename to items/fossils/humanoid/floaranfossil1.item.patch diff --git a/items/generic/celestial/sb_fuelefficiency1.activeitem b/items/generic/celestial/sb_fuelefficiency1.activeitem index a7f204b3..74847b22 100644 --- a/items/generic/celestial/sb_fuelefficiency1.activeitem +++ b/items/generic/celestial/sb_fuelefficiency1.activeitem @@ -1,14 +1,18 @@ { - "itemName" : "sb_fuelefficiency1", - "price" : 3750, - "rarity" : "legendary", - "tooltipFields" : {"subtitle" : "Ship Enhancement"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Fuel Carborator MK2^reset;", - "description" : "Increases fuel efficiency by 30%.\n^#f00;Usable once per ship.^reset;", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "inventoryIcon" : "sb_shipengine.png", - "scripts" : ["sb_shipupgrade.lua"], - "shipUpgrade" : {"fuelEfficiency":0.3} -} \ No newline at end of file + "itemName": "sb_fuelefficiency1", + "price": 3750, + "rarity": "legendary", + "tooltipFields": { + "subtitle": "Ship Enhancement" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Fuel Carborator MK2^reset;", + "description": "Increases fuel efficiency by 30%.\n^#f00;Usable once per ship.^reset;", + "category": "upgradeComponent", + "animation": "sb_shipupgrade.animation", + "inventoryIcon": "sb_shipengine.png", + "scripts": ["sb_shipupgrade.lua"], + "shipUpgrade": { + "fuelEfficiency": 0.3 + } +} diff --git a/items/generic/celestial/sb_maxfuel1.activeitem b/items/generic/celestial/sb_maxfuel1.activeitem index c41acaf5..ed3d5190 100644 --- a/items/generic/celestial/sb_maxfuel1.activeitem +++ b/items/generic/celestial/sb_maxfuel1.activeitem @@ -1,15 +1,19 @@ { - "itemName" : "sb_maxfuel1", - "price" : 3300, - "rarity" : "legendary", - "tooltipFields" : {"subtitle" : "Ship Enhancement"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Fuel Tank MK2^reset;", - "description" : "Increases fuel tank capacity by 400.\n^#f00;Usable once per ship.^reset;", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "learnBlueprintsOnPickup" : ["sb_maxfuel2"], - "inventoryIcon" : "sb_shipengine.png", - "scripts" : ["sb_shipupgrade.lua"], - "shipUpgrade" : {"maxFuel":400} -} \ No newline at end of file + "itemName": "sb_maxfuel1", + "price": 3300, + "rarity": "legendary", + "tooltipFields": { + "subtitle": "Ship Enhancement" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Fuel Tank MK2^reset;", + "description": "Increases fuel tank capacity by 400.\n^#f00;Usable once per ship.^reset;", + "category": "upgradeComponent", + "animation": "sb_shipupgrade.animation", + "learnBlueprintsOnPickup": ["sb_maxfuel2"], + "inventoryIcon": "sb_shipengine.png", + "scripts": ["sb_shipupgrade.lua"], + "shipUpgrade": { + "maxFuel": 400 + } +} diff --git a/items/generic/celestial/sb_maxfuel2.activeitem b/items/generic/celestial/sb_maxfuel2.activeitem index 68849781..0e998fed 100644 --- a/items/generic/celestial/sb_maxfuel2.activeitem +++ b/items/generic/celestial/sb_maxfuel2.activeitem @@ -1,15 +1,19 @@ { - "itemName" : "sb_maxfuel2", - "price" : 6400, - "rarity" : "legendary", - "tooltipFields" : {"subtitle" : "Ship Enhancement"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Fuel Tank MK3^reset;", - "description" : "Increases fuel tank capacity by 600.\n^#f00;Usable once per ship.^reset;", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "learnBlueprintsOnPickup" : ["sb_maxfuel3"], - "inventoryIcon" : "sb_shipengine.png", - "scripts" : ["sb_shipupgrade.lua"], - "shipUpgrade" : {"maxFuel":600} -} \ No newline at end of file + "itemName": "sb_maxfuel2", + "price": 6400, + "rarity": "legendary", + "tooltipFields": { + "subtitle": "Ship Enhancement" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Fuel Tank MK3^reset;", + "description": "Increases fuel tank capacity by 600.\n^#f00;Usable once per ship.^reset;", + "category": "upgradeComponent", + "animation": "sb_shipupgrade.animation", + "learnBlueprintsOnPickup": ["sb_maxfuel3"], + "inventoryIcon": "sb_shipengine.png", + "scripts": ["sb_shipupgrade.lua"], + "shipUpgrade": { + "maxFuel": 600 + } +} diff --git a/items/generic/celestial/sb_maxfuel3.activeitem b/items/generic/celestial/sb_maxfuel3.activeitem index 9c0135f0..596a1791 100644 --- a/items/generic/celestial/sb_maxfuel3.activeitem +++ b/items/generic/celestial/sb_maxfuel3.activeitem @@ -1,14 +1,18 @@ { - "itemName" : "sb_maxfuel3", - "price" : 6900, - "rarity" : "legendary", - "tooltipFields" : {"subtitle" : "Ship Enhancement"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Fuel Tank MK4^reset;", - "description" : "Increases fuel tank capacity by 1,000.\n^#f00;Usable once per ship.^reset;", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "inventoryIcon" : "sb_shipengine.png", - "scripts" : ["sb_shipupgrade.lua"], - "shipUpgrade" : {"maxFuel":1000} -} \ No newline at end of file + "itemName": "sb_maxfuel3", + "price": 6900, + "rarity": "legendary", + "tooltipFields": { + "subtitle": "Ship Enhancement" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Fuel Tank MK4^reset;", + "description": "Increases fuel tank capacity by 1,000.\n^#f00;Usable once per ship.^reset;", + "category": "upgradeComponent", + "animation": "sb_shipupgrade.animation", + "inventoryIcon": "sb_shipengine.png", + "scripts": ["sb_shipupgrade.lua"], + "shipUpgrade": { + "maxFuel": 1000 + } +} diff --git a/items/generic/celestial/sb_shipengine.png b/items/generic/celestial/sb_shipengine.png index ecb8d338..61cf3852 100644 Binary files a/items/generic/celestial/sb_shipengine.png and b/items/generic/celestial/sb_shipengine.png differ diff --git a/items/generic/celestial/sb_shipspeed1.activeitem b/items/generic/celestial/sb_shipspeed1.activeitem index 74d38d22..338ec24c 100644 --- a/items/generic/celestial/sb_shipspeed1.activeitem +++ b/items/generic/celestial/sb_shipspeed1.activeitem @@ -1,15 +1,19 @@ { - "itemName" : "sb_shipspeed1", - "price" : 2000, - "rarity" : "legendary", - "tooltipFields" : {"subtitle" : "Ship Enhancement"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Thruster MK2^reset;", - "description" : "Increases thruster speed by 25%.\n^#f00;Usable once per ship.^reset;", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "learnBlueprintsOnPickup" : ["sb_shipspeed2"], - "inventoryIcon" : "sb_shipengine.png", - "scripts" : ["sb_shipupgrade.lua"], - "shipUpgrade" : {"shipSpeed":3.75} -} \ No newline at end of file + "itemName": "sb_shipspeed1", + "price": 2000, + "rarity": "legendary", + "tooltipFields": { + "subtitle": "Ship Enhancement" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Thruster MK2^reset;", + "description": "Increases thruster speed by 25%.\n^#f00;Usable once per ship.^reset;", + "category": "upgradeComponent", + "animation": "sb_shipupgrade.animation", + "learnBlueprintsOnPickup": ["sb_shipspeed2"], + "inventoryIcon": "sb_shipengine.png", + "scripts": ["sb_shipupgrade.lua"], + "shipUpgrade": { + "shipSpeed": 3.75 + } +} diff --git a/items/generic/celestial/sb_shipspeed2.activeitem b/items/generic/celestial/sb_shipspeed2.activeitem index fbf25deb..07276713 100644 --- a/items/generic/celestial/sb_shipspeed2.activeitem +++ b/items/generic/celestial/sb_shipspeed2.activeitem @@ -1,14 +1,18 @@ { - "itemName" : "sb_shipspeed2", - "price" : 4000, - "rarity" : "legendary", - "tooltipFields" : {"subtitle" : "Ship Enhancement"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Thruster MK3^reset;", - "description" : "Increases thruster speed by 30%.\n^#f00;Usable once per ship.^reset;", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "inventoryIcon" : "sb_shipengine.png", - "scripts" : ["sb_shipupgrade.lua"], - "shipUpgrade" : {"shipSpeed":4.5} -} \ No newline at end of file + "itemName": "sb_shipspeed2", + "price": 4000, + "rarity": "legendary", + "tooltipFields": { + "subtitle": "Ship Enhancement" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Thruster MK3^reset;", + "description": "Increases thruster speed by 30%.\n^#f00;Usable once per ship.^reset;", + "category": "upgradeComponent", + "animation": "sb_shipupgrade.animation", + "inventoryIcon": "sb_shipengine.png", + "scripts": ["sb_shipupgrade.lua"], + "shipUpgrade": { + "shipSpeed": 4.5 + } +} diff --git a/items/generic/celestial/sb_shipupgrade.lua b/items/generic/celestial/sb_shipupgrade.lua index a15db495..8a181d37 100644 --- a/items/generic/celestial/sb_shipupgrade.lua +++ b/items/generic/celestial/sb_shipupgrade.lua @@ -8,8 +8,8 @@ function init() swingInit() sb_cursor("power") onlyOnce = config.getParameter("onlyOnce",true) end -function swingAction() animateSwing() - if hasUpgrade() and onlyOnce then sb_uiMessage(10) return end +function swingAction() + if hasUpgrade() and onlyOnce then sb_uiMessage("enhancementApplied") return end local upgrade, ship = config.getParameter("shipUpgrade",{}), player.shipUpgrades() if config.getParameter("additive",true) then for k, v in pairs(upgrade) do upgrade[k] = ship[k] + v end diff --git a/items/generic/celestial/sb_techupgrade1.activeitem b/items/generic/celestial/sb_techupgrade1.activeitem deleted file mode 100644 index 02b9926a..00000000 --- a/items/generic/celestial/sb_techupgrade1.activeitem +++ /dev/null @@ -1,17 +0,0 @@ -{ - "itemName" : "sb_techupgrade1", - "price" : 325, - "rarity" : "essential", - "tooltipFields" : {"rarityLabel" : "Critical", "subtitle" : "Tech Upgrade"}, - "tooltipKind" : "sb_object", - "shortdescription" : "^#ff0;Metalworking Upgrade^reset;", - "description" : "Unlocks the ability to create steel, an alloy made with iron at an ^orange;Industrial Furnace^reset;.", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "inventoryIcon" : "sb_techupgrade1.png", - "scripts" : ["sb_techupgrade.lua"], - "recipes" : ["sb_steelbar"], - "animationCustom" : { - "sounds" : {"success":["/sfx/interface/item_holster.ogg"]} - } -} \ No newline at end of file diff --git a/items/generic/celestial/sb_techupgrade2.activeitem b/items/generic/celestial/sb_techupgrade2.activeitem deleted file mode 100644 index e2f3511a..00000000 --- a/items/generic/celestial/sb_techupgrade2.activeitem +++ /dev/null @@ -1,17 +0,0 @@ -{ - "itemName" : "sb_techupgrade2", - "price" : 750, - "rarity" : "essential", - "tooltipFields" : {"rarityLabel" : "Critical", "subtitle" : "Tech Upgrade"}, - "tooltipKind" : "sb_object4", - "shortdescription" : "^#ff0;Compounding Upgrade^reset;", - "description" : "Unlocks the ability to create scintillium, cerulium, and impervium compounds at an ^orange;Atomic Furnace^reset;.", - "category" : "upgradeComponent", - "animation" : "sb_shipupgrade.animation", - "inventoryIcon" : "sb_techupgrade2.png", - "scripts" : ["sb_techupgrade.lua"], - "recipes" : ["sb_feroziumcompound","sb_ceruliumcompound","sb_imperviumcompound"], - "animationCustom" : { - "sounds" : {"success":["/sfx/interface/item_holster.ogg"]} - } -} \ No newline at end of file diff --git a/items/generic/crafting/alienweirdwood.png b/items/generic/crafting/alienweirdwood.png index e59d7ba1..3cb72943 100644 Binary files a/items/generic/crafting/alienweirdwood.png and b/items/generic/crafting/alienweirdwood.png differ diff --git a/items/generic/crafting/artificialbrain.png b/items/generic/crafting/artificialbrain.png index 49cb64f3..abe3709f 100644 Binary files a/items/generic/crafting/artificialbrain.png and b/items/generic/crafting/artificialbrain.png differ diff --git a/items/generic/crafting/bottle.item.patch b/items/generic/crafting/bottle.item.patch index bc8535ce..c5a7f8eb 100644 --- a/items/generic/crafting/bottle.item.patch +++ b/items/generic/crafting/bottle.item.patch @@ -1 +1,5 @@ -[[{"op":"add","path":"/sb_plateHide","value":true}]] \ No newline at end of file +[ +[{"op":"add","path":"/sb_plateHide","value":true}, +{"op":"add","path":"/sb_plateImage","value":true}, +{"op":"add","path":"/sb_plateOffset","value":-0.125}] +] \ No newline at end of file diff --git a/items/generic/crafting/coalore.item.patch b/items/generic/crafting/coalore.item.patch index 86c61e2c..e32d615a 100644 --- a/items/generic/crafting/coalore.item.patch +++ b/items/generic/crafting/coalore.item.patch @@ -1,7 +1,5 @@ [[{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"test","path":"/fuelAmount","inverse":true},{"op":"add","path":"/fuelAmount","value":2}], -//[{"op":"test","path":"/tooltipFields","inverse":true},{"op":"add","path":"/tooltipFields","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_gunpowder"}, {"op":"replace","path":"/category","value":"fuel"}] -//,{"op":"add","path":"/tooltipFields","value":{"subtitle":"Ship Fuel"}}] ] \ No newline at end of file diff --git a/items/generic/crafting/lead.png b/items/generic/crafting/lead.png index d9a45c87..b1cc82ae 100644 Binary files a/items/generic/crafting/lead.png and b/items/generic/crafting/lead.png differ diff --git a/items/generic/crafting/moltencore.png b/items/generic/crafting/moltencore.png index 12dbee22..d24dfed7 100644 Binary files a/items/generic/crafting/moltencore.png and b/items/generic/crafting/moltencore.png differ diff --git a/items/generic/crafting/monsterdrops/scorchedcore.item.patch b/items/generic/crafting/monsterdrops/scorchedcore.item.patch index 7b9e384f..fb2ebf51 100644 --- a/items/generic/crafting/monsterdrops/scorchedcore.item.patch +++ b/items/generic/crafting/monsterdrops/scorchedcore.item.patch @@ -4,6 +4,5 @@ [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true}, {"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_firebow"}, -{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_groundfirebomb"}] +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_groundfirebomb"}] ] \ No newline at end of file diff --git a/items/generic/crafting/platinumbar.item.patch b/items/generic/crafting/platinumbar.item.patch index 2282db25..b95a424f 100644 --- a/items/generic/crafting/platinumbar.item.patch +++ b/items/generic/crafting/platinumbar.item.patch @@ -7,4 +7,4 @@ {"op":"add","path":"/itemTags/-","value":"reagent"}, {"op":"add","path":"/learnBlueprintsOnPickup/-","value":"platinumblock"}, {"op":"replace","path":"/rarity","value":"Uncommon"}], -[{"op":"test","path":"/description","value":"It's a platinum bar."},{"op":"replace","path":"/description","value":"Ore for platinum bars is primarily found on planets orbiting gentle stars."}]] \ No newline at end of file +[{"op":"test","path":"/description","value":"It's a platinum bar."},{"op":"replace","path":"/description","value":"Ore for platinum bars is found at great depths on most planets around all stars."}]] \ No newline at end of file diff --git a/items/generic/crafting/plutoniumore.png b/items/generic/crafting/plutoniumore.png new file mode 100644 index 00000000..a89505ab Binary files /dev/null and b/items/generic/crafting/plutoniumore.png differ diff --git a/items/generic/crafting/plutoniumrod.item.patch b/items/generic/crafting/plutoniumrod.item.patch index 68127dc8..6d8da2d2 100644 --- a/items/generic/crafting/plutoniumrod.item.patch +++ b/items/generic/crafting/plutoniumrod.item.patch @@ -1,4 +1,5 @@ -[[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[ +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], [{"op":"test","path":"/fuelAmount","inverse":true},{"op":"add","path":"/fuelAmount","value":0}], [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], diff --git a/items/generic/crafting/polymer.item.patch b/items/generic/crafting/polymer.item.patch index 085950f8..bed6d9b5 100644 --- a/items/generic/crafting/polymer.item.patch +++ b/items/generic/crafting/polymer.item.patch @@ -2,5 +2,6 @@ [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], [{"op":"test","path":"/price","value":0},{"op":"replace","path":"/price","value":90}], [{"op":"test","path":"/shortdescription","value":"Space Age Polymer"},{"op":"replace","path":"/shortdescription","value":"Polymer"}], +[{"op":"test","path":"/description","value":"It's some space age polymer."},{"op":"replace","path":"/description","value":"It's some space-age polymer."}], [{"op":"test","path":"/inventoryIcon","value":"polymer.png"},{"op":"replace","path":"/inventoryIcon","value":"sb_polymer.png"}] ] \ No newline at end of file diff --git a/items/generic/crafting/rainbowwood.png b/items/generic/crafting/rainbowwood.png index a9d98ce8..a6fa23ba 100644 Binary files a/items/generic/crafting/rainbowwood.png and b/items/generic/crafting/rainbowwood.png differ diff --git a/items/generic/crafting/reed.item.patch b/items/generic/crafting/reed.item.patch new file mode 100644 index 00000000..259e2346 --- /dev/null +++ b/items/generic/crafting/reed.item.patch @@ -0,0 +1,5 @@ +[[ +{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true}, +{"op":"add","path":"/learnBlueprintsOnPickup","value":[]} +], +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_throwingreed"}]] \ No newline at end of file diff --git a/items/generic/crafting/sb_ceruliumcompound.png b/items/generic/crafting/sb_ceruliumcompound.png index 40a1d263..d5baf94e 100644 Binary files a/items/generic/crafting/sb_ceruliumcompound.png and b/items/generic/crafting/sb_ceruliumcompound.png differ diff --git a/items/generic/crafting/sb_feroziumcompound.png b/items/generic/crafting/sb_feroziumcompound.png index 7669cd01..54f95a39 100644 Binary files a/items/generic/crafting/sb_feroziumcompound.png and b/items/generic/crafting/sb_feroziumcompound.png differ diff --git a/items/generic/crafting/sb_glowfibreblue.item b/items/generic/crafting/sb_glowfibreblue.item deleted file mode 100644 index 10554d3d..00000000 --- a/items/generic/crafting/sb_glowfibreblue.item +++ /dev/null @@ -1,11 +0,0 @@ -{ - "itemName" : "sb_glowfibreblue", - "rarity" : "Common", - "category" : "craftingMaterial", - "tooltipKind" : "sb_object", - "itemTags" : ["reagent"], - "inventoryIcon" : "sb_glowfibreblue.png", - "description" : "Bulbous, bioluminescent plant fibres. They glow greenish-blue!", - "shortdescription" : "Blue Glow Fibre", - "learnBlueprintsOnPickup" : ["glowfibre","glowvinelamp","glowstickblue"] -} \ No newline at end of file diff --git a/items/generic/crafting/sb_glowfibreblue.png b/items/generic/crafting/sb_glowfibreblue.png deleted file mode 100644 index c2d20f1d..00000000 Binary files a/items/generic/crafting/sb_glowfibreblue.png and /dev/null differ diff --git a/items/generic/crafting/sb_glowfibregreen.item b/items/generic/crafting/sb_glowfibregreen.item deleted file mode 100644 index ef9b49a4..00000000 --- a/items/generic/crafting/sb_glowfibregreen.item +++ /dev/null @@ -1,11 +0,0 @@ -{ - "itemName" : "sb_glowfibregreen", - "rarity" : "Common", - "category" : "craftingMaterial", - "tooltipKind" : "sb_object", - "itemTags" : ["reagent"], - "inventoryIcon" : "sb_glowfibregreen.png", - "description" : "Bioluminescent plant fibres. They glow a dazzling bright green!", - "shortdescription" : "Green Glow Fibre", - "learnBlueprintsOnPickup" : ["glowfibre","glowstickgreen","glowstickgreen"] -} \ No newline at end of file diff --git a/items/generic/crafting/sb_glowfibregreen.png b/items/generic/crafting/sb_glowfibregreen.png deleted file mode 100644 index 7c5f5f3e..00000000 Binary files a/items/generic/crafting/sb_glowfibregreen.png and /dev/null differ diff --git a/items/generic/crafting/sb_glowfibreorange.item b/items/generic/crafting/sb_glowfibreorange.item deleted file mode 100644 index b7271bc1..00000000 --- a/items/generic/crafting/sb_glowfibreorange.item +++ /dev/null @@ -1,11 +0,0 @@ -{ - "itemName" : "sb_glowfibreorange", - "rarity" : "Common", - "category" : "craftingMaterial", - "tooltipKind" : "sb_object", - "itemTags" : ["reagent"], - "inventoryIcon" : "sb_glowfibreorange.png", - "description" : "A handful of bioluminescent orange plant fibres.", - "shortdescription" : "Orange Glow Fibre", - "learnBlueprintsOnPickup" : ["glowfibre","glowbushlamp","glowstickorange"] -} \ No newline at end of file diff --git a/items/generic/crafting/sb_glowfibreorange.png b/items/generic/crafting/sb_glowfibreorange.png deleted file mode 100644 index 85f91442..00000000 Binary files a/items/generic/crafting/sb_glowfibreorange.png and /dev/null differ diff --git a/items/generic/crafting/sb_glowfibreyellow.item b/items/generic/crafting/sb_glowfibreyellow.item deleted file mode 100644 index ab591ed5..00000000 --- a/items/generic/crafting/sb_glowfibreyellow.item +++ /dev/null @@ -1,11 +0,0 @@ -{ - "itemName" : "sb_glowfibreyellow", - "rarity" : "Common", - "category" : "craftingMaterial", - "tooltipKind" : "sb_object", - "itemTags" : ["reagent"], - "inventoryIcon" : "sb_glowfibreyellow.png", - "description" : "Bulbous, bioluminescent plant fibres. They glow yellow!", - "shortdescription" : "Yellow Glow Fibre", - "learnBlueprintsOnPickup" : ["glowfibre","glowflowerlamp","glowstickyellow"] -} \ No newline at end of file diff --git a/items/generic/crafting/sb_glowfibreyellow.png b/items/generic/crafting/sb_glowfibreyellow.png deleted file mode 100644 index 75fb1b2b..00000000 Binary files a/items/generic/crafting/sb_glowfibreyellow.png and /dev/null differ diff --git a/items/generic/crafting/sb_gunpowder.png b/items/generic/crafting/sb_gunpowder.png index c383e85d..b54c947d 100644 Binary files a/items/generic/crafting/sb_gunpowder.png and b/items/generic/crafting/sb_gunpowder.png differ diff --git a/items/generic/crafting/sb_imperviumbar.png b/items/generic/crafting/sb_imperviumbar.png index 22a0e6c6..ba384aef 100644 Binary files a/items/generic/crafting/sb_imperviumbar.png and b/items/generic/crafting/sb_imperviumbar.png differ diff --git a/items/generic/crafting/sb_imperviumcompound.png b/items/generic/crafting/sb_imperviumcompound.png index 18c5b626..7f41a7c5 100644 Binary files a/items/generic/crafting/sb_imperviumcompound.png and b/items/generic/crafting/sb_imperviumcompound.png differ diff --git a/items/generic/crafting/sb_polymer.png b/items/generic/crafting/sb_polymer.png index f8c9f568..2cc7a669 100644 Binary files a/items/generic/crafting/sb_polymer.png and b/items/generic/crafting/sb_polymer.png differ diff --git a/items/generic/crafting/sb_refinedrubium.png b/items/generic/crafting/sb_refinedrubium.png index bcc7ed90..5c35e5b9 100644 Binary files a/items/generic/crafting/sb_refinedrubium.png and b/items/generic/crafting/sb_refinedrubium.png differ diff --git a/items/generic/crafting/sb_rubiumbar.png b/items/generic/crafting/sb_rubiumbar.png index 1c29dd3d..260318d6 100644 Binary files a/items/generic/crafting/sb_rubiumbar.png and b/items/generic/crafting/sb_rubiumbar.png differ diff --git a/items/generic/crafting/sb_steelbar.png b/items/generic/crafting/sb_steelbar.png index bd0d9e74..bdd5fd37 100644 Binary files a/items/generic/crafting/sb_steelbar.png and b/items/generic/crafting/sb_steelbar.png differ diff --git a/items/generic/crafting/sulphur.item.patch b/items/generic/crafting/sulphur.item.patch index e20f4c86..99f569ad 100644 --- a/items/generic/crafting/sulphur.item.patch +++ b/items/generic/crafting/sulphur.item.patch @@ -4,6 +4,5 @@ [{"op":"test","path":"/description","value":"Sulphur, a surprisingly useful compound."},{"op":"replace","path":"/description","value":"Sulphur, a surprisingly useful element."}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_preservatives"}, -{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_gunpowder"}] +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_gunpowder"}] ] \ No newline at end of file diff --git a/items/generic/crafting/thread.item.patch b/items/generic/crafting/thread.item.patch new file mode 100644 index 00000000..b16852da --- /dev/null +++ b/items/generic/crafting/thread.item.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], +[{"op":"test","path":"/price","value":35},{"op":"replace","path":"/price","value":70}] +] \ No newline at end of file diff --git a/items/generic/crafting/toxicwaste.item.patch b/items/generic/crafting/toxicwaste.item.patch new file mode 100644 index 00000000..2fe3de9e --- /dev/null +++ b/items/generic/crafting/toxicwaste.item.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"waste"}, +{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_toxicbarrel"}] +] \ No newline at end of file diff --git a/items/generic/food/sb_condiments/crystaljam.png b/items/generic/food/sb_condiments/crystaljam.png index 5030a132..a0bc298e 100644 Binary files a/items/generic/food/sb_condiments/crystaljam.png and b/items/generic/food/sb_condiments/crystaljam.png differ diff --git a/items/generic/food/sb_condiments/orangejam.png b/items/generic/food/sb_condiments/orangejam.png index 63a7a903..824fc54e 100644 Binary files a/items/generic/food/sb_condiments/orangejam.png and b/items/generic/food/sb_condiments/orangejam.png differ diff --git a/items/generic/food/sb_condiments/peanutbutterjar.consumable b/items/generic/food/sb_condiments/peanutbutterjar.consumable new file mode 100644 index 00000000..3284647b --- /dev/null +++ b/items/generic/food/sb_condiments/peanutbutterjar.consumable @@ -0,0 +1,25 @@ +{ + "itemName": "sb_peanutbutterjar", + "price": 125, + "foodValue": 20, + "tooltipKind": "sb_object", + "rarity": "common", + "sb_plateHide": true, + "inventoryIcon": "peanutbutterjar.png", + "category": "food", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 90 + },{ + "effect": "sb_protectionboost5", + "duration": 90 + }, + "sb_foodheal50" + ]], + "learnBlueprintsOnPickup": ["sb_peanutbutter"], + "description": "Now with actual butter. And peas. No nuts though.", + "shortdescription": "Peanut Butter", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_desserts/peanutbutterjar.png b/items/generic/food/sb_condiments/peanutbutterjar.png similarity index 100% rename from items/generic/food/sb_desserts/peanutbutterjar.png rename to items/generic/food/sb_condiments/peanutbutterjar.png diff --git a/items/generic/food/sb_condiments/thornjam.png b/items/generic/food/sb_condiments/thornjam.png index 7edb1379..9f257dd0 100644 Binary files a/items/generic/food/sb_condiments/thornjam.png and b/items/generic/food/sb_condiments/thornjam.png differ diff --git a/items/generic/food/sb_desserts/applepie.consumable b/items/generic/food/sb_desserts/applepie.consumable index 5a2fc3ef..6e140c35 100644 --- a/items/generic/food/sb_desserts/applepie.consumable +++ b/items/generic/food/sb_desserts/applepie.consumable @@ -1,19 +1,23 @@ { - "itemName" : "sb_applepie", - "rarity" : "Uncommon", - "inventoryIcon" : "applepie.png", - "category" : "preparedFood", - "description" : "Apple pie! It's as American as itself!", - "shortdescription" : "Apple Pie", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":105}, - {"effect":"sb_sugarrush","duration":105}, - "sb_foodheal120" - ]], - "price" : 300, - "foodValue" : 35, - "tooltipKind" : "sb_object", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_applepie", + "rarity": "rare", + "inventoryIcon": "applepie.png", + "category": "preparedFood", + "description": "Apple pie! It's as American as itself!", + "shortdescription": "Apple Pie", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 405 + }, { + "effect": "sb_energy", + "duration": 25 + }, + "sb_foodheal145" + ]], + "price": 320, + "foodValue": 45, + "tooltipKind": "sb_object", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/bananabread.consumable b/items/generic/food/sb_desserts/bananabread.consumable index ad988931..2ca41b20 100644 --- a/items/generic/food/sb_desserts/bananabread.consumable +++ b/items/generic/food/sb_desserts/bananabread.consumable @@ -1,20 +1,24 @@ { - "itemName" : "sb_bananabread", - "price" : 215, - "foodValue" : 25, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "bananabread.png", - "category" : "preparedFood", - "description" : "Moist, delicious banana bread.", - "shortdescription" : "Banana Bread", - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":113}, - {"effect":"sb_energyregen96","duration":113}, - "sb_foodheal70" - ]], - "sb_plateImage" : true, - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_bananabread", + "price": 215, + "foodValue": 25, + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "bananabread.png", + "category": "preparedFood", + "description": "Moist, delicious banana bread.", + "shortdescription": "Banana Bread", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 113 + }, { + "effect": "sb_energyregen96", + "duration": 113 + }, + "sb_foodheal70" + ]], + "sb_plateImage": true, + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/blackcurrentcrumble.consumable b/items/generic/food/sb_desserts/blackcurrentcrumble.consumable index 253b0882..fd015f36 100644 --- a/items/generic/food/sb_desserts/blackcurrentcrumble.consumable +++ b/items/generic/food/sb_desserts/blackcurrentcrumble.consumable @@ -1,21 +1,24 @@ { - "itemName" : "sb_blackcurrentcrumble", - "price" : 390, - "foodValue" : 45, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "sb_plateImage" : true, - "inventoryIcon" : "blackcurrentcrumble.png", - "category" : "preparedFood", - "description" : "A crumble that holds a charge.", - "shortdescription" : "Black Current Crumble", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":135}, - {"effect":"maxenergyscalingboostfood","duration":135}, - {"effect":"electrified","duration":135}, - "sb_foodheal145" - ]], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_blackcurrentcrumble", + "price": 390, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "sb_plateImage": true, + "inventoryIcon": "blackcurrentcrumble.png", + "category": "preparedFood", + "description": "A crumble that holds a charge.", + "shortdescription": "Black Current Crumble", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 203 + }, { + "effect": "electrified", + "duration": 203 + }, + "sb_foodheal145" + ]], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/blackcurrentcrumble.png b/items/generic/food/sb_desserts/blackcurrentcrumble.png index 7cb4cadf..b3e5b071 100644 Binary files a/items/generic/food/sb_desserts/blackcurrentcrumble.png and b/items/generic/food/sb_desserts/blackcurrentcrumble.png differ diff --git a/items/generic/food/sb_desserts/brineapple.consumable b/items/generic/food/sb_desserts/brineapple.consumable index 0542fb2d..109d2239 100644 --- a/items/generic/food/sb_desserts/brineapple.consumable +++ b/items/generic/food/sb_desserts/brineapple.consumable @@ -1,19 +1,23 @@ { - "itemName" : "sb_brineapple", - "price" : 540, - "foodValue" : 50, - "tooltipKind" : "sb_object4b", - "rarity" : "rare", - "category" : "preparedFood", - "inventoryIcon" : "brineapple.png", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":225}, - {"effect":"runboostfood","duration":225}, - "sb_foodheal170" - ]], - "description" : "Sweetened poisoncreep served inside a pineapple. Cooking it rendered the toxicity inert.", - "shortdescription" : "Poison-Down Cake", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_brineapple", + "price": 540, + "foodValue": 50, + "tooltipKind": "sb_object4b", + "rarity": "rare", + "category": "preparedFood", + "inventoryIcon": "brineapple.png", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 225 + }, { + "effect": "runboostfood", + "duration": 225 + }, + "sb_foodheal170" + ]], + "description": "Sweetened poisoncreep served inside a pineapple. Cooking it rendered the toxicity inert.", + "shortdescription": "Poison-Down Cake", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/brineapple.png b/items/generic/food/sb_desserts/brineapple.png index b5ddeaee..78ef569b 100644 Binary files a/items/generic/food/sb_desserts/brineapple.png and b/items/generic/food/sb_desserts/brineapple.png differ diff --git a/items/generic/food/sb_desserts/burningeyeballs.consumable b/items/generic/food/sb_desserts/burningeyeballs.consumable index c45f87d3..e66a2b25 100644 --- a/items/generic/food/sb_desserts/burningeyeballs.consumable +++ b/items/generic/food/sb_desserts/burningeyeballs.consumable @@ -1,22 +1,33 @@ { - "itemName" : "sb_burningeyeballs", - "price" : 425, - "foodValue" : 45, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "handPosition" : [-2.7, -2.6], - "category" : "preparedFood", - "inventoryIcon" : "burningeyeballs.png", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":203}, - {"effect":"nova","duration":203}, - {"effect":"burning","duration":10}, - {"effect":"weakpoison","duration":10}, - "sb_foodheal145" - ]], - "description" : "Indulge in the eerie gooey sweetness!", - "shortdescription" : "Melting Eyeballs", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 8 -} \ No newline at end of file + "itemName": "sb_burningeyeballs", + "price": 425, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "handPosition": [-2.7, -2.6], + "category": "preparedFood", + "inventoryIcon": "burningeyeballs.png", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 135 + }, { + "effect": "maxenergyscalingboostfood", + "duration": 135 + }, { + "effect": "nova", + "duration": 135 + }, { + "effect": "burning", + "duration": 5 + }, { + "effect": "weakpoison", + "duration": 5 + }, + "sb_foodheal145" + ]], + "description": "Indulge in the eerie gooey sweetness!", + "shortdescription": "Melting Eyeballs", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 8 +} diff --git a/items/generic/food/sb_desserts/burningeyeballs.png b/items/generic/food/sb_desserts/burningeyeballs.png index e4f967ca..9b7b96d7 100644 Binary files a/items/generic/food/sb_desserts/burningeyeballs.png and b/items/generic/food/sb_desserts/burningeyeballs.png differ diff --git a/items/generic/food/sb_desserts/butter.consumable b/items/generic/food/sb_desserts/butter.consumable index 030d34f5..bb458827 100644 --- a/items/generic/food/sb_desserts/butter.consumable +++ b/items/generic/food/sb_desserts/butter.consumable @@ -1,20 +1,16 @@ { - "itemName" : "sb_butter", - "price" : 190, - "foodValue" : 25, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "sb_plateImage" : true, - "inventoryIcon" : "butter.png", - "category" : "food", - "effects" : [[ - "sb_foodslow", - "sb_foodheal70" - ]], - "learnBlueprintsOnPickup" : ["sb_peanutbutterjar","sb_toast"], - "description" : "For making everything less healthy and more awesome.", - "shortdescription" : "Butter", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 8 -} \ No newline at end of file + "itemName": "sb_butter", + "price": 25, + "foodValue": 7.5, + "tooltipKind": "sb_object", + "rarity": "Common", + "sb_plateImage": true, + "inventoryIcon": "butter.png", + "category": "food", + "learnBlueprintsOnPickup": ["sb_peanutbutterjar", "sb_toast"], + "description": "For making everything less healthy and more awesome.", + "shortdescription": "Butter", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 8 +} diff --git a/items/generic/food/sb_desserts/butter.png b/items/generic/food/sb_desserts/butter.png index 6c4ccf88..917b0f83 100644 Binary files a/items/generic/food/sb_desserts/butter.png and b/items/generic/food/sb_desserts/butter.png differ diff --git a/items/generic/food/sb_desserts/cake.consumable b/items/generic/food/sb_desserts/cake.consumable index 57f75db3..29d38be1 100644 --- a/items/generic/food/sb_desserts/cake.consumable +++ b/items/generic/food/sb_desserts/cake.consumable @@ -1,22 +1,26 @@ { - "itemName" : "sb_cake", - "price" : 140, - "foodValue" : 25, - "tooltipKind" : "sb_object", - "rarity" : "common", - "itemTags" : ["sb_cake"], - "sb_plateImage" : true, - "category" : "preparedFood", - "inventoryIcon" : "cake.png", - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":225}, - {"effect":"sb_energy","duration":15}, - "sb_foodheal70" - ]], - "description" : "It's a delicious shortcake!", - "shortdescription" : "Shortcake", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4, - "learnBlueprintsOnPickup" : ["sb_carrotcake"] -} \ No newline at end of file + "itemName": "sb_cake", + "price": 140, + "foodValue": 25, + "tooltipKind": "sb_object", + "rarity": "common", + "itemTags": ["sb_cake"], + "sb_plateImage": true, + "category": "preparedFood", + "inventoryIcon": "cake.png", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 225 + }, { + "effect": "sb_energy", + "duration": 15 + }, + "sb_foodheal70" + ]], + "description": "It's a delicious shortcake!", + "shortdescription": "Shortcake", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4, + "learnBlueprintsOnPickup": ["sb_carrotcake"] +} diff --git a/items/generic/food/sb_desserts/cake.png b/items/generic/food/sb_desserts/cake.png index a7280f65..56be0fca 100644 Binary files a/items/generic/food/sb_desserts/cake.png and b/items/generic/food/sb_desserts/cake.png differ diff --git a/items/generic/food/sb_desserts/candiedpearlpeas.consumable b/items/generic/food/sb_desserts/candiedpearlpeas.consumable index 0e7077c6..bde8e9d2 100644 --- a/items/generic/food/sb_desserts/candiedpearlpeas.consumable +++ b/items/generic/food/sb_desserts/candiedpearlpeas.consumable @@ -1,18 +1,23 @@ { - "itemName" : "sb_candiedpearlpeas", - "price" : 235, - "foodValue" : 25, - "tooltipKind" : "sb_object4", - "rarity" : "Common", - "category" : "preparedFood", - "inventoryIcon" : "candiedpearlpeas.png", - "effects" : [[ - {"effect":"sb_protectionboost5","duration":226}, - "sb_foodheal70" - ]], - "description" : "Pearlpeas which are roasted in sugar and shoved on a stick.", - "shortdescription" : "Candied Pearlpeas", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_candiedpearlpeas", + "price": 235, + "foodValue": 25, + "tooltipKind": "sb_object4", + "rarity": "Common", + "category": "preparedFood", + "inventoryIcon": "candiedpearlpeas.png", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 123 + }, { + "effect": "sb_protectionboost5", + "duration": 123 + }, + "sb_foodheal70" + ]], + "description": "Pearlpeas which are roasted in sugar and shoved on a stick.", + "shortdescription": "Candied Pearlpeas", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/carrotcake.consumable b/items/generic/food/sb_desserts/carrotcake.consumable index 404683a3..20a652ba 100644 --- a/items/generic/food/sb_desserts/carrotcake.consumable +++ b/items/generic/food/sb_desserts/carrotcake.consumable @@ -1,22 +1,26 @@ { - "itemName" : "sb_carrotcake", - "price" : 195, - "foodValue" : 25, - "tooltipKind" : "sb_object4", - "rarity" : "common", - "itemTags" : ["sb_cake","sb_plate_flipx"], - "sb_plateWidth" : 2, - "handPosition" : [1.4, -1.85], - "category" : "preparedFood", - "inventoryIcon" : "carrotcake.png", - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":225}, - {"effect":"sb_energy","duration":15}, - "sb_foodheal70" - ]], - "description" : "It's a delicious carrot shortcake! Tastes better than it sounds.", - "shortdescription" : "Carrot Shortcake", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_carrotcake", + "price": 195, + "foodValue": 25, + "tooltipKind": "sb_object4", + "rarity": "common", + "itemTags": ["sb_cake", "sb_plate_flipx"], + "sb_plateWidth": 2, + "handPosition": [1.4, -1.85], + "category": "preparedFood", + "inventoryIcon": "carrotcake.png", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 225 + }, { + "effect": "sb_energy", + "duration": 15 + }, + "sb_foodheal70" + ]], + "description": "It's a delicious carrot shortcake! Tastes better than it sounds.", + "shortdescription": "Carrot Shortcake", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/carrotcake.png b/items/generic/food/sb_desserts/carrotcake.png index 160cc0b1..1b4e1bf4 100644 Binary files a/items/generic/food/sb_desserts/carrotcake.png and b/items/generic/food/sb_desserts/carrotcake.png differ diff --git a/items/generic/food/sb_desserts/chocolate.consumable b/items/generic/food/sb_desserts/chocolate.consumable index 7af19158..d8a97f42 100644 --- a/items/generic/food/sb_desserts/chocolate.consumable +++ b/items/generic/food/sb_desserts/chocolate.consumable @@ -1,19 +1,24 @@ { - "itemName" : "sb_chocolate", - "price" : 350, - "foodValue" : 40, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "inventoryIcon" : "chocolate.png", - "handPosition" : [1, -3], - "category" : "food", - "effects" : [[ - {"effect":"sb_sugarrush","duration":360}, - "sb_foodheal135" - ]], - "description" : "Sweet chocolate that melts in your mouth.", - "shortdescription" : "Milk Chocolate", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5 -} \ No newline at end of file + "itemName": "sb_chocolate", + "price": 350, + "foodValue": 40, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "inventoryIcon": "chocolate.png", + "handPosition": [1, -3], + "category": "food", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 180 + },{ + "effect": "runboostfood", + "duration": 180 + }, + "sb_foodheal135" + ]], + "description": "Sweet chocolate that melts in your mouth.", + "shortdescription": "Milk Chocolate", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5 +} diff --git a/items/generic/food/sb_desserts/chocolatecoffeebeans.consumable b/items/generic/food/sb_desserts/chocolatecoffeebeans.consumable index ec34ece9..93c909d0 100644 --- a/items/generic/food/sb_desserts/chocolatecoffeebeans.consumable +++ b/items/generic/food/sb_desserts/chocolatecoffeebeans.consumable @@ -1,20 +1,26 @@ { - "itemName" : "sb_chocolatecoffeebeans", - "price" : 300, - "foodValue" : 30, - "tooltipKind" : "sb_object4b", - "rarity" : "unCommon", - "inventoryIcon" : "chocolatecoffeebeans.png", - "category" : "preparedFood", - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":135}, - {"effect":"sb_energyregen96","duration":135}, - {"effect":"runboostfood","duration":135}, - "sb_foodheal95" - ]], - "description" : "Roasted coffee beans covered in chocolate. A fine mix of sweet and bitter flavours.", - "shortdescription" : "Chocolate Coffee Beans", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 8 -} \ No newline at end of file + "itemName": "sb_chocolatecoffeebeans", + "price": 300, + "foodValue": 30, + "tooltipKind": "sb_object4b", + "rarity": "unCommon", + "inventoryIcon": "chocolatecoffeebeans.png", + "category": "preparedFood", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 135 + }, { + "effect": "sb_energyregen96", + "duration": 135 + }, { + "effect": "runboostfood", + "duration": 135 + }, + "sb_foodheal95" + ]], + "description": "Roasted coffee beans covered in chocolate. A fine mix of sweet and bitter flavours.", + "shortdescription": "Chocolate Coffee Beans", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 8 +} diff --git a/items/generic/food/sb_desserts/copperkeypie.consumable b/items/generic/food/sb_desserts/copperkeypie.consumable index eaf22bf0..7b97cd1d 100644 --- a/items/generic/food/sb_desserts/copperkeypie.consumable +++ b/items/generic/food/sb_desserts/copperkeypie.consumable @@ -1,19 +1,26 @@ { - "itemName" : "sb_copperkeypie", - "price" : 400, - "foodValue" : 45, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "preparedFood", - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":203}, - {"effect":"electrified","duration":203}, - "sb_foodheal145" - ]], - "inventoryIcon" : "copperkeypie.png", - "description" : "A kiwi pie with a bit of a coppery kick.", - "shortdescription" : "Copper Key Pie", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_copperkeypie", + "price": 400, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "preparedFood", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 135 + }, { + "effect": "electrified", + "duration": 135 + }, { + "effect": "jumpboostfood", + "duration": 135 + }, + "sb_foodheal145" + ]], + "inventoryIcon": "copperkeypie.png", + "description": "A kiwi pie with a bit of a coppery kick.", + "shortdescription": "Copper Key Pie", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/crowncake.consumable b/items/generic/food/sb_desserts/crowncake.consumable index a690bb27..6699a12a 100644 --- a/items/generic/food/sb_desserts/crowncake.consumable +++ b/items/generic/food/sb_desserts/crowncake.consumable @@ -1,19 +1,24 @@ { - "itemName" : "sb_crowncake", - "price" : 595, - "foodValue" : 60, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "itemTags" : ["sb_cake"], - "category" : "preparedFood", - "inventoryIcon" : "crowncake.png", - "effects" : [[ - {"effect":"jumpboostfood","duration":540}, - "sb_foodheal215" - ]], - "description" : "Pineapple upside CROWN cake! Haha! Get it? Sigh...", - "shortdescription" : "Upside-Crown Cake", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_crowncake", + "price": 595, + "foodValue": 60, + "tooltipKind": "sb_object", + "rarity": "rare", + "itemTags": ["sb_cake"], + "category": "preparedFood", + "inventoryIcon": "crowncake.png", + "effects": [[{ + "effect": "runboostfood", + "duration": 270 + }, { + "effect": "jumpboostfood", + "duration": 270 + }, + "sb_foodheal215" + ]], + "description": "Pineapple upside CROWN cake! Haha! Get it? Sigh...", + "shortdescription": "Upside-Crown Cake", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/crystalcandy.consumable b/items/generic/food/sb_desserts/crystalcandy.consumable index f07a2a87..aed45376 100644 --- a/items/generic/food/sb_desserts/crystalcandy.consumable +++ b/items/generic/food/sb_desserts/crystalcandy.consumable @@ -1,19 +1,24 @@ { - "itemName" : "sb_crystalcandy", - "price" : 100, - "foodValue" : 10, - "effects" : [[ - {"effect":"glow","duration":90}, - "sb_foodheal25" - ]], - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "crystalcandy.png", - "category" : "preparedFood", - "description" : "Hard, large crystalline candy. Filling AND tasty!", - "shortdescription" : "Crystal Candy", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5, - "learnBlueprintsOnPickup" : ["sb_crystalchips"] -} \ No newline at end of file + "itemName": "sb_crystalcandy", + "price": 150, + "foodValue": 15, + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 68 + },{ + "effect": "glow", + "duration": 68 + }, + "sb_foodheal35" + ]], + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "crystalcandy.png", + "category": "preparedFood", + "description": "Hard, large crystalline candy. Filling AND tasty!", + "shortdescription": "Crystal Candy", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5, + "learnBlueprintsOnPickup": ["sb_crystalchips"] +} diff --git a/items/generic/food/sb_desserts/crystalpie.consumable b/items/generic/food/sb_desserts/crystalpie.consumable index c5203a73..0804a9e1 100644 --- a/items/generic/food/sb_desserts/crystalpie.consumable +++ b/items/generic/food/sb_desserts/crystalpie.consumable @@ -1,19 +1,24 @@ { - "itemName" : "sb_crystalpie", - "rarity" : "rare", - "price" : 450, - "category" : "preparedFood", - "inventoryIcon" : "crystalpie.png", - "description" : "Not actually a pie. It's a thick, soft layer of frosting over a hard, glowing brick of crystal bread.", - "shortdescription" : "Crystal Pie", - "effects" : [[ - {"effect":"glow","duration":450}, - "sb_foodheal170" - ]], - "foodValue" : 50, - "tooltipKind" : "food", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "maxStack" : 1, - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_crystalpie", + "rarity": "uncommon", + "price": 275, + "category": "preparedFood", + "inventoryIcon": "crystalpie.png", + "description": "Not actually a pie. It's a thick, soft layer of frosting over a hard, glowing brick of crystal bread.", + "shortdescription": "Crystal Pie", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 158 + },{ + "effect": "glow", + "duration": 158 + }, + "sb_foodheal120" + ]], + "foodValue": 35, + "tooltipKind": "food", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "maxStack": 1, + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/crystalpie.png b/items/generic/food/sb_desserts/crystalpie.png index 72906cf8..cbf57f40 100644 Binary files a/items/generic/food/sb_desserts/crystalpie.png and b/items/generic/food/sb_desserts/crystalpie.png differ diff --git a/items/generic/food/sb_desserts/crystaltart.png b/items/generic/food/sb_desserts/crystaltart.png index 5e4ec884..2d212ed6 100644 Binary files a/items/generic/food/sb_desserts/crystaltart.png and b/items/generic/food/sb_desserts/crystaltart.png differ diff --git a/items/generic/food/sb_desserts/icecream.png b/items/generic/food/sb_desserts/icecream.png index 447489af..052da67a 100644 Binary files a/items/generic/food/sb_desserts/icecream.png and b/items/generic/food/sb_desserts/icecream.png differ diff --git a/items/generic/food/sb_desserts/jelly.consumable b/items/generic/food/sb_desserts/jelly.consumable index 31374884..5aab5162 100644 --- a/items/generic/food/sb_desserts/jelly.consumable +++ b/items/generic/food/sb_desserts/jelly.consumable @@ -1,20 +1,29 @@ { - "itemName" : "sb_jelly", - "price" : 255, - "foodValue" : 30, - "rarity" : "rare",//rare due to rarity of an ingredient - "category" : "preparedFood", - "tooltipKind" : "sb_object", - "inventoryIcon" : "jelly.png", - "description" : "A slime-based dessert.", - "shortdescription" : "Jelly", - "effects" : [[ - {"effect":"jumpboostfood","duration":135}, - {"effect":"runboostfood","duration":135}, - {"effect":"bouncy","duration":35}, - "sb_foodheal95" - ]], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5 -} \ No newline at end of file + "itemName": "sb_jelly", + "price": 255, + "foodValue": 30, + "rarity": "rare", //rare due to rarity of an ingredient + "category": "preparedFood", + "tooltipKind": "sb_object", + "inventoryIcon": "jelly.png", + "description": "A slime-based dessert.", + "shortdescription": "Jelly", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 90 + }, { + "effect": "jumpboostfood", + "duration": 90 + }, { + "effect": "runboostfood", + "duration": 90 + }, { + "effect": "bouncy", + "duration": 30 + }, + "sb_foodheal95" + ]], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5 +} diff --git a/items/generic/food/sb_desserts/jelly.png b/items/generic/food/sb_desserts/jelly.png index e8176ea8..91294335 100644 Binary files a/items/generic/food/sb_desserts/jelly.png and b/items/generic/food/sb_desserts/jelly.png differ diff --git a/items/generic/food/sb_desserts/lollypop.consumable b/items/generic/food/sb_desserts/lollypop.consumable index 4de6896e..4b556d5f 100644 --- a/items/generic/food/sb_desserts/lollypop.consumable +++ b/items/generic/food/sb_desserts/lollypop.consumable @@ -1,19 +1,27 @@ { - "itemName" : "sb_lollypop", - "price" : 270, - "foodValue" : 30, - "tooltipKind" : "sb_object4", - "rarity" : "unCommon", - "inventoryIcon" : "lollypop.png", - "handPosition" : [1, -3], - "category" : "preparedFood", - "effects" : [[ - {"effect":"sb_sugarrush","duration":270}, - "sb_foodheal95" - ]], - "description" : "It's a lollypop! Or, for the uninitiated, a hunk of sugar on a stick.", - "shortdescription" : "Lollypop", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5 -} \ No newline at end of file + "itemName": "sb_lollypop", + "price": 325, + "foodValue": 35, + "tooltipKind": "sb_object4", + "rarity": "unCommon", + "inventoryIcon": "lollypop.png", + "handPosition": [-2.7, -2.6], + "category": "preparedFood", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 158 + }, { + "effect": "maxenergyscalingboostfood", + "duration": 158 + }, { + "effect": "sb_restoration", + "duration": 20 + }, + "sb_foodheal120" + ]], + "description": "It's a lollypop! Or, for the uninitiated, a hunk of sugar on a stick.", + "shortdescription": "Lollypop", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5 +} diff --git a/items/generic/food/sb_desserts/lollypop.png b/items/generic/food/sb_desserts/lollypop.png index 1cdd40d4..499f3ffe 100644 Binary files a/items/generic/food/sb_desserts/lollypop.png and b/items/generic/food/sb_desserts/lollypop.png differ diff --git a/items/generic/food/sb_desserts/orangepie.consumable b/items/generic/food/sb_desserts/orangepie.consumable index 66cb0591..375b4ca0 100644 --- a/items/generic/food/sb_desserts/orangepie.consumable +++ b/items/generic/food/sb_desserts/orangepie.consumable @@ -1,19 +1,23 @@ { - "itemName" : "sb_orangepie", - "rarity" : "Uncommon", - "price" : 120, - "category" : "preparedFood", - "inventoryIcon" : "orangepie.png", - "description" : "A pie! What kind is it? Is it an apple pie? No. It's an orange pie! A pie? What kind is it? Is it a banana pie? No-", - "shortdescription" : "Orange Pie", - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":315}, - {"effect":"sb_energy","duration":20}, - "sb_foodheal120" - ]], - "foodValue" : 35, - "tooltipKind" : "food", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_orangepie", + "rarity": "Uncommon", + "price": 120, + "category": "preparedFood", + "inventoryIcon": "orangepie.png", + "description": "A pie! What kind is it? Is it an apple pie? No. It's an orange pie! A pie? What kind is it? Is it a banana pie? No-", + "shortdescription": "Orange Pie", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 315 + }, { + "effect": "sb_health", + "duration": 20 + }, + "sb_foodheal120" + ]], + "foodValue": 35, + "tooltipKind": "food", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/orangetart.consumable b/items/generic/food/sb_desserts/orangetart.consumable index e108e50b..3aa34aa5 100644 --- a/items/generic/food/sb_desserts/orangetart.consumable +++ b/items/generic/food/sb_desserts/orangetart.consumable @@ -1,20 +1,26 @@ { - "itemName" : "sb_orangetart", - "rarity" : "unCommon", - "price" : 270, - "category" : "preparedFood", - "inventoryIcon" : "orangetart.png", - "description" : "An orange tart made from a tart orange jam.", - "shortdescription" : "Orange Tart", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":180}, - {"effect":"maxenergyscalingboostfood","duration":180}, - {"effect":"sb_restoration","duration":20}, - "sb_foodheal135" - ]], - "foodValue" : 40, - "tooltipKind" : "food", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 3 -} \ No newline at end of file + "itemName": "sb_orangetart", + "rarity": "unCommon", + "price": 270, + "category": "preparedFood", + "inventoryIcon": "orangetart.png", + "description": "An orange tart made from a tart orange jam.", + "shortdescription": "Orange Tart", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 180 + }, { + "effect": "maxenergyscalingboostfood", + "duration": 180 + }, { + "effect": "sb_restoration", + "duration": 20 + }, + "sb_foodheal135" + ]], + "foodValue": 40, + "tooltipKind": "food", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 3 +} diff --git a/items/generic/food/sb_desserts/peanutbutterjar.consumable b/items/generic/food/sb_desserts/peanutbutterjar.consumable deleted file mode 100644 index dcb22ac4..00000000 --- a/items/generic/food/sb_desserts/peanutbutterjar.consumable +++ /dev/null @@ -1,20 +0,0 @@ -{ - "itemName" : "sb_peanutbutterjar", - "price" : 335, - "foodValue" : 35, - "tooltipKind" : "sb_object", - "rarity" : "Uncommon", - "sb_plateHide" : true, - "inventoryIcon" : "peanutbutterjar.png", - "category" : "food", - "effects" : [[ - {"effect":"sb_protectionboost5","duration":315}, - "sb_foodheal120" - ]], - "learnBlueprintsOnPickup" : ["sb_peanutbutter"], - "description" : "Now with actual butter.", - "shortdescription" : "Peanut Butter", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file diff --git a/items/generic/food/sb_desserts/pussplumpie.consumable b/items/generic/food/sb_desserts/pussplumpie.consumable index ea592a6b..b629558f 100644 --- a/items/generic/food/sb_desserts/pussplumpie.consumable +++ b/items/generic/food/sb_desserts/pussplumpie.consumable @@ -1,19 +1,26 @@ { - "itemName" : "sb_pussplumpie", - "price" : 235, - "foodValue" : 40, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "inventoryIcon" : "pussplumpie.png", - "effects" : [[ - {"effect":"sb_sugarrush","duration":360}, - {"effect":"bouncy","duration":30}, - "sb_foodheal135" - ]], - "category" : "preparedFood", - "description" : "A slice of pussplum pie. The smell is a little off-putting.", - "shortdescription" : "Pussplum Pie", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_pussplumpie", + "price": 245, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "inventoryIcon": "pussplumpie.png", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 203 + }, { + "effect": "ragefood", + "duration": 203 + }, { + "effect": "bouncy", + "duration": 15 + }, + "sb_foodheal145" + ]], + "category": "preparedFood", + "description": "A slice of pussplum pie. The smell is a little off-putting.", + "shortdescription": "Pussplum Pie", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/pussplumpie.png b/items/generic/food/sb_desserts/pussplumpie.png index 98c6a7bd..837449e3 100644 Binary files a/items/generic/food/sb_desserts/pussplumpie.png and b/items/generic/food/sb_desserts/pussplumpie.png differ diff --git a/items/generic/food/sb_desserts/sweetmeat.consumable b/items/generic/food/sb_desserts/sweetmeat.consumable index 75aa28f7..760d2051 100644 --- a/items/generic/food/sb_desserts/sweetmeat.consumable +++ b/items/generic/food/sb_desserts/sweetmeat.consumable @@ -1,18 +1,26 @@ { - "itemName" : "sb_sweetmeat", - "price" : 500, - "foodValue" : 50, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "preparedFood", - "inventoryIcon" : "sweetmeat.png", - "effects" : [[ - {"effect":"sb_sugarrush","duration":450}, - "sb_foodheal170" - ]], - "description" : "A sweet dish inspired by the Florans-- toffee'd beacon.", - "shortdescription" : "Toffee Bacon", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2 -} \ No newline at end of file + "itemName": "sb_sweetmeat", + "price": 280, + "foodValue": 35, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "category": "preparedFood", + "inventoryIcon": "sweetmeat.png", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 158 + },{ + "effect": "maxenergyscalingboostfood", + "duration": 158 + },{ + "effect": "sb_restoration", + "duration": 20 + }, + "sb_foodheal120" + ]], + "description": "A sweet dish inspired by the Florans-- toffee'd beacon.", + "shortdescription": "Toffee Bacon", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_desserts/sweettime.consumable b/items/generic/food/sb_desserts/sweettime.consumable index e69c204f..1b2e06c8 100644 --- a/items/generic/food/sb_desserts/sweettime.consumable +++ b/items/generic/food/sb_desserts/sweettime.consumable @@ -1,19 +1,26 @@ { - "itemName" : "sb_sweettime", - "price" : 475, - "foodValue" : 50, - "tooltipKind" : "sb_object4", - "rarity" : "rare", - "effects" : [[ - {"effect":"sb_sugarrush","duration":225}, - {"effect":"electrified","duration":225}, - "sb_foodheal95" - ]], - "inventoryIcon" : "sweettime.png", - "category" : "preparedFood", - "description" : "A sweet oculemon tart topped with diodia shavings. It's... unconventional.", - "shortdescription" : "Sweet Time", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 4 -} \ No newline at end of file + "itemName": "sb_sweettime", + "price": 475, + "foodValue": 50, + "tooltipKind": "sb_object4", + "rarity": "rare", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 150 + }, { + "effect": "maxenergyscalingboostfood", + "duration": 150 + }, { + "effect": "electrified", + "duration": 150 + }, + "sb_foodheal95" + ]], + "inventoryIcon": "sweettime.png", + "category": "preparedFood", + "description": "A sweet oculemon tart topped with diodia shavings. It's... unconventional.", + "shortdescription": "Sweet Time", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 4 +} diff --git a/items/generic/food/sb_desserts/toffee.consumable b/items/generic/food/sb_desserts/toffee.consumable index 9cb9c94b..1ce5d753 100644 --- a/items/generic/food/sb_desserts/toffee.consumable +++ b/items/generic/food/sb_desserts/toffee.consumable @@ -1,19 +1,21 @@ { - "itemName" : "sb_toffee", - "price" : 375, - "foodValue" : 40, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "inventoryIcon" : "toffee.png", - "category" : "food", - "effects" : [[ - {"effect":"sb_sugarrush","duration":160}, - "sb_foodheal135" - ]], - "description" : "Toffee! A common ingredient in sweets.", - "learnBlueprintsOnPickup" : ["sb_toffeeapple","sb_sweetmeat"], - "shortdescription" : "Toffee", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5 -} \ No newline at end of file + "itemName": "sb_toffee", + "price": 200, + "foodValue": 25, + "tooltipKind": "sb_object", + "rarity": "common", + "inventoryIcon": "toffee.png", + "category": "food", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 225 + }, + "sb_foodheal70" + ]], + "description": "Toffee! A common ingredient in sweets.", + "learnBlueprintsOnPickup": ["sb_toffeeapple", "sb_sweetmeat"], + "shortdescription": "Toffee", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5 +} diff --git a/items/generic/food/sb_desserts/toffeeapple.consumable b/items/generic/food/sb_desserts/toffeeapple.consumable index bf1b7992..0d292652 100644 --- a/items/generic/food/sb_desserts/toffeeapple.consumable +++ b/items/generic/food/sb_desserts/toffeeapple.consumable @@ -1,19 +1,24 @@ { - "itemName" : "sb_toffeeapple", - "price" : 565, - "foodValue" : 50, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "handPosition" : [-2.7, -2.6], - "category" : "preparedFood", - "inventoryIcon" : "toffeeapple.png", - "effects" : [[ - {"effect":"sb_sugarrush","duration":450}, - "sb_foodheal170" - ]], - "description" : "An apple slathered in toffee.", - "shortdescription" : "Toffee Apple", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 3 -} \ No newline at end of file + "itemName": "sb_toffeeapple", + "price": 345, + "foodValue": 35, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "handPosition": [-2.7, -2.6], + "category": "preparedFood", + "inventoryIcon": "toffeeapple.png", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 315 + },{ + "effect": "sb_energy", + "duration": 20 + }, + "sb_foodheal120" + ]], + "description": "An apple slathered in toffee.", + "shortdescription": "Toffee Apple", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 3 +} diff --git a/items/generic/food/sb_desserts/toffeeapple.png b/items/generic/food/sb_desserts/toffeeapple.png index 06fcaa28..66d97261 100644 Binary files a/items/generic/food/sb_desserts/toffeeapple.png and b/items/generic/food/sb_desserts/toffeeapple.png differ diff --git a/items/generic/food/sb_drinks/batteryacid.consumable b/items/generic/food/sb_drinks/batteryacid.consumable index fcdab539..bde6e884 100644 --- a/items/generic/food/sb_drinks/batteryacid.consumable +++ b/items/generic/food/sb_drinks/batteryacid.consumable @@ -1,19 +1,23 @@ { - "itemName" : "sb_batteryacid", - "price" : 95, - "foodValue" : 10, - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":90}, - "weakpoison" - ]], - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "batteryacid.png", - "category" : "drink", - "description" : "Luckily, not actual battery acid!", - "shortdescription" : "Battery Acid", - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_batteryacid", + "price": 95, + "foodValue": 10, + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 45 + }, { + "effect": "electrified", + "duration": 45 + } + ]], + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "batteryacid.png", + "category": "drink", + "description": "Luckily, not actual battery acid!", + "shortdescription": "Battery Acid", + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/cordialbottle.consumable b/items/generic/food/sb_drinks/cordialbottle.consumable index cd188559..c4a42e0d 100644 --- a/items/generic/food/sb_drinks/cordialbottle.consumable +++ b/items/generic/food/sb_drinks/cordialbottle.consumable @@ -1,20 +1,32 @@ { - "itemName" : "sb_cordialbottle", - "price" : 440, - "foodValue" : 45, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "drink", - "effects" : [[ - {"effect":"ragefood","duration":405}, - "sb_foodheal145" - ]], - "inventoryIcon" : "cordialbottle.png", - "description" : "A bottle of smooth avesmingo cordial.", - "shortdescription" : "Avesmingo Cordial Bottle", - "handPosition" : [2, -3], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_cordialbottle", + "price": 440, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "drink", + "subtitle": "sb_alcohol", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 102 + },{ + "effect": "sb_energyregen192", + "duration": 102 + },{ + "effect": "runboostfood", + "duration": 102 + },{ + "effect": "ragefood", + "duration": 102 + }, + "sb_foodheal145" + ]], + "inventoryIcon": "cordialbottle.png", + "description": "A bottle of smooth avesmingo cordial.", + "shortdescription": "Avesmingo Cordial Bottle", + "handPosition": [2, -3], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/cordialglass.consumable b/items/generic/food/sb_drinks/cordialglass.consumable index 372f7667..010fc2a0 100644 --- a/items/generic/food/sb_drinks/cordialglass.consumable +++ b/items/generic/food/sb_drinks/cordialglass.consumable @@ -1,20 +1,29 @@ { - "itemName" : "sb_cordialglass", - "price" : 290, - "foodValue" : 30, - "effects" : [[ - {"effect":"ragefood","duration":270}, - "sb_foodheal95" - ]], - "tooltipKind" : "sb_object", - "rarity" : "unCommon", - "category" : "drink", - "inventoryIcon" : "cordialglass.png", - "description" : "A glass of smooth avesmingo cordial.", - "shortdescription" : "Avesmingo Cordial Glass", - "handPosition" : [0, -2.5], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_cordialglass", + "price": 290, + "foodValue": 30, + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 90 + },{ + "effect": "runboostfood", + "duration": 90 + },{ + "effect": "ragefood", + "duration": 90 + }, + "sb_foodheal95" + ]], + "tooltipKind": "sb_object", + "rarity": "unCommon", + "category": "drink", + "subtitle": "sb_alcohol", + "inventoryIcon": "cordialglass.png", + "description": "A glass of smooth avesmingo cordial.", + "shortdescription": "Avesmingo Cordial Glass", + "handPosition": [0, -2.5], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/dirtea.consumable b/items/generic/food/sb_drinks/dirtea.consumable index a1d310e5..1efc3e8f 100644 --- a/items/generic/food/sb_drinks/dirtea.consumable +++ b/items/generic/food/sb_drinks/dirtea.consumable @@ -1,19 +1,21 @@ { - "itemName" : "sb_dirtea", - "price" : 95, - "foodValue" : 10, - "effects" : [[ - {"effect":"ragefood","duration":90}, - "sb_foodheal25" - ]], - "tooltipKind" : "sb_object4", - "rarity" : "Common", - "category" : "drink", - "inventoryIcon" : "dirtea.png", - "description" : "Tea made by steeping dried dirturchin leaves in boiling water. A traditional drink.", - "shortdescription" : "Dirtea", - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 3 -} \ No newline at end of file + "itemName": "sb_dirtea", + "price": 95, + "foodValue": 10, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 90 + }, + "sb_foodheal25" + ]], + "tooltipKind": "sb_object4", + "rarity": "Common", + "category": "drink", + "inventoryIcon": "dirtea.png", + "description": "Tea made by steeping dried dirturchin leaves in boiling water. A traditional drink.", + "shortdescription": "Dirtea", + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 3 +} diff --git a/items/generic/food/sb_drinks/liquifiedcrystal.png b/items/generic/food/sb_drinks/liquifiedcrystal.png index c7808603..f11a5b15 100644 Binary files a/items/generic/food/sb_drinks/liquifiedcrystal.png and b/items/generic/food/sb_drinks/liquifiedcrystal.png differ diff --git a/items/generic/food/sb_drinks/meatjuice.consumable b/items/generic/food/sb_drinks/meatjuice.consumable index 8269a806..53e3dcf6 100644 --- a/items/generic/food/sb_drinks/meatjuice.consumable +++ b/items/generic/food/sb_drinks/meatjuice.consumable @@ -1,20 +1,25 @@ { - "itemName" : "sb_meatjuice", - "price" : 30, - "foodValue" : 20, - "effects" : [[ - {"effect":"ragefood","duration":180}, - "sb_foodheal50" - ]], - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "meatjuice.png", - "category" : "drink", - "description" : "A drink made of meat juices. Popular among Florans.", - "shortdescription" : "Meatjuice", - "handPosition" : [0, -2.5], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2.5 -} \ No newline at end of file + "itemName": "sb_meatjuice", + "price": 220, + "foodValue": 40, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 180 + },{ + "effect": "ragefood", + "duration": 180 + }, + "sb_foodheal135" + ]], + "tooltipKind": "sb_object", + "rarity": "Uncommon", + "inventoryIcon": "meatjuice.png", + "category": "drink", + "description": "A drink made of meat juices and boneboo. Popular among Florans.", + "shortdescription": "Meatjuice", + "handPosition": [0, -2.5], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2.5 +} diff --git a/items/generic/food/sb_drinks/meatwine.consumable b/items/generic/food/sb_drinks/meatwine.consumable index eefe131b..158e82e4 100644 --- a/items/generic/food/sb_drinks/meatwine.consumable +++ b/items/generic/food/sb_drinks/meatwine.consumable @@ -1,21 +1,29 @@ { - "itemName" : "sb_meatwine", - "price" : 475, - "foodValue" : 35, - "effects" : [[ - {"effect":"runboostfood","duration":158}, - {"effect":"ragefood","duration":158}, - "sb_foodheal120" - ]], - "tooltipKind" : "sb_object4", - "rarity" : "Uncommon", - "inventoryIcon" : "meatwine.png", - "category" : "drink", - "description" : "A drink made of fermented grapes and meat juices. Popular among Florans.", - "shortdescription" : "Meatwine", - "handPosition" : [1, -4], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 3 -} \ No newline at end of file + "itemName": "sb_meatwine", + "price": 360, + "foodValue": 55, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 165 + }, { + "effect": "runboostfood", + "duration": 165 + }, { + "effect": "ragefood", + "duration": 165 + }, + "sb_foodheal190" + ]], + "tooltipKind": "sb_object4", + "rarity": "Rare", + "inventoryIcon": "meatwine.png", + "category": "drink", + "subtitle": "sb_alcohol", + "description": "A drink made of fermented grapes and meat juices. Popular among Florans.", + "shortdescription": "Meatwine", + "handPosition": [1, -4], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 3 +} diff --git a/items/generic/food/sb_drinks/oculemonade.consumable b/items/generic/food/sb_drinks/oculemonade.consumable index 8cc03550..757a7134 100644 --- a/items/generic/food/sb_drinks/oculemonade.consumable +++ b/items/generic/food/sb_drinks/oculemonade.consumable @@ -1,22 +1,29 @@ { - "itemName" : "sb_oculemonade", - "price" : 200, - "foodValue" : 20, - "effects" : [[ - {"duration":180,"effect":"maxenergyscalingboostfood"}, - {"duration":10,"effect":"sb_energy"}, - "sb_foodheal50" - ]], - "tooltipKind" : "sb_object4", - "rarity" : "Common", - "category" : "drink", - "inventoryIcon" : "oculemonade.png", - "description" : "Nothing better on a hot day than a cool, refreshing glass of homemade Oculemonade.", - "shortdescription" : "Oculemonade Glass", - "emitters" : ["drinking"], - "handPosition" : [1, -3], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "learnBlueprintsOnPickup" : ["sb_weyene"], - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2 -} \ No newline at end of file + "itemName": "sb_oculemonade", + "price": 200, + "foodValue": 35, + "effects": [[{ + "duration": 158, + "effect": "maxhealthscalingboostfood" + }, { + "duration": 158, + "effect": "maxenergyscalingboostfood" + }, { + "duration": 20, + "effect": "sb_restoration" + }, + "sb_foodheal120" + ]], + "tooltipKind": "sb_object4", + "rarity": "Uncommon", + "category": "drink", + "inventoryIcon": "oculemonade.png", + "description": "Nothing better on a hot day than a cool, refreshing glass of homemade Oculemonade.", + "shortdescription": "Oculemonade Glass", + "emitters": ["drinking"], + "handPosition": [1, -3], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "learnBlueprintsOnPickup": ["sb_weyene"], + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_drinks/orangejuice.consumable b/items/generic/food/sb_drinks/orangejuice.consumable index cd1fd2a8..214cccfc 100644 --- a/items/generic/food/sb_drinks/orangejuice.consumable +++ b/items/generic/food/sb_drinks/orangejuice.consumable @@ -1,20 +1,24 @@ { - "itemName" : "sb_orangejuice", - "price" : 25, - "foodValue" : 15, - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":135}, - {"effect":"sb_health","duration":10}, - "sb_foodheal35" - ]], - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "orangejuice.png", - "category" : "drink", - "description" : "A carton full of sweet orange juice.", - "shortdescription" : "Orange Juice", - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2.5 -} \ No newline at end of file + "itemName": "sb_orangejuice", + "price": 25, + "foodValue": 15, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 135 + }, { + "effect": "sb_health", + "duration": 10 + }, + "sb_foodheal35" + ]], + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "orangejuice.png", + "category": "drink", + "description": "A carton full of sweet orange juice.", + "shortdescription": "Orange Juice", + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2.5 +} diff --git a/items/generic/food/sb_drinks/orangenergycan.consumable b/items/generic/food/sb_drinks/orangenergycan.consumable index 5a3e540d..ec40e938 100644 --- a/items/generic/food/sb_drinks/orangenergycan.consumable +++ b/items/generic/food/sb_drinks/orangenergycan.consumable @@ -1,19 +1,25 @@ { - "itemName" : "sb_orangenergycan", - "price" : 40, - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":90}, - {"effect":"runboostfood","duration":90}, - {"effect":"sb_health","duration":10} - ]], - "tooltipKind" : "food", - "rarity" : "Common", - "inventoryIcon" : "orangenergycan.png", - "sb_plateImage" : true, - "sb_plateHide" : true, - "category" : "drink", - "description" : "A healthy, revitalizing energy drink made from oranges.", - "shortdescription" : "Orangenergy Can", - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_orangenergycan", + "price": 40, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 90 + }, { + "effect": "runboostfood", + "duration": 90 + }, { + "effect": "sb_health", + "duration": 10 + } + ]], + "tooltipKind": "food", + "rarity": "Common", + "inventoryIcon": "orangenergycan.png", + "sb_plateImage": true, + "sb_plateHide": true, + "category": "drink", + "description": "A healthy, revitalizing energy drink made from oranges.", + "shortdescription": "Orangenergy Can", + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/food/sb_drinks/ricevinegar.consumable b/items/generic/food/sb_drinks/ricevinegar.consumable index 52ecd981..f5f18f63 100644 --- a/items/generic/food/sb_drinks/ricevinegar.consumable +++ b/items/generic/food/sb_drinks/ricevinegar.consumable @@ -1,18 +1,21 @@ { - "itemName" : "sb_ricevinegar", - "price" : 95, - "foodValue" : 15, - "effects" : [[ - "sb_foodheal35" - ]], - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "ricevinegar.png", - "category" : "drink", - "description" : "A traditional Hylotl drink with a very strong flavor.", - "shortdescription" : "Rice Vinegar", - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_ricevinegar", + "price": 95, + "foodValue": 15, + "effects": [[{ + "duration": 135, + "effect": "maxhealthscalingboostfood" + }, + "sb_foodheal35" + ]], + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "ricevinegar.png", + "category": "drink", + "description": "A traditional Hylotl drink with a very strong flavor.", + "shortdescription": "Rice Vinegar", + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/ricewine.consumable b/items/generic/food/sb_drinks/ricewine.consumable index 4155343c..4fa8de74 100644 --- a/items/generic/food/sb_drinks/ricewine.consumable +++ b/items/generic/food/sb_drinks/ricewine.consumable @@ -1,20 +1,26 @@ { - "itemName" : "sb_ricewine", - "rarity" : "Common", - "inventoryIcon" : "ricewine.png", - "foodValue" : 25, - "description" : "A traditional Hylotl drink with a very potent flavor.", - "shortdescription" : "Rice Wine", - "category" : "drink", - "price" : 180, - "tooltipKind" : "sb_object", - "effects" : [[ - {"effect":"ragefood","duration":225}, - "sb_foodheal70" - ]], - "emitters" : ["drinking"], - "handPosition" : [1, -3], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_ricewine", + "rarity": "Common", + "inventoryIcon": "ricewine.png", + "foodValue": 25, + "description": "A traditional Hylotl drink with a very potent flavor.", + "shortdescription": "Rice Wine", + "category": "drink", + "subtitle": "sb_alcohol", + "price": 180, + "tooltipKind": "sb_object", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 113 + },{ + "effect": "ragefood", + "duration": 113 + }, + "sb_foodheal70" + ]], + "emitters": ["drinking"], + "handPosition": [1, -3], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/rootpopbottle.consumable b/items/generic/food/sb_drinks/rootpopbottle.consumable index b8979a1b..60bfcedf 100644 --- a/items/generic/food/sb_drinks/rootpopbottle.consumable +++ b/items/generic/food/sb_drinks/rootpopbottle.consumable @@ -1,21 +1,25 @@ { - "itemName" : "sb_rootpopbottle", - "price" : 350, - "foodValue" : 30, - "effects" : [[ - {"duration":270,"effect":"maxhealthscalingboostfood"}, - {"duration":15,"effect":"sb_health"}, - "sb_foodheal95" - ]], - "tooltipKind" : "sb_object", - "rarity" : "unCommon", - "inventoryIcon" : "rootpopbottle.png", - "category" : "drink", - "description" : "A bottle of dandelion root pop.", - "shortdescription" : "Root Pop Bottle", - "handPosition" : [2, -2], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_rootpopbottle", + "price": 350, + "foodValue": 30, + "effects": [[{ + "duration": 270, + "effect": "maxenergyscalingboostfood" + }, { + "duration": 15, + "effect": "sb_energy" + }, + "sb_foodheal95" + ]], + "tooltipKind": "sb_object", + "rarity": "Uncommon", + "inventoryIcon": "rootpopbottle.png", + "category": "drink", + "description": "A bottle of dandelion root pop.", + "shortdescription": "Root Pop Bottle", + "handPosition": [2, -2], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/rootpopflask.consumable b/items/generic/food/sb_drinks/rootpopflask.consumable index 01ad9aa0..8d08f2f7 100644 --- a/items/generic/food/sb_drinks/rootpopflask.consumable +++ b/items/generic/food/sb_drinks/rootpopflask.consumable @@ -1,21 +1,25 @@ { - "itemName" : "sb_rootpopflask", - "price" : 140, - "foodValue" : 15, - "effects" : [[ - {"duration":135,"effect":"maxhealthscalingboostfood"}, - {"duration":10,"effect":"sb_health"}, - "sb_foodheal35" - ]], - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "rootpopflask.png", - "category" : "drink", - "description" : "A flask of dandelion root pop.", - "shortdescription" : "Root Pop Flask", - "emitters" : ["drinking"], - "handPosition" : [0, -2], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_rootpopflask", + "price": 140, + "foodValue": 15, + "effects": [[{ + "duration": 135, + "effect": "maxenergyscalingboostfood" + }, { + "duration": 10, + "effect": "sb_energy" + }, + "sb_foodheal35" + ]], + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "rootpopflask.png", + "category": "drink", + "description": "A flask of dandelion root pop.", + "shortdescription": "Root Pop Flask", + "emitters": ["drinking"], + "handPosition": [0, -2], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/wartjuice.consumable b/items/generic/food/sb_drinks/wartjuice.consumable index 56bb9471..250b0bdc 100644 --- a/items/generic/food/sb_drinks/wartjuice.consumable +++ b/items/generic/food/sb_drinks/wartjuice.consumable @@ -1,20 +1,22 @@ { - "itemName" : "sb_wartjuice", - "price" : 95, - "foodValue" : 10, - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":90}, - "sb_foodheal25" - ]], - "tooltipKind" : "sb_object", - "category" : "drink", - "rarity" : "common", - "inventoryIcon" : "wartjuice.png", - "description" : "Popular Avian punch of wartweed.", - "shortdescription" : "Wartjuice", - "emote" : "laugh", - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5 -} \ No newline at end of file + "itemName": "sb_wartjuice", + "price": 95, + "foodValue": 10, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 90 + }, + "sb_foodheal25" + ]], + "tooltipKind": "sb_object", + "category": "drink", + "rarity": "common", + "inventoryIcon": "wartjuice.png", + "description": "Popular Avian punch of wartweed.", + "shortdescription": "Wartjuice", + "emote": "laugh", + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5 +} diff --git a/items/generic/food/sb_drinks/wartwine.consumable b/items/generic/food/sb_drinks/wartwine.consumable index bc5744d3..943b82d5 100644 --- a/items/generic/food/sb_drinks/wartwine.consumable +++ b/items/generic/food/sb_drinks/wartwine.consumable @@ -1,22 +1,27 @@ { - "itemName" : "sb_wartwine", - "price" : 270, - "foodValue" : 25, - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":113}, - {"effect":"ragefood","duration":113}, - "sb_foodheal70" - ]], - "tooltipKind" : "sb_object4", - "category" : "drink", - "rarity" : "Uncommon",//rarity due to being an upgrade - "inventoryIcon" : "wartwine.png", - "description" : "Popular Avian wine of wartweed and fermented grapes.", - "shortdescription" : "Wartwine", - "emote" : "laugh", - "emitters" : ["drinking"], - "handPosition" : [0, -0.5], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_wartwine", + "price": 250, + "foodValue": 25, + "effects": [[{ + "effect": "runboostfood", + "duration": 113 + }, { + "effect": "ragefood", + "duration": 113 + }, + "sb_foodheal70" + ]], + "tooltipKind": "sb_object4", + "category": "drink", + "subtitle": "sb_alcohol", + "rarity": "common", + "inventoryIcon": "wartwine.png", + "description": "Popular Avian wine of wartweed and fermented grapes.", + "shortdescription": "Wartwine", + "emote": "laugh", + "emitters": ["drinking"], + "handPosition": [0, -0.5], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/weyene.consumable b/items/generic/food/sb_drinks/weyene.consumable index 7002722e..cb3613fd 100644 --- a/items/generic/food/sb_drinks/weyene.consumable +++ b/items/generic/food/sb_drinks/weyene.consumable @@ -1,21 +1,29 @@ { - "itemName" : "sb_weyene", - "price" : 400, - "foodValue" : 35, - "effects" : [[ - {"duration":158,"effect":"maxenergyscalingboostfood"}, - {"duration":158,"effect":"ragefood"}, - "sb_foodheal120" - ]], - "tooltipKind" : "sb_object4", - "rarity" : "Uncommon", - "category" : "drink", - "inventoryIcon" : "weyene.png", - "description" : "Weyene is thought to improve a hunter's eyesight! Superstition, of course.", - "shortdescription" : "Weyene", - "emitters" : ["drinking"], - "handPosition" : [1, -3], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_weyene", + "price": 400, + "foodValue": 35, + "effects": [[{ + "duration": 105, + "effect": "maxhealthscalingboostfood" + }, { + "duration": 105, + "effect": "runboostfood" + }, { + "duration": 105, + "effect": "ragefood" + }, + "sb_foodheal120" + ]], + "tooltipKind": "sb_object4", + "rarity": "Uncommon", + "category": "drink", + "subtitle": "sb_alcohol", + "inventoryIcon": "weyene.png", + "description": "Weyene is thought to improve a hunter's eyesight! Superstition, of course.", + "shortdescription": "Weyene", + "emitters": ["drinking"], + "handPosition": [1, -3], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/whiskeybottle.consumable b/items/generic/food/sb_drinks/whiskeybottle.consumable index 453eb16c..52b20525 100644 --- a/items/generic/food/sb_drinks/whiskeybottle.consumable +++ b/items/generic/food/sb_drinks/whiskeybottle.consumable @@ -1,21 +1,29 @@ { - "itemName" : "sb_whiskeybottle", - "rarity" : "uncommon", - "inventoryIcon" : "whiskeybottle.png", - "description" : "A strong bottle of whiskey.", - "shortdescription" : "Whiskey Bottle", - "price" : 220, - "category" : "drink", - "foodValue" : 40, - "tooltipKind" : "sb_object", - "effects" : [[ - {"effect":"ragefood","duration":360}, - {"effect":"sb_foodslow","duration":360}, - "sb_foodheal135" - ]], - "handPosition" : [2, -3], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_whiskeybottle", + "rarity": "uncommon", + "inventoryIcon": "whiskeybottle.png", + "description": "A strong bottle of whiskey.", + "shortdescription": "Whiskey Bottle", + "price": 220, + "category": "drink", + "subtitle": "sb_alcohol", + "foodValue": 40, + "tooltipKind": "sb_object", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 180 + }, { + "effect": "ragefood", + "duration": 180 + }, { + "effect": "sb_foodslow", + "duration": 30 + }, + "sb_foodheal135" + ]], + "handPosition": [2, -3], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/whiskeybottle.png b/items/generic/food/sb_drinks/whiskeybottle.png index b19f5c16..37e75557 100644 Binary files a/items/generic/food/sb_drinks/whiskeybottle.png and b/items/generic/food/sb_drinks/whiskeybottle.png differ diff --git a/items/generic/food/sb_drinks/whiskeyflask.consumable b/items/generic/food/sb_drinks/whiskeyflask.consumable index 994ba3b3..4d7bd684 100644 --- a/items/generic/food/sb_drinks/whiskeyflask.consumable +++ b/items/generic/food/sb_drinks/whiskeyflask.consumable @@ -1,21 +1,29 @@ { - "itemName" : "sb_whiskeyflask", - "price" : 160, - "foodValue" : 30, - "effects" : [[ - {"effect":"ragefood","duration":270}, - {"effect":"sb_foodslow","duration":270}, - "sb_foodheal95" - ]], - "tooltipKind" : "sb_object", - "rarity" : "unCommon", - "inventoryIcon" : "whiskeyflask.png", - "category" : "drink", - "description" : "A flask of whiskey.", - "shortdescription" : "Whiskey Flask", - "emitters" : ["drinking"], - "handPosition" : [0, -2], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_whiskeyflask", + "price": 160, + "foodValue": 30, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 135 + }, { + "effect": "ragefood", + "duration": 135 + }, { + "effect": "sb_foodslow", + "duration": 30 + }, + "sb_foodheal95" + ]], + "tooltipKind": "sb_object", + "rarity": "unCommon", + "inventoryIcon": "whiskeyflask.png", + "category": "drink", + "subtitle": "sb_alcohol", + "description": "A flask of whiskey.", + "shortdescription": "Whiskey Flask", + "emitters": ["drinking"], + "handPosition": [0, -2], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/whiskeyflask.png b/items/generic/food/sb_drinks/whiskeyflask.png index 4fc124f2..73d72efe 100644 Binary files a/items/generic/food/sb_drinks/whiskeyflask.png and b/items/generic/food/sb_drinks/whiskeyflask.png differ diff --git a/items/generic/food/sb_drinks/winebottle.consumable b/items/generic/food/sb_drinks/winebottle.consumable index d5c8dba6..163ab2b6 100644 --- a/items/generic/food/sb_drinks/winebottle.consumable +++ b/items/generic/food/sb_drinks/winebottle.consumable @@ -1,21 +1,32 @@ { - "itemName" : "sb_winebottle", - "price" : 600, - "foodValue" : 60, - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "drink", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":270}, - {"effect":"ragefood","duration":270}, - "sb_foodheal215" - ]], - "inventoryIcon" : "winebottle.png", - "description" : "A bottle of smooth red wine.", - "shortdescription" : "Wine Bottle", - "handPosition" : [2, -3], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_winebottle", + "price": 440, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "category": "drink", + "subtitle": "sb_alcohol", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 135 + }, { + "effect": "runboostfood", + "duration": 135 + }, { + "effect": "ragefood", + "duration": 135 + }, { + "effect": "bouncy", + "duration": 15 + }, + "sb_foodheal145" + ]], + "inventoryIcon": "winebottle.png", + "description": "A bottle of smooth red wine.", + "shortdescription": "Wine Bottle", + "handPosition": [2, -3], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_drinks/wineglass.consumable b/items/generic/food/sb_drinks/wineglass.consumable index da6f9dd2..b5f3b180 100644 --- a/items/generic/food/sb_drinks/wineglass.consumable +++ b/items/generic/food/sb_drinks/wineglass.consumable @@ -1,21 +1,29 @@ { - "itemName" : "sb_wineglass", - "price" : 440, - "foodValue" : 45, - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":203}, - {"effect":"ragefood","duration":203}, - "sb_foodheal145" - ]], - "tooltipKind" : "sb_object", - "rarity" : "rare", - "category" : "drink", - "inventoryIcon" : "wineglass.png", - "description" : "A glass of smooth red wine.", - "shortdescription" : "Wine Glass", - "handPosition" : [0, -2.5], - "emitters" : ["drinking"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_wineglass", + "price": 290, + "foodValue": 30, + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 90 + }, { + "effect": "runboostfood", + "duration": 90 + }, { + "effect": "ragefood", + "duration": 90 + }, + "sb_foodheal95" + ]], + "tooltipKind": "sb_object", + "rarity": "uncommon", + "category": "drink", + "subtitle": "sb_alcohol", + "inventoryIcon": "wineglass.png", + "description": "A glass of smooth red wine.", + "shortdescription": "Wine Glass", + "handPosition": [0, -2.5], + "emitters": ["drinking"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/food/sb_entrees/alienburger.consumable b/items/generic/food/sb_entrees/alienburger.consumable index f2f735e6..3a920024 100644 --- a/items/generic/food/sb_entrees/alienburger.consumable +++ b/items/generic/food/sb_entrees/alienburger.consumable @@ -1,19 +1,23 @@ { - "itemName" : "sb_alienburger", - "price" : 95, - "foodValue" : 30, - "tooltipKind" : "sb_object", - "rarity" : "Uncommon", - "category" : "preparedFood", - "inventoryIcon" : "alienburger.png", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":270}, - {"effect":"sb_health","duration":20}, - "sb_foodheal95" - ]], - "description" : "A burger made of green alien meat. Mm!", - "shortdescription" : "Alien Burger", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2 -} \ No newline at end of file + "itemName": "sb_alienburger", + "price": 95, + "foodValue": 30, + "tooltipKind": "sb_object", + "rarity": "Uncommon", + "category": "preparedFood", + "inventoryIcon": "alienburger.png", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 270 + }, { + "effect": "sb_health", + "duration": 20 + }, + "sb_foodheal95" + ]], + "description": "A burger made of green alien meat. Mmm!", + "shortdescription": "Alien Burger", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_entrees/alienburger.png b/items/generic/food/sb_entrees/alienburger.png index f85475fb..33049b2b 100644 Binary files a/items/generic/food/sb_entrees/alienburger.png and b/items/generic/food/sb_entrees/alienburger.png differ diff --git a/items/generic/food/sb_entrees/automatostew.png b/items/generic/food/sb_entrees/automatostew.png index aa2f84e4..1a61e004 100644 Binary files a/items/generic/food/sb_entrees/automatostew.png and b/items/generic/food/sb_entrees/automatostew.png differ diff --git a/items/generic/food/sb_entrees/burrito.png b/items/generic/food/sb_entrees/burrito.png index 133b192f..943745e0 100644 Binary files a/items/generic/food/sb_entrees/burrito.png and b/items/generic/food/sb_entrees/burrito.png differ diff --git a/items/generic/food/sb_entrees/chilistew.consumable b/items/generic/food/sb_entrees/chilistew.consumable index 61a0c27c..27ea1bcb 100644 --- a/items/generic/food/sb_entrees/chilistew.consumable +++ b/items/generic/food/sb_entrees/chilistew.consumable @@ -1,22 +1,28 @@ { - "itemName" : "sb_chilistew", - "price" : 165, - "foodValue" : 30, - "tooltipKind" : "sb_object", - "rarity" : "unCommon", - "sb_plateHide" : true, - "category" : "preparedFood", - "inventoryIcon" : "chilistew.png", - "description" : "A delicious beefy chili. Spicy!", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":135}, - {"effect":"nova","duration":135}, - {"effect":"burning","duration":10}, - "sb_foodheal95" - ]], - "rottedItem" : "sb_revoltingstew", - "shortdescription" : "Chili Stew", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 3 -} \ No newline at end of file + "itemName": "sb_chilistew", + "price": 175, + "foodValue": 45, + "tooltipKind": "sb_object", + "rarity": "rare", + "sb_plateHide": true, + "category": "preparedFood", + "inventoryIcon": "chilistew.png", + "description": "A delicious beefy chilli. Spicy!", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 203 + }, { + "effect": "nova", + "duration": 203 + }, { + "effect": "burning", + "duration": 5 + }, + "sb_foodheal145" + ]], + "rottedItem": "sb_revoltingstew", + "shortdescription": "Chilli Stew", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 3 +} diff --git a/items/generic/food/sb_entrees/crystalnachos.consumable b/items/generic/food/sb_entrees/crystalnachos.consumable index 03677d28..3406eaf4 100644 --- a/items/generic/food/sb_entrees/crystalnachos.consumable +++ b/items/generic/food/sb_entrees/crystalnachos.consumable @@ -1,20 +1,21 @@ { - "itemName" : "sb_crystalnachos", - "price" : 400, - "foodValue" : 50, - "effects" : [[ - {"effect":"glow","duration":225}, - {"effect":"maxhealthscalingboostfood","duration":225}, - "sb_foodheal170" - ]], - "tooltipKind" : "sb_object", - "rarity" : "rare", - "sb_plateHide" : true, - "inventoryIcon" : "crystalnachos.png", - "category" : "preparedFood", - "description" : "Exquisite nachos made from a variety of ingredients.", - "shortdescription" : "Crystal Nachos", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 3 -} \ No newline at end of file + "itemName": "sb_crystalnachos", + "price": 400, + "foodValue": 50, + "effects": [[{ + "effect": "glow", + "duration": 450 + }, + "sb_foodheal170" + ]], + "tooltipKind": "sb_object", + "rarity": "rare", + "sb_plateHide": true, + "inventoryIcon": "crystalnachos.png", + "category": "preparedFood", + "description": "Exquisite nachos made from a variety of ingredients.", + "shortdescription": "Crystal Nachos", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 3 +} diff --git a/items/generic/food/sb_entrees/crystalnachos.png b/items/generic/food/sb_entrees/crystalnachos.png index e6a911f1..e9477be9 100644 Binary files a/items/generic/food/sb_entrees/crystalnachos.png and b/items/generic/food/sb_entrees/crystalnachos.png differ diff --git a/items/generic/food/sb_entrees/curriedbeakseed.consumable b/items/generic/food/sb_entrees/curriedbeakseed.consumable index 12908bb1..578856a0 100644 --- a/items/generic/food/sb_entrees/curriedbeakseed.consumable +++ b/items/generic/food/sb_entrees/curriedbeakseed.consumable @@ -1,20 +1,26 @@ { - "itemName" : "sb_curriedbeakseed", - "price" : 200, - "foodValue" : 20, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "category" : "preparedFood", - "inventoryIcon" : "curriedbeakseed.png", - "description" : "Curried, crunchy beakseeds with hot chili peppers. Mmm.", - "shortdescription" : "Curried Beakseed", - "effects" : [[ - {"effect":"jumpboostfood","duration":90}, - {"effect":"nova","duration":90}, - {"effect":"burning","duration":10}, - "sb_foodheal50" - ]], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 8 -} \ No newline at end of file + "itemName": "sb_curriedbeakseed", + "price": 200, + "foodValue": 20, + "tooltipKind": "sb_object", + "rarity": "Common", + "category": "preparedFood", + "inventoryIcon": "curriedbeakseed.png", + "description": "Curried, crunchy beakseeds with hot chilli peppers. Mmm.", + "shortdescription": "Curried Beakseed", + "effects": [[{ + "effect": "jumpboostfood", + "duration": 90 + }, { + "effect": "nova", + "duration": 90 + }, { + "effect": "burning", + "duration": 5 + }, + "sb_foodheal50" + ]], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 8 +} diff --git a/items/generic/food/sb_entrees/curriedbeakseed.png b/items/generic/food/sb_entrees/curriedbeakseed.png index 93e1b4f3..69c666de 100644 Binary files a/items/generic/food/sb_entrees/curriedbeakseed.png and b/items/generic/food/sb_entrees/curriedbeakseed.png differ diff --git a/items/generic/food/sb_entrees/hamsandwich.png b/items/generic/food/sb_entrees/hamsandwich.png index 127348ae..b3230c90 100644 Binary files a/items/generic/food/sb_entrees/hamsandwich.png and b/items/generic/food/sb_entrees/hamsandwich.png differ diff --git a/items/generic/food/sb_entrees/meatandmarrow.consumable b/items/generic/food/sb_entrees/meatandmarrow.consumable index 162660af..522569d1 100644 --- a/items/generic/food/sb_entrees/meatandmarrow.consumable +++ b/items/generic/food/sb_entrees/meatandmarrow.consumable @@ -1,18 +1,23 @@ { - "itemName" : "sb_meatandmarrow", - "price" : 210, - "foodValue" : 35, - "tooltipKind" : "sb_object4", - "rarity" : "unCommon", - "inventoryIcon" : "meatandmarrow.png", - "category" : "food", - "effects" : [[ - {"effect":"ragefood","duration":315}, - "sb_foodheal120" - ]], - "description" : "It's exactly what it says on the tin, if only it had come in a tin.", - "shortdescription" : "Meat n' Marrow", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2 -} \ No newline at end of file + "itemName": "sb_meatandmarrow", + "price": 220, + "foodValue": 40, + "tooltipKind": "sb_object4", + "rarity": "uncommon", + "inventoryIcon": "meatandmarrow.png", + "category": "preparedFood", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 180 + }, { + "effect": "ragefood", + "duration": 180 + }, + "sb_foodheal135" + ]], + "description": "It's exactly what it says on the tin, if only it had come in a tin.", + "shortdescription": "Meat n' Marrow", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_entrees/poachedavesmingo.consumable b/items/generic/food/sb_entrees/poachedavesmingo.consumable index a6fcd3d2..9f447567 100644 --- a/items/generic/food/sb_entrees/poachedavesmingo.consumable +++ b/items/generic/food/sb_entrees/poachedavesmingo.consumable @@ -1,20 +1,23 @@ { - "itemName" : "sb_poachedavesmingo", - "price" : 270, - "foodValue" : 25, - "effects" : [[ - {"effect":"ragefood","duration":75}, - {"effect":"maxhealthscalingboostfood","duration":75}, - {"effect":"jumpboostfood","duration":75}, - "sb_foodheal70" - ]], - "tooltipKind" : "sb_object4", - "rarity" : "common", - "category" : "preparedFood", - "inventoryIcon" : "poachedavesmingo.png", - "description" : "A sweet Avesmingo poached in potent Wartjuice. A pretty expensive dish.", - "shortdescription" : "Poached Avesmingo", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2 -} \ No newline at end of file + "itemName": "sb_poachedavesmingo", + "price": 500, + "foodValue": 40, + "effects": [[{ + "effect": "runboostfood", + "duration": 180 + }, { + "effect": "ragefood", + "duration": 180 + }, + "sb_foodheal135" + ]], + "tooltipKind": "sb_object4", + "rarity": "uncommon", + "category": "preparedFood", + "inventoryIcon": "poachedavesmingo.png", + "description": "A sweet avesmingo poached in potent wartjuice. A pretty expensive dish.", + "shortdescription": "Poached Avesmingo", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_entrees/roastpoultry.consumable b/items/generic/food/sb_entrees/roastpoultry.consumable index f1c35cad..a8275362 100644 --- a/items/generic/food/sb_entrees/roastpoultry.consumable +++ b/items/generic/food/sb_entrees/roastpoultry.consumable @@ -1,21 +1,27 @@ { - "itemName" : "sb_roastpoultry", - "price" : 280, - "foodValue" : 45, - "tooltipKind" : "sb_object", - "sb_plateHide" : true, - "rarity" : "Rare", - "inventoryIcon" : "roastpoultry.png", - "category" : "preparedFood", - "description" : "A beautiful, juicy platter of roasted poultry.", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":203}, - {"effect":"nova","duration":203}, - {"effect":"burning","duration":10}, - "sb_foodheal145" - ]], - "shortdescription" : "Roasted Poultry", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2 -} \ No newline at end of file + "itemName": "sb_roastpoultry", + "price": 280, + "foodValue": 45, + "tooltipKind": "sb_object", + "sb_plateHide": true, + "rarity": "Rare", + "inventoryIcon": "roastpoultry.png", + "category": "preparedFood", + "description": "A beautiful, juicy platter of roasted poultry.", + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 203 + }, { + "effect": "nova", + "duration": 203 + }, { + "effect": "burning", + "duration": 5 + }, + "sb_foodheal145" + ]], + "shortdescription": "Roasted Poultry", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2 +} diff --git a/items/generic/food/sb_entrees/roastpoultry.png b/items/generic/food/sb_entrees/roastpoultry.png index 9eca0a14..f1057347 100644 Binary files a/items/generic/food/sb_entrees/roastpoultry.png and b/items/generic/food/sb_entrees/roastpoultry.png differ diff --git a/items/generic/food/sb_entrees/soup.consumable b/items/generic/food/sb_entrees/soup.consumable deleted file mode 100644 index dc7f45ac..00000000 --- a/items/generic/food/sb_entrees/soup.consumable +++ /dev/null @@ -1,23 +0,0 @@ -{ - "itemName" : "sb_soup", - "price" : 160, - "foodValue" : 15, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "sb_plateHide" : true, - "inventoryIcon" : "soup.png", - "category" : "preparedFood", - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":68}, - {"effect":"nova","duration":68}, - "sb_foodheal35" - ]], - "description" : "A steaming bowl of tomato soup.", - "shortdescription" : "Spicy Tomato Soup", - "rottedItem" : "sb_revoltingstew", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2, - "emitters" : ["drinking"], - "handPosition" : [0, -2] -} \ No newline at end of file diff --git a/items/generic/food/sb_entrees/soup.png b/items/generic/food/sb_entrees/soup.png deleted file mode 100644 index 7314ee9d..00000000 Binary files a/items/generic/food/sb_entrees/soup.png and /dev/null differ diff --git a/items/generic/food/sb_entrees/vegetablesoup.png b/items/generic/food/sb_entrees/vegetablesoup.png index e683d7db..b125dba3 100644 Binary files a/items/generic/food/sb_entrees/vegetablesoup.png and b/items/generic/food/sb_entrees/vegetablesoup.png differ diff --git a/items/generic/food/sb_preservedfood.activeitem b/items/generic/food/sb_preservedfood.activeitem index 41f571c0..d6d54981 100644 --- a/items/generic/food/sb_preservedfood.activeitem +++ b/items/generic/food/sb_preservedfood.activeitem @@ -1,8 +1,8 @@ { - "itemName" : "sb_preservedfood", - "rarity" : "rare", - "shortdescription" : "", //required to keep ES from dying - "animation" : "/items/sb_consumable.animation", - "scripts" : ["/items/sb_consumable.lua"], - "builder" : "/items/buildscripts/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_preservedfood", + "rarity": "rare", + "shortdescription": "", //required to keep ES from dying + "animation": "/items/sb_consumable.animation", + "scripts": ["/items/sb_consumable.lua"], + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/food/sb_sides/roastbanana.consumable b/items/generic/food/sb_sides/roastbanana.consumable index b99e21fc..f5252bd2 100644 --- a/items/generic/food/sb_sides/roastbanana.consumable +++ b/items/generic/food/sb_sides/roastbanana.consumable @@ -1,19 +1,24 @@ { - "itemName" : "sb_roastbanana", - "rarity" : "Common", - "category" : "preparedFood", - "inventoryIcon" : "roastbanana.png", - "description" : "Not as tasty or filling as a battered banana, but undeniably better for you.", - "shortdescription" : "Roasted Banana", - "price" : 150, - "effects" : [[ - {"effect":"maxenergyscalingboostfood","duration":60}, - "sb_foodheal35" - ]], - "foodValue" : 15, - "tooltipKind" : "sb_object4", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 2.5, - "learnBlueprintsOnPickup" : ["sb_roastbanana"] -} \ No newline at end of file + "itemName": "sb_roastbanana", + "rarity": "Common", + "category": "preparedFood", + "inventoryIcon": "roastbanana.png", + "description": "Not as tasty or filling as a battered banana, but undeniably better for you.", + "shortdescription": "Roasted Banana", + "price": 150, + "effects": [[{ + "effect": "sb_maxenergyboost20", + "duration": 135 + },{ + "effect": "sb_energyregen", + "duration": 135 + }, + "sb_foodheal35" + ]], + "foodValue": 15, + "tooltipKind": "sb_object4", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 2.5, + "learnBlueprintsOnPickup": ["sb_roastbanana"] +} diff --git a/items/generic/food/sb_sides/roastbanana.png b/items/generic/food/sb_sides/roastbanana.png index d6524938..5cc302f7 100644 Binary files a/items/generic/food/sb_sides/roastbanana.png and b/items/generic/food/sb_sides/roastbanana.png differ diff --git a/items/generic/food/sb_sides/toast.consumable b/items/generic/food/sb_sides/toast.consumable index 1758cab1..115c672a 100644 --- a/items/generic/food/sb_sides/toast.consumable +++ b/items/generic/food/sb_sides/toast.consumable @@ -1,18 +1,25 @@ { - "itemName" : "sb_toast", - "rarity" : "uncommon", - "category" : "preparedFood", - "price" : 300, - "inventoryIcon" : "toast.png", - "tooltipKind" : "sb_object4", - "description" : "A slice of warm, toasted bread with a coat of butter. Comforting.", - "shortdescription" : "Buttered Toast", - "foodValue" : 35, - "effects" : [[ - {"effect":"maxhealthscalingboostfood","duration":158}, - {"effect":"sb_health","duration":20}, - "sb_foodheal120" - ]], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"] -} \ No newline at end of file + "itemName": "sb_toast", + "rarity": "common", + "category": "preparedFood", + "price": 125, + "inventoryIcon": "toast.png", + "tooltipKind": "sb_object4", + "description": "A slice of warm, toasted bread with a coat of butter. Comforting.", + "shortdescription": "Buttered Toast", + "foodValue": 20, + "effects": [[{ + "effect": "maxhealthscalingboostfood", + "duration": 90 + }, { + "effect": "maxenergyscalingboostfood", + "duration": 90 + }, { + "effect": "sb_restoration", + "duration": 10 + }, + "sb_foodheal50" + ]], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"] +} diff --git a/items/generic/food/sb_sides/toast.png b/items/generic/food/sb_sides/toast.png index 83531144..f9069d77 100644 Binary files a/items/generic/food/sb_sides/toast.png and b/items/generic/food/sb_sides/toast.png differ diff --git a/items/generic/food/tier1/bakedpotato.consumable.patch b/items/generic/food/tier1/bakedpotato.consumable.patch index 69c47dff..fa21f3f7 100644 --- a/items/generic/food/tier1/bakedpotato.consumable.patch +++ b/items/generic/food/tier1/bakedpotato.consumable.patch @@ -4,6 +4,7 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":4}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/0","value":"sb_foodheal50"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":180}}], +[{"op":"add","path":"/effects/0/-","value":"sb_foodheal50"}], [{"op":"add","path":"/effects/0/-","value":{"effect":"sb_health","duration":10}}] ] \ No newline at end of file diff --git a/items/generic/food/tier1/boiledrice.consumable.patch b/items/generic/food/tier1/boiledrice.consumable.patch index d11730cc..2604a722 100644 --- a/items/generic/food/tier1/boiledrice.consumable.patch +++ b/items/generic/food/tier1/boiledrice.consumable.patch @@ -5,5 +5,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":135}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal35"}] ] \ No newline at end of file diff --git a/items/generic/food/tier1/fishfingers.consumable.patch b/items/generic/food/tier1/fishfingers.consumable.patch index 52f7d2a9..4daee3cf 100644 --- a/items/generic/food/tier1/fishfingers.consumable.patch +++ b/items/generic/food/tier1/fishfingers.consumable.patch @@ -1,11 +1,14 @@ [ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], -[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Uncommon"}], +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Rare"}], [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], +[{"op":"test","path":"/foodValue","value":35},{"op":"replace","path":"/foodValue","value":45}], +[{"op":"test","path":"/price","value":85},{"op":"replace","path":"/price","value":155}], + [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_foodheal120"}], +[{"op":"add","path":"/effects/0/-","value":"sb_foodheal145"}], [{"op":"add","path":"/effects/0/-","value":{"effect":"sb_health","duration":25}}] ] \ No newline at end of file diff --git a/items/generic/food/tier1/meatpie.consumable.patch b/items/generic/food/tier1/meatpie.consumable.patch index d1fb3baf..06c94da9 100644 --- a/items/generic/food/tier1/meatpie.consumable.patch +++ b/items/generic/food/tier1/meatpie.consumable.patch @@ -8,6 +8,7 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_foodheal265"}], +[{"op":"test","path":"/effects/0/0/duration","value":375},{"op":"replace","path":"/effects/0/0/duration","value":338}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_protectionboost5","duration":338}}], [{"op":"add","path":"/effects/0/-","value":{"effect":"sb_health","duration":35}}] ] \ No newline at end of file diff --git a/items/generic/food/tier1/pearlpeabroth.consumable.patch b/items/generic/food/tier1/pearlpeabroth.consumable.patch index f4c860ee..27eaf8ac 100644 --- a/items/generic/food/tier1/pearlpeabroth.consumable.patch +++ b/items/generic/food/tier1/pearlpeabroth.consumable.patch @@ -6,7 +6,6 @@ [{"op":"add","path":"/sb_plateHide","value":true}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"test","path":"/effects/0/0/duration","value":180},{"op":"replace","path":"/effects/0/0/duration","value":90}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_protectionboost5","duration":90}}], +[{"op":"test","path":"/effects/0/0/effect","value":"maxhealthscalingboostfood"},{"op":"replace","path":"/effects/0/0/effect","value":"sb_protectionboost5"}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal50"}] ] \ No newline at end of file diff --git a/items/generic/food/tier1/popcorn.consumable.patch b/items/generic/food/tier1/popcorn.consumable.patch index edacb9d8..72c67d27 100644 --- a/items/generic/food/tier1/popcorn.consumable.patch +++ b/items/generic/food/tier1/popcorn.consumable.patch @@ -4,6 +4,7 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":135}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal35"}], [{"op":"add","path":"/effects/0/-","value":{"effect":"sb_health","duration":10}}] ] \ No newline at end of file diff --git a/items/generic/food/tier2/carrotcake.consumable.patch b/items/generic/food/tier2/carrotcake.consumable.patch index e9e06feb..f3b93320 100644 --- a/items/generic/food/tier2/carrotcake.consumable.patch +++ b/items/generic/food/tier2/carrotcake.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":4}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_foodheal190"}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energy","duration":25}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energy","duration":25}}], +[{"op":"add","path":"/effects/0/-","value":"sb_foodheal190"}] ] \ No newline at end of file diff --git a/items/generic/food/tier2/chocolatecake.consumable.patch b/items/generic/food/tier2/chocolatecake.consumable.patch index e0b4bc45..561ba3bd 100644 --- a/items/generic/food/tier2/chocolatecake.consumable.patch +++ b/items/generic/food/tier2/chocolatecake.consumable.patch @@ -10,6 +10,7 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":4}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_foodheal215"}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energy","duration":30}}] +[{"op":"test","path":"/effects/0/0/duration","value":540},{"op":"replace","path":"/effects/0/0/duration","value":270}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":270}}], +[{"op":"add","path":"/effects/0/-","value":"sb_foodheal215"}] ] \ No newline at end of file diff --git a/items/generic/food/tier2/mocha.consumable.patch b/items/generic/food/tier2/mocha.consumable.patch index ecf4966c..6506ad1b 100644 --- a/items/generic/food/tier2/mocha.consumable.patch +++ b/items/generic/food/tier2/mocha.consumable.patch @@ -8,6 +8,8 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen480","duration":360}}], +[{"op":"test","path":"/effects/0/0/duration","value":360},{"op":"replace","path":"/effects/0/0/duration","value":180}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen480","duration":180}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":180}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal135"}] ] \ No newline at end of file diff --git a/items/generic/food/tier2/pearlpeapancakes.consumable.patch b/items/generic/food/tier2/pearlpeapancakes.consumable.patch index ce74a844..ae4f202b 100644 --- a/items/generic/food/tier2/pearlpeapancakes.consumable.patch +++ b/items/generic/food/tier2/pearlpeapancakes.consumable.patch @@ -6,7 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"test","path":"/effects/0/0/duration","value":360},{"op":"replace","path":"/effects/0/0/duration","value":180}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_protectionboost5","duration":180}}], +[{"op":"test","path":"/effects/0/0/effect","value":"maxhealthscalingboostfood"},{"op":"replace","path":"/effects/0/0/effect","value":"sb_protectionboost5"}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal135"}] ] \ No newline at end of file diff --git a/items/generic/food/tier2/sb_mocha.activeitem b/items/generic/food/tier2/sb_mocha.activeitem index 5a127af1..27d7ae46 100644 --- a/items/generic/food/tier2/sb_mocha.activeitem +++ b/items/generic/food/tier2/sb_mocha.activeitem @@ -1,11 +1,11 @@ { - "sb_itemName" : "mocha.consumable", - "itemName" : "mocha", - "shortdescription" : "Mochaccino", - "animation" : "/items/sb_consumable.animation", - "scripts" : ["/items/sb_consumable.lua"], - "returnItem" : "glasscoffeemug", - "sb_forcePlate" : true, - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "builder" : "/items/buildscripts/starbound/fromsource.lua" -} \ No newline at end of file + "sb_itemName": "mocha.consumable", + "itemName": "mocha", + "shortdescription": "Mochaccino", + "animation": "/items/sb_consumable.animation", + "scripts": ["/items/sb_consumable.lua"], + "returnItem": "glasscoffeemug", + "sb_forcePlate": true, + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "builder": "/items/buildscripts/starbound/fromsource.lua" +} diff --git a/items/generic/food/tier3/apegrapes.consumable.patch b/items/generic/food/tier3/apegrapes.consumable.patch index 4c7845a5..b4544620 100644 --- a/items/generic/food/tier3/apegrapes.consumable.patch +++ b/items/generic/food/tier3/apegrapes.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen96"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen96","duration":135}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal95"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/apexfritter.consumable.patch b/items/generic/food/tier3/apexfritter.consumable.patch index 27d19b42..7c4ad59f 100644 --- a/items/generic/food/tier3/apexfritter.consumable.patch +++ b/items/generic/food/tier3/apexfritter.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen192"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen192","duration":180}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal135"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/bananacon.consumable.patch b/items/generic/food/tier3/bananacon.consumable.patch index be9b33af..0e530055 100644 --- a/items/generic/food/tier3/bananacon.consumable.patch +++ b/items/generic/food/tier3/bananacon.consumable.patch @@ -4,6 +4,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen96"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen96","duration":113}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal70"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/bananacreamdonut.consumable.patch b/items/generic/food/tier3/bananacreamdonut.consumable.patch index f9e91dbc..2db1d171 100644 --- a/items/generic/food/tier3/bananacreamdonut.consumable.patch +++ b/items/generic/food/tier3/bananacreamdonut.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen384"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen384","duration":540}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal215"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/bananacreampie.consumable.patch b/items/generic/food/tier3/bananacreampie.consumable.patch index c95ed0d5..8c797f82 100644 --- a/items/generic/food/tier3/bananacreampie.consumable.patch +++ b/items/generic/food/tier3/bananacreampie.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen288"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen288","duration":450}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal170"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/bananaicecream.consumable.patch b/items/generic/food/tier3/bananaicecream.consumable.patch index 85c365ca..e03b3112 100644 --- a/items/generic/food/tier3/bananaicecream.consumable.patch +++ b/items/generic/food/tier3/bananaicecream.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen192"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen192","duration":405}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal145"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/batteredbanana.consumable.patch b/items/generic/food/tier3/batteredbanana.consumable.patch index 8bd00065..4eacd3eb 100644 --- a/items/generic/food/tier3/batteredbanana.consumable.patch +++ b/items/generic/food/tier3/batteredbanana.consumable.patch @@ -4,6 +4,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen96"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen96","duration":225}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal70"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/campfirebanana.consumable.patch b/items/generic/food/tier3/campfirebanana.consumable.patch index b4dcb385..be960a36 100644 --- a/items/generic/food/tier3/campfirebanana.consumable.patch +++ b/items/generic/food/tier3/campfirebanana.consumable.patch @@ -6,6 +6,8 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen96"}], +[{"op":"test","path":"/effects/0/0/duration","value":270},{"op":"replace","path":"/effects/0/0/duration","value":135}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen96","duration":135}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":135}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal95"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/choconut.consumable.patch b/items/generic/food/tier3/choconut.consumable.patch index ff3338d1..d05d802c 100644 --- a/items/generic/food/tier3/choconut.consumable.patch +++ b/items/generic/food/tier3/choconut.consumable.patch @@ -6,6 +6,7 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energy","duration":35}}], +[{"op":"test","path":"/effects/0/0/duration","value":675},{"op":"replace","path":"/effects/0/0/duration","value":338}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":338}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal265"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/desertsalsa.consumable.patch b/items/generic/food/tier3/desertsalsa.consumable.patch index 04520cd7..5d7244ca 100644 --- a/items/generic/food/tier3/desertsalsa.consumable.patch +++ b/items/generic/food/tier3/desertsalsa.consumable.patch @@ -9,5 +9,9 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":10}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"test","path":"/effects/0/0/duration","value":383},{"op":"replace","path":"/effects/0/0/duration","value":192}], +[{"op":"test","path":"/effects/0/1/duration","value":383},{"op":"replace","path":"/effects/0/1/duration","value":192}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxenergyscalingboostfood","duration":192}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":192}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal315"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/fruitsalad.consumable.patch b/items/generic/food/tier3/fruitsalad.consumable.patch index 055c1803..f0909eb2 100644 --- a/items/generic/food/tier3/fruitsalad.consumable.patch +++ b/items/generic/food/tier3/fruitsalad.consumable.patch @@ -9,6 +9,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen480"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen480","duration":210}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal265"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/luckydip.consumable.patch b/items/generic/food/tier3/luckydip.consumable.patch index a44ca389..55534db8 100644 --- a/items/generic/food/tier3/luckydip.consumable.patch +++ b/items/generic/food/tier3/luckydip.consumable.patch @@ -8,6 +8,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen96"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen96","duration":225}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal70"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/stuffedautomato.consumable.patch b/items/generic/food/tier3/stuffedautomato.consumable.patch index 7e5a32bb..659fb2e9 100644 --- a/items/generic/food/tier3/stuffedautomato.consumable.patch +++ b/items/generic/food/tier3/stuffedautomato.consumable.patch @@ -6,7 +6,8 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"test","path":"/effects/0/0/duration","value":450},{"op":"replace","path":"/effects/0/0/duration","value":225}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":225}}], +[{"op":"test","path":"/effects/0/0/duration","value":450},{"op":"replace","path":"/effects/0/0/duration","value":150}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxenergyscalingboostfood","duration":150}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":150}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal170"}] ] \ No newline at end of file diff --git a/items/generic/food/tier3/tropicalpunch.consumable.patch b/items/generic/food/tier3/tropicalpunch.consumable.patch index b65b66e1..9ff9bc64 100644 --- a/items/generic/food/tier3/tropicalpunch.consumable.patch +++ b/items/generic/food/tier3/tropicalpunch.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen480"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen480","duration":210}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal265"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/bananasplit.consumable.patch b/items/generic/food/tier4/bananasplit.consumable.patch index 0b0f1800..078e5616 100644 --- a/items/generic/food/tier4/bananasplit.consumable.patch +++ b/items/generic/food/tier4/bananasplit.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rarity","value":"Rare"},{"op":"replace","path":"/rarity","value":"Legendary"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen672"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen672","duration":428}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal720"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/cyanider.consumable.patch b/items/generic/food/tier4/cyanider.consumable.patch index 48d5301d..faf067de 100644 --- a/items/generic/food/tier4/cyanider.consumable.patch +++ b/items/generic/food/tier4/cyanider.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":30}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":15}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal120"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/oceansalsa.consumable.patch b/items/generic/food/tier4/oceansalsa.consumable.patch index 62806c24..a2ab7ae7 100644 --- a/items/generic/food/tier4/oceansalsa.consumable.patch +++ b/items/generic/food/tier4/oceansalsa.consumable.patch @@ -9,5 +9,6 @@ [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], [{"op":"add","path":"/effects/0/-","value":{"effect":"swimboostcola","duration":180}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen384","duration":180}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal95"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/oculemonstew.consumable.patch b/items/generic/food/tier4/oculemonstew.consumable.patch index 9463c7aa..2722ff4c 100644 --- a/items/generic/food/tier4/oculemonstew.consumable.patch +++ b/items/generic/food/tier4/oculemonstew.consumable.patch @@ -10,6 +10,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":30}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":15}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal240"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/pussplumjam.consumable.patch b/items/generic/food/tier4/pussplumjam.consumable.patch index 4b6ae6ef..523d8c86 100644 --- a/items/generic/food/tier4/pussplumjam.consumable.patch +++ b/items/generic/food/tier4/pussplumjam.consumable.patch @@ -10,6 +10,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":10}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":30}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":15}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal95"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/pussplumpudding.consumable.patch b/items/generic/food/tier4/pussplumpudding.consumable.patch index e90e11c6..610e1add 100644 --- a/items/generic/food/tier4/pussplumpudding.consumable.patch +++ b/items/generic/food/tier4/pussplumpudding.consumable.patch @@ -8,6 +8,6 @@ [{"op":"test","path":"/rarity","value":"Uncommon"},{"op":"replace","path":"/rarity","value":"Rare"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":30}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":15}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal170"}] ] \ No newline at end of file diff --git a/items/generic/food/tier4/pussplumtart.consumable.patch b/items/generic/food/tier4/pussplumtart.consumable.patch index b955de9f..0e0c2a5f 100644 --- a/items/generic/food/tier4/pussplumtart.consumable.patch +++ b/items/generic/food/tier4/pussplumtart.consumable.patch @@ -6,6 +6,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":30}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":15}}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal135"}] ] \ No newline at end of file diff --git a/items/generic/food/tier6/pearlpeaparcels.consumable.patch b/items/generic/food/tier6/pearlpeaparcels.consumable.patch index 304acdd3..c4a2f39e 100644 --- a/items/generic/food/tier6/pearlpeaparcels.consumable.patch +++ b/items/generic/food/tier6/pearlpeaparcels.consumable.patch @@ -4,7 +4,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"test","path":"/effects/0/0/duration","value":180},{"op":"replace","path":"/effects/0/0/duration","value":90}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_protectionboost5","duration":90}}], +[{"op":"test","path":"/effects/0/0/effect","value":"maxhealthscalingboostfood"},{"op":"replace","path":"/effects/0/0/effect","value":"sb_protectionboost5"}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal50"}] ] \ No newline at end of file diff --git a/items/generic/food/tier6/wartweedstew.consumable.patch b/items/generic/food/tier6/wartweedstew.consumable.patch index 18f878c8..2b6ff0ec 100644 --- a/items/generic/food/tier6/wartweedstew.consumable.patch +++ b/items/generic/food/tier6/wartweedstew.consumable.patch @@ -10,7 +10,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"test","path":"/effects/0/0/duration","value":360},{"op":"replace","path":"/effects/0/0/duration","value":180}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_protectionboost5","duration":180}}], +[{"op":"test","path":"/effects/0/0/effect","value":"maxenergyscalingboostfood"},{"op":"replace","path":"/effects/0/0/effect","value":"sb_protectionboost5"}], [{"op":"add","path":"/effects/0/-","value":"sb_foodheal135"}] ] \ No newline at end of file diff --git a/items/generic/other/comedyscript.item.patch b/items/generic/other/comedyscript.item.patch index f62e7ed7..8eec1fba 100644 --- a/items/generic/other/comedyscript.item.patch +++ b/items/generic/other/comedyscript.item.patch @@ -1 +1,6 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}],[{"op":"add","path":"/sb_copybook","value":true}]] \ No newline at end of file +[ +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], + +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[{"op":"add","path":"/itemTags/-","value":"sb_copybook"}] +] \ No newline at end of file diff --git a/items/generic/other/fungusstim.consumable.patch b/items/generic/other/fungusstim.consumable.patch index e87cd2f7..76e29e2a 100644 --- a/items/generic/other/fungusstim.consumable.patch +++ b/items/generic/other/fungusstim.consumable.patch @@ -2,5 +2,6 @@ [{"op":"test","path":"/handPosition"},{"op":"remove","path":"/handPosition"}], [{"op":"test","path":"/price","value":0},{"op":"replace","path":"/price","value":200}], [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], -[{"op":"test","path":"/rarity","value":"Common"},{"op":"add","path":"/rarity","value":"uncommon"}] +[{"op":"test","path":"/rarity","value":"Common"},{"op":"add","path":"/rarity","value":"uncommon"}], +[{"op":"test","path":"/effects/0/0/effect","value":"regeneration4"},{"op":"replace","path":"/effects/0/0/effect","value":"sb_regeneration5"}] ] \ No newline at end of file diff --git a/items/generic/other/protectorateflyer.item.patch b/items/generic/other/protectorateflyer.item.patch index ad885a0d..b8f0ba8f 100644 --- a/items/generic/other/protectorateflyer.item.patch +++ b/items/generic/other/protectorateflyer.item.patch @@ -1 +1,4 @@ -[{"op":"add","path":"/sb_copybook","value":true}] \ No newline at end of file +[ +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[{"op":"add","path":"/itemTags/-","value":"sb_copybook"}] +] \ No newline at end of file diff --git a/items/generic/other/sb_ammo.item b/items/generic/other/sb_ammo.item index 2c9049a4..a925cd4a 100644 --- a/items/generic/other/sb_ammo.item +++ b/items/generic/other/sb_ammo.item @@ -2,13 +2,13 @@ "itemName" : "sb_ammo", "rarity" : "common", "price" : 1, - "tooltipKind" : "sb_object", + "tooltipKind" : "sb_object4", "inventoryIcon" : "sb_ammo.png", "category" : "pistol", "tooltipFields" : {"subtitle" : "Other"}, "radioMessagesOnPickup" : ["sb_pickupammo"], //"itemTags" : ["weapon","ranged","revolver","pistol","gun"], Uncrafter will see it as a weapon - "description" : "This type of ammo can be used with certain firearms.", + "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"], "builder" : "/items/buildscripts/starbound/buildammo.lua" diff --git a/items/generic/other/sb_dreadwreckage.png b/items/generic/other/sb_dreadwreckage.png index 43b169e0..1ef69bac 100644 Binary files a/items/generic/other/sb_dreadwreckage.png and b/items/generic/other/sb_dreadwreckage.png differ diff --git a/items/generic/other/sb_eyefoliageHarvest.item b/items/generic/other/sb_eyefoliageHarvest.item deleted file mode 100644 index 29314f45..00000000 --- a/items/generic/other/sb_eyefoliageHarvest.item +++ /dev/null @@ -1,6 +0,0 @@ -{ - "itemName" : "sb_eyefoliageHarvest", - "rarity" : "rare", - "pool" : "sb_eyefoliageHarvest", - "builder" : "/items/buildscripts/starbound/randomdrop.lua" -} \ No newline at end of file diff --git a/items/generic/other/sb_gauze.consumable b/items/generic/other/sb_gauze.consumable index 8e235152..23d88563 100644 --- a/items/generic/other/sb_gauze.consumable +++ b/items/generic/other/sb_gauze.consumable @@ -1,20 +1,20 @@ { - "itemName" : "sb_gauze", - "rarity" : "Common", - "price" : 40, - "category" : "medicine", - "inventoryIcon" : "sb_gauze.png", - "tooltipKind" : "sb_object", - "description" : "A roll of cotton gauze for healing wounds. Restores 75 health over 1 second.", - "shortdescription" : "Gauze", - "effects" : [[{"effect":"sb_gauzeheal"}]], - "emitters" : ["bandageuse"], - "emote" : "", - "blockingEffects" : [ + "itemName": "sb_gauze", + "rarity": "Common", + "price": 40, + "category": "medicine", + "inventoryIcon": "sb_gauze.png", + "tooltipKind": "sb_object", + "description": "A roll of cotton gauze for healing wounds. Restores 75 health over 1 second.", + "shortdescription": "Gauze", + "effects": [["sb_gauzeheal"]], + "emitters": ["bandageuse"], + "emote": "", + "blockingEffects": [ "salveheal", "bandageheal", "medkitheal", "nanowrapheal", "sb_gauzeheal" ] -} \ No newline at end of file +} diff --git a/items/generic/other/sb_gauze.png b/items/generic/other/sb_gauze.png index 698a98cf..4db021a1 100644 Binary files a/items/generic/other/sb_gauze.png and b/items/generic/other/sb_gauze.png differ diff --git a/items/generic/other/sb_greystim.consumable b/items/generic/other/sb_greystim.consumable index 35438687..fcaa04ad 100644 --- a/items/generic/other/sb_greystim.consumable +++ b/items/generic/other/sb_greystim.consumable @@ -1,15 +1,15 @@ { - "itemName" : "sb_greystim", - "rarity" : "Common", - "price" : 100, - "category" : "medicine", - "inventoryIcon" : "sb_greystim.png", - "tooltipKind" : "sb_object", - "description" : "A stimpack full of grey liquid, it'll make you hard as a rock!", - "shortdescription" : "Grey Stim Pack", - "effects" : [["sb_greystim"]], - "emote" : "", - "emitters" : ["stimuse"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "learnBlueprintsOnPickup" : ["sb_protectionbomb"] -} \ No newline at end of file + "itemName": "sb_greystim", + "rarity": "Common", + "price": 100, + "category": "medicine", + "inventoryIcon": "sb_greystim.png", + "tooltipKind": "sb_object", + "description": "A stimpack full of grey liquid, it'll make you hard as a rock!", + "shortdescription": "Grey Stim Pack", + "effects": [["sb_greystim"]], + "emote": "", + "emitters": ["stimuse"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "learnBlueprintsOnPickup": ["sb_protectionbomb"] +} diff --git a/items/generic/other/sb_greystim.png b/items/generic/other/sb_greystim.png index c39f13ff..e46be4c5 100644 Binary files a/items/generic/other/sb_greystim.png and b/items/generic/other/sb_greystim.png differ diff --git a/items/generic/other/sb_mattermodulecomponent.item b/items/generic/other/sb_mattermodulecomponent.item index f7066d4e..42eb40fc 100644 --- a/items/generic/other/sb_mattermodulecomponent.item +++ b/items/generic/other/sb_mattermodulecomponent.item @@ -1,13 +1,12 @@ { - "itemName" : "sb_mattermodulecomponent", - "rarity" : "Rare", - "price" : 10, - "tooltipKind" : "sb_object", - "itemTags" : [ "reagent" ], - "category" : "upgradeComponent", - "inventoryIcon" : "mattermodulecomponent.png", - "description" : "I can slot a bunch of these together to make a manipulator module!", - "shortdescription" : "Matter Module Component", - - "learnBlueprintsOnPickup" : [ "manipulatormodule" ] -} \ No newline at end of file + "itemName": "sb_mattermodulecomponent", + "rarity": "Rare", + "price": 10, + "tooltipKind": "sb_object", + "itemTags": ["reagent"], + "category": "upgradeComponent", + "inventoryIcon": "mattermodulecomponent.png", + "description": "I can slot a bunch of these together to make a manipulator module!", + "shortdescription": "Matter Module Component", + "learnBlueprintsOnPickup": ["manipulatormodule"] +} diff --git a/items/generic/other/sb_techchip.item b/items/generic/other/sb_techchip.item index 7037e92f..73fcd2e1 100644 --- a/items/generic/other/sb_techchip.item +++ b/items/generic/other/sb_techchip.item @@ -1,12 +1,12 @@ { - "itemName" : "sb_techchip", - "rarity" : "Rare", - "price" : 10, - "tooltipKind" : "sb_object", - "itemTags" : ["reagent"], - "inventoryIcon" : "techchip.png", - "category" : "upgradeComponent", - "description" : "A tech chip. I can slot a bunch of these together to make a functioning tech card!", - "shortdescription" : "Tech Chip", - "learnBlueprintsOnPickup" : ["techcard"] -} \ No newline at end of file + "itemName": "sb_techchip", + "rarity": "Rare", + "price": 10, + "tooltipKind": "sb_object", + "itemTags": ["reagent"], + "inventoryIcon": "techchip.png", + "category": "upgradeComponent", + "description": "A tech chip. I can slot a bunch of these together to make a functioning tech card!", + "shortdescription": "Tech Chip", + "learnBlueprintsOnPickup": ["techcard"] +} diff --git a/items/generic/other/sb_timecapsule.item b/items/generic/other/sb_timecapsule.item deleted file mode 100644 index 104b0319..00000000 --- a/items/generic/other/sb_timecapsule.item +++ /dev/null @@ -1,6 +0,0 @@ -{ - "itemName" : "sb_timecapsule", - "rarity" : "Rare", - "sb_timecapsuleConfig" : ["sb_goldcoin",[0,0,0,0,0,0,0,0,0,0,0,"holidayspirit"]], - "builder" : "/items/buildscripts/starbound/buildtimecapsule.lua" -} \ No newline at end of file diff --git a/items/generic/other/sb_treeHarvest.item b/items/generic/other/sb_treeHarvest.item deleted file mode 100644 index bdff3f88..00000000 --- a/items/generic/other/sb_treeHarvest.item +++ /dev/null @@ -1,6 +0,0 @@ -{ - "itemName" : "sb_treeHarvest", - "rarity" : "rare", - "pool" : "sb_treeHarvest", - "builder" : "/items/buildscripts/starbound/randomdrop.lua" -} \ No newline at end of file diff --git a/items/generic/other/sb_unrefinedwood.item b/items/generic/other/sb_unrefinedwood.item index 32e1af87..f223937c 100644 --- a/items/generic/other/sb_unrefinedwood.item +++ b/items/generic/other/sb_unrefinedwood.item @@ -1,12 +1,12 @@ { - "itemName" : "sb_unrefinedwood", - "price" : 3, - "tooltipKind" : "sb_object4", - "rarity" : "Common", - "category" : "fuel", - "fuelAmount" : 3, - "itemTags" : ["reagent"], - "inventoryIcon" : "sb_unrefinedwood.png", - "description" : "The concentration of combustible materials in this log is comparable to that of fossil fuels.", - "shortdescription" : "Fuelwood" -} \ No newline at end of file + "itemName": "sb_unrefinedwood", + "price": 3, + "tooltipKind": "sb_object4", + "rarity": "Common", + "category": "fuel", + "fuelAmount": 3, + "itemTags": ["reagent"], + "inventoryIcon": "sb_unrefinedwood.png", + "description": "The concentration of combustible materials in this log is comparable to that of fossil fuels.", + "shortdescription": "Fuelwood" +} diff --git a/items/generic/other/sb_unrefinedwood.png b/items/generic/other/sb_unrefinedwood.png index 22c96edd..d90e10d8 100644 Binary files a/items/generic/other/sb_unrefinedwood.png and b/items/generic/other/sb_unrefinedwood.png differ diff --git a/items/generic/other/secretnote.item.patch b/items/generic/other/secretnote.item.patch index ad885a0d..b8f0ba8f 100644 --- a/items/generic/other/secretnote.item.patch +++ b/items/generic/other/secretnote.item.patch @@ -1 +1,4 @@ -[{"op":"add","path":"/sb_copybook","value":true}] \ No newline at end of file +[ +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[{"op":"add","path":"/itemTags/-","value":"sb_copybook"}] +] \ No newline at end of file diff --git a/items/generic/other/sheetmusic.item.patch b/items/generic/other/sheetmusic.item.patch index ad885a0d..b8f0ba8f 100644 --- a/items/generic/other/sheetmusic.item.patch +++ b/items/generic/other/sheetmusic.item.patch @@ -1 +1,4 @@ -[{"op":"add","path":"/sb_copybook","value":true}] \ No newline at end of file +[ +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[{"op":"add","path":"/itemTags/-","value":"sb_copybook"}] +] \ No newline at end of file diff --git a/items/generic/other/valentinechocolates.consumable.patch b/items/generic/other/valentinechocolates.consumable.patch index 2df31717..6ec84f16 100644 --- a/items/generic/other/valentinechocolates.consumable.patch +++ b/items/generic/other/valentinechocolates.consumable.patch @@ -1,14 +1,132 @@ [ -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":""}], -[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"test","path":"/foodValue","value":50},{"op":"replace","path":"/foodValue","value":60}], -[{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], -[{"op":"test","path":"/category","value":"food"},{"op":"replace","path":"/category","value":"preparedFood"}], -[{"op":"test","path":"/description","value":"A heart shaped box with themed chocolates inside!"},{"op":"replace","path":"/description","value":"A heart-shaped box with themed chocolates inside!\nHeal your body AND hunger!"}], -[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":0}],[{"op":"replace","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"valentinechocolates"}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object4"}], -[{"op":"add","path":"/effects/0/-","value":"sb_foodheal215"}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":180}}] -] \ No newline at end of file + [{ + "op": "test", + "path": "/tooltipKind", + "inverse": true + }, { + "op": "add", + "path": "/tooltipKind", + "value": "" + } + ], + [{ + "op": "test", + "path": "/effects", + "inverse": true + }, { + "op": "add", + "path": "/effects", + "value": [[]] + } + ], + [{ + "op": "test", + "path": "/learnBlueprintsOnPickup", + "inverse": true + }, { + "op": "add", + "path": "/learnBlueprintsOnPickup", + "value": [] + } + ], + [{ + "op": "test", + "path": "/foodValue", + "value": 50 + }, { + "op": "replace", + "path": "/foodValue", + "value": 60 + } + ], + [{ + "op": "test", + "path": "/rarity", + "value": "Uncommon" + }, { + "op": "replace", + "path": "/rarity", + "value": "Rare" + } + ], + [{ + "op": "test", + "path": "/maxStack" + }, { + "op": "remove", + "path": "/maxStack" + } + ], + [{ + "op": "test", + "path": "/category", + "value": "food" + }, { + "op": "replace", + "path": "/category", + "value": "preparedFood" + } + ], + [{ + "op": "test", + "path": "/price", + "value": 150 + }, { + "op": "replace", + "path": "/price", + "value": 600 + } + ], + [{ + "op": "test", + "path": "/description", + "value": "A heart shaped box with themed chocolates inside!" + }, { + "op": "replace", + "path": "/description", + "value": "A heart-shaped box with themed chocolates inside!\nHeal your body AND hunger!" + } + ], + [{ + "op": "test", + "path": "/builder", + "inverse": true + }, { + "op": "add", + "path": "/builder", + "value": 0 + } + ], [{ + "op": "replace", + "path": "/builder", + "value": "/items/buildscripts/starbound/buildfood.lua" + } + ], + [{ + "op": "add", + "path": "/learnBlueprintsOnPickup/-", + "value": "valentinechocolates" + } + ], + [{ + "op": "replace", + "path": "/tooltipKind", + "value": "sb_object4" + } + ], + [{ + "op": "add", + "path": "/effects/0/-", + "value": "sb_foodheal215" + } + ], + [{ + "op": "add", + "path": "/effects/0/-", + "value": { + "effect": "runboostfood", + "duration": 540 + } + } + ] +] diff --git a/items/generic/other/vaultkey.item.patch b/items/generic/other/vaultkey.item.patch new file mode 100644 index 00000000..d908e596 --- /dev/null +++ b/items/generic/other/vaultkey.item.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":2650}] +] \ No newline at end of file diff --git a/items/generic/other/winningticket.item.patch b/items/generic/other/winningticket.item.patch index 16b8ecf3..b20f7248 100644 --- a/items/generic/other/winningticket.item.patch +++ b/items/generic/other/winningticket.item.patch @@ -1,4 +1,5 @@ [ [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}], -[{"op":"add","path":"/sb_copybook","value":true}],[{"op":"replace","path":"/rarity","value":"rare"}] +[{"op":"test","path":"/itemTags","inverse":true},{"op":"add","path":"/itemTags","value":[]}], +[{"op":"add","path":"/itemTags/-","value":"sb_copybook"}] ] \ No newline at end of file diff --git a/items/generic/produce/alienfruit.consumable.patch b/items/generic/produce/alienfruit.consumable.patch index a5794f7a..a53c40f5 100644 --- a/items/generic/produce/alienfruit.consumable.patch +++ b/items/generic/produce/alienfruit.consumable.patch @@ -2,5 +2,5 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"lowgrav","duration":30}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"lowgrav","duration":90}}] ] \ No newline at end of file diff --git a/items/generic/produce/automato.consumable.patch b/items/generic/produce/automato.consumable.patch index 749513c8..6168a6e3 100644 --- a/items/generic/produce/automato.consumable.patch +++ b/items/generic/produce/automato.consumable.patch @@ -4,5 +4,9 @@ [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_automatostew"}], -[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}] +[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost15","duration":12}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":12}}] ] \ No newline at end of file diff --git a/items/generic/produce/avesmingo.consumable.patch b/items/generic/produce/avesmingo.consumable.patch index bf520f13..5ad2dff0 100644 --- a/items/generic/produce/avesmingo.consumable.patch +++ b/items/generic/produce/avesmingo.consumable.patch @@ -2,8 +2,7 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":25}}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":25}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":34}}], [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}] ] \ No newline at end of file diff --git a/items/generic/produce/banana.consumable.patch b/items/generic/produce/banana.consumable.patch index 823baca1..bdcc86f1 100644 --- a/items/generic/produce/banana.consumable.patch +++ b/items/generic/produce/banana.consumable.patch @@ -5,8 +5,8 @@ {"op":"replace","path":"/description","value":"A genetically enhanced banana, could make anyone but an Apex sick."}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen192"}], -[{"op":"add","path":"/effects/0/-","value":"sb_maxenergyboost10"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost15","duration":34}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen192","duration":34}}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_roastbanana"}], diff --git a/items/generic/produce/beakseed.consumable.patch b/items/generic/produce/beakseed.consumable.patch index e3aa8f9e..892d79f1 100644 --- a/items/generic/produce/beakseed.consumable.patch +++ b/items/generic/produce/beakseed.consumable.patch @@ -2,7 +2,7 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"maxhealthboost5"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":34}}], [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}] ] \ No newline at end of file diff --git a/items/generic/produce/boltbulb.consumable.patch b/items/generic/produce/boltbulb.consumable.patch index 37a6f0ba..5366efea 100644 --- a/items/generic/produce/boltbulb.consumable.patch +++ b/items/generic/produce/boltbulb.consumable.patch @@ -1,8 +1,9 @@ [ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], -[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_maxenergyboost10"}], +[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}], -[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}] +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost30","duration":23}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":23}}] ] \ No newline at end of file diff --git a/items/generic/produce/boneboo.consumable.patch b/items/generic/produce/boneboo.consumable.patch index 1be9dadc..963d9e68 100644 --- a/items/generic/produce/boneboo.consumable.patch +++ b/items/generic/produce/boneboo.consumable.patch @@ -6,5 +6,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":3}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"ragefood","duration":30}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"ragefood","duration":45}}] ] \ No newline at end of file diff --git a/items/generic/produce/chili.consumable.patch b/items/generic/produce/chili.consumable.patch index 44bddec3..ae2bda22 100644 --- a/items/generic/produce/chili.consumable.patch +++ b/items/generic/produce/chili.consumable.patch @@ -4,5 +4,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"ragefood","duration":30}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"nova","duration":34}}] ] \ No newline at end of file diff --git a/items/generic/produce/coffeebeans.consumable.patch b/items/generic/produce/coffeebeans.consumable.patch index 7ff0f818..694ee14e 100644 --- a/items/generic/produce/coffeebeans.consumable.patch +++ b/items/generic/produce/coffeebeans.consumable.patch @@ -2,8 +2,8 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_energyregen96"}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost10","duration":90}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost10","duration":34}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_energyregen96","duration":34}}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_chocolatecoffeebeans"}] diff --git a/items/generic/produce/corn.consumable.patch b/items/generic/produce/corn.consumable.patch index 112a9bdb..6de59370 100644 --- a/items/generic/produce/corn.consumable.patch +++ b/items/generic/produce/corn.consumable.patch @@ -1,5 +1,8 @@ [ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], -[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}] +[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost5","duration":34}}] ] \ No newline at end of file diff --git a/items/generic/produce/crystalplant.item.patch b/items/generic/produce/crystalplant.item.patch index 00439173..91ba825e 100644 --- a/items/generic/produce/crystalplant.item.patch +++ b/items/generic/produce/crystalplant.item.patch @@ -6,5 +6,11 @@ [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_liquifiedcrystal"}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_crystalcandy"}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_crystaljam"}] +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_crystaljam"}], + +[{"op":"test","path":"/builder","value":"/items/buildscripts/buildfood.lua"},{"op":"replace","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"glow","duration":23}}] ] \ No newline at end of file diff --git a/items/generic/produce/currentcorn.consumable.patch b/items/generic/produce/currentcorn.consumable.patch index 6e60a38c..0ea802b0 100644 --- a/items/generic/produce/currentcorn.consumable.patch +++ b/items/generic/produce/currentcorn.consumable.patch @@ -3,5 +3,9 @@ [{"op":"test","path":"/description","value":"Grows currentcorn, full of acid. Not good for fleshy creatures."}, {"op":"replace","path":"/description","value":"Currentcorn, full of acid. Not good for fleshy creatures."}], -[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}] +[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost15","duration":23}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":23}}] ] \ No newline at end of file diff --git a/items/generic/produce/diodia.consumable.patch b/items/generic/produce/diodia.consumable.patch index 80968f5d..bf544010 100644 --- a/items/generic/produce/diodia.consumable.patch +++ b/items/generic/produce/diodia.consumable.patch @@ -4,5 +4,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost5","duration":90}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost30","duration":34}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"electrified","duration":34}}] ] \ No newline at end of file diff --git a/items/generic/produce/dirturchin.consumable.patch b/items/generic/produce/dirturchin.consumable.patch index eaa05ef4..a67bd9ce 100644 --- a/items/generic/produce/dirturchin.consumable.patch +++ b/items/generic/produce/dirturchin.consumable.patch @@ -1,5 +1,8 @@ [ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], -[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}] +[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost20","duration":45}}] ] \ No newline at end of file diff --git a/items/generic/produce/feathercrown.consumable.patch b/items/generic/produce/feathercrown.consumable.patch index 70777321..dee0352a 100644 --- a/items/generic/produce/feathercrown.consumable.patch +++ b/items/generic/produce/feathercrown.consumable.patch @@ -4,6 +4,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":30}}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":105}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":45}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":45}}] ] \ No newline at end of file diff --git a/items/generic/produce/grapes.consumable.patch b/items/generic/produce/grapes.consumable.patch index add7e10c..fecf15d7 100644 --- a/items/generic/produce/grapes.consumable.patch +++ b/items/generic/produce/grapes.consumable.patch @@ -4,5 +4,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost10","duration":90}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":3.75}}] ] \ No newline at end of file diff --git a/items/generic/produce/kelp.item.patch b/items/generic/produce/kelp.item.patch index 21fd67be..da3e0a18 100644 --- a/items/generic/produce/kelp.item.patch +++ b/items/generic/produce/kelp.item.patch @@ -1,5 +1,7 @@ [ [{"op":"replace","path":"/itemName","value":"starbound_kelp"}], -[{"op":"test","path":"/price","value":0},{"op":"replace","path":"/price","value":2}] +[{"op":"test","path":"/price","value":0},{"op":"replace","path":"/price","value":2}], +[{"op":"test","path":"/builder","value":"/items/buildscripts/buildfood.lua"},{"op":"replace","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}] ] \ No newline at end of file diff --git a/items/generic/produce/kiwi.consumable.patch b/items/generic/produce/kiwi.consumable.patch index 4e7d3de0..6b18e872 100644 --- a/items/generic/produce/kiwi.consumable.patch +++ b/items/generic/produce/kiwi.consumable.patch @@ -4,5 +4,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":60}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":90}}] ] \ No newline at end of file diff --git a/items/generic/produce/neonmelon.consumable.patch b/items/generic/produce/neonmelon.consumable.patch index e79e0bf4..88e3eed7 100644 --- a/items/generic/produce/neonmelon.consumable.patch +++ b/items/generic/produce/neonmelon.consumable.patch @@ -7,6 +7,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":30}}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost30","duration":30}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":90}}] ] \ No newline at end of file diff --git a/items/generic/produce/oculemon.consumable.patch b/items/generic/produce/oculemon.consumable.patch index 7ee4829d..1c9ae16d 100644 --- a/items/generic/produce/oculemon.consumable.patch +++ b/items/generic/produce/oculemon.consumable.patch @@ -5,7 +5,7 @@ {"op":"replace","path":"/description","value":"Sour but so worth it. The iris is the best part. Could be poisonous to anyone but a Floran."}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost20","duration":105}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost20","duration":90}}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_oculemonade"}], diff --git a/items/generic/produce/oculemon.png b/items/generic/produce/oculemon.png index 3538d8eb..0eceacb6 100644 Binary files a/items/generic/produce/oculemon.png and b/items/generic/produce/oculemon.png differ diff --git a/items/generic/produce/orange.consumable.patch b/items/generic/produce/orange.consumable.patch index fe97b03d..69ec1673 100644 --- a/items/generic/produce/orange.consumable.patch +++ b/items/generic/produce/orange.consumable.patch @@ -1,11 +1,17 @@ [ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/tooltipKind","value":"food"},{"op":"replace","path":"/tooltipKind","value":"sb_object"}], -//[{"op":"test","path":"/description","value":"It's an orange."},{"op":"replace","path":"/description","value":"The colour is named after the fruit."}], +//[{"op":"test","path":"/description","value":"It's an orange."},{"op":"replace","path":"/description","value":"Earth produce was so replete with citric acids that humanity produced relatively few drinks with them."}],//The colour is named after the fruit. //requires object4b tooltip +[{"op":"test","path":"/description","value":"It's an orange."},{"op":"replace","path":"/description","value":"An orange. The colour is named after the fruit."}], +[{"op":"add","path":"/sb_plateOffset","value":0.075}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_orangejuice"}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_orangejam"}], -[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}] +[{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], +[{"op":"test","path":"/builder","value":"/items/buildscripts/buildfood.lua"},{"op":"replace","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":45}}] ] \ No newline at end of file diff --git a/items/generic/produce/orange.png b/items/generic/produce/orange.png new file mode 100644 index 00000000..34177f3e Binary files /dev/null and b/items/generic/produce/orange.png differ diff --git a/items/generic/produce/pearlpea.consumable.patch b/items/generic/produce/pearlpea.consumable.patch index 525cb588..70decad0 100644 --- a/items/generic/produce/pearlpea.consumable.patch +++ b/items/generic/produce/pearlpea.consumable.patch @@ -2,7 +2,7 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":"sb_protectionboost5"}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_protectionboost5","duration":23}}], [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}] ] \ No newline at end of file diff --git a/items/generic/produce/pineapple.consumable.patch b/items/generic/produce/pineapple.consumable.patch index 5773a83d..1ee53a90 100644 --- a/items/generic/produce/pineapple.consumable.patch +++ b/items/generic/produce/pineapple.consumable.patch @@ -7,5 +7,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":2}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":60}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":90}}] ] \ No newline at end of file diff --git a/items/generic/produce/potato.consumable.patch b/items/generic/produce/potato.consumable.patch index b4e1d1c5..9f96f1b3 100644 --- a/items/generic/produce/potato.consumable.patch +++ b/items/generic/produce/potato.consumable.patch @@ -2,5 +2,5 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost10","duration":105}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost5","duration":90}}] ] \ No newline at end of file diff --git a/items/generic/produce/pussplum.consumable.patch b/items/generic/produce/pussplum.consumable.patch index 1cb019ce..333d4c18 100644 --- a/items/generic/produce/pussplum.consumable.patch +++ b/items/generic/produce/pussplum.consumable.patch @@ -5,7 +5,8 @@ {"op":"replace","path":"/description","value":"Pussplum! Some claim this juicy fruit is delicious!"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"jumpboostfood","duration":25}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"ragefood","duration":68}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"bouncy","duration":7.5}}], [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}] ] \ No newline at end of file diff --git a/items/generic/produce/reefpod.consumable.patch b/items/generic/produce/reefpod.consumable.patch index d47de457..941fbacb 100644 --- a/items/generic/produce/reefpod.consumable.patch +++ b/items/generic/produce/reefpod.consumable.patch @@ -7,6 +7,6 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost5","duration":90}}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost5","duration":90}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost20","duration":68}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"swimboostcola","duration":68}}] ] \ No newline at end of file diff --git a/items/generic/produce/rice.item.patch b/items/generic/produce/rice.item.patch index 2a68ec1a..94dc0f16 100644 --- a/items/generic/produce/rice.item.patch +++ b/items/generic/produce/rice.item.patch @@ -6,5 +6,10 @@ [{"op":"test","path":"/description","value":"Rice. Grains of goodness."}, {"op":"replace","path":"/description","value":"Rice. Grains of goodness. Good for when you're hungry and want to eat a thousand of something."}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":""}],[{"op":"replace","path":"/tooltipKind","value":"fossil"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":""}],[{"op":"replace","path":"/tooltipKind","value":"fossil"}], +[{"op":"test","path":"/builder","value":"/items/buildscripts/buildfood.lua"},{"op":"replace","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], +[{"op":"test","path":"/builder","inverse":true},{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildfood.lua"}], + +[{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"maxhealthboost5","duration":23}}] ] \ No newline at end of file diff --git a/items/generic/produce/sb_poisoncreep.consumable b/items/generic/produce/sb_poisoncreep.consumable index 0de6765c..024ac097 100644 --- a/items/generic/produce/sb_poisoncreep.consumable +++ b/items/generic/produce/sb_poisoncreep.consumable @@ -1,17 +1,18 @@ { - "itemName" : "sb_poisoncreep", - "price" : 100, - "foodValue" : 2.5, - "effects" : [["sb_poisoncreep"]], - "tooltipKind" : "sb_object4", - "eventCategory" : "eventCrop", - "rarity" : "Common", - "inventoryIcon" : "sb_poisoncreep.png", - "category" : "food", - "description" : "These berries are poisonous to anyone but those of aquatic disposition.", - "shortdescription" : "Poisoncreep", - "emitters" : ["eating"], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 1.5 -} \ No newline at end of file + "itemName": "sb_poisoncreep", + "price": 100, + "foodValue": 2.5, + "effects": [["sb_poisoncreep"]], + "tooltipKind": "sb_object4", + "eventCategory": "eventCrop", + "rarity": "Common", + "inventoryIcon": "sb_poisoncreep.png", + "category": "food", + "description": "These berries are poisonous to anyone but those of aquatic disposition.", + "shortdescription": "Poisoncreep", + "emitters": ["eating"], + "learnBlueprintsOnPickup": ["sb_brineapple"], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 1.5 +} diff --git a/items/generic/produce/sb_poisoncreep.png b/items/generic/produce/sb_poisoncreep.png index d27c9fb0..c60f6585 100644 Binary files a/items/generic/produce/sb_poisoncreep.png and b/items/generic/produce/sb_poisoncreep.png differ diff --git a/items/generic/produce/toxictop.consumable.patch b/items/generic/produce/toxictop.consumable.patch index 62e92b9b..3e31973c 100644 --- a/items/generic/produce/toxictop.consumable.patch +++ b/items/generic/produce/toxictop.consumable.patch @@ -4,5 +4,5 @@ [{"op":"test","path":"/rottingMultiplier","value":1.0},{"op":"replace","path":"/rottingMultiplier","value":1.5}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost30","duration":105}}] +[{"op":"add","path":"/effects/0/-","value":{"effect":"sb_maxenergyboost20","duration":90}}] ] \ No newline at end of file diff --git a/items/generic/sb_meat/cookedfleshlump.consumable b/items/generic/sb_meat/cookedfleshlump.consumable index d8b5831d..40461631 100644 --- a/items/generic/sb_meat/cookedfleshlump.consumable +++ b/items/generic/sb_meat/cookedfleshlump.consumable @@ -1,15 +1,15 @@ { - "itemName" : "sb_cookedfleshlump", - "rarity" : "Common", - "price" : 25, - "foodValue" : 20, - "tooltipKind" : "sb_object", - "category" : "preparedFood", - "inventoryIcon" : "cookedfleshlump.png", - "description" : "It's a cooked hunk of flesh of questionable origin.", - "shortdescription" : "Cooked Flesh Lump", - "effects" : [["sb_foodheal50"]], - "learnBlueprintsOnPickup" : ["sb_meatchunks"], - "handPosition" : [0, -4], - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_cookedfleshlump", + "rarity": "Common", + "price": 25, + "foodValue": 20, + "tooltipKind": "sb_object", + "category": "preparedFood", + "inventoryIcon": "cookedfleshlump.png", + "description": "It's a cooked hunk of flesh of questionable origin.", + "shortdescription": "Cooked Flesh Lump", + "effects": [["sb_foodheal50"]], + "learnBlueprintsOnPickup": ["sb_meatchunks"], + "handPosition": [0, -4], + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/sb_meat/cookedfleshlump.png b/items/generic/sb_meat/cookedfleshlump.png index 8534c15c..7c0cc675 100644 Binary files a/items/generic/sb_meat/cookedfleshlump.png and b/items/generic/sb_meat/cookedfleshlump.png differ diff --git a/items/generic/sb_meat/meatchunks.consumable b/items/generic/sb_meat/meatchunks.consumable index cb9cbc9b..83ce7cb3 100644 --- a/items/generic/sb_meat/meatchunks.consumable +++ b/items/generic/sb_meat/meatchunks.consumable @@ -1,13 +1,13 @@ { - "itemName" : "sb_meatchunks", - "rarity" : "Common", - "price" : 15, - "foodValue" : 15, - "tooltipKind" : "sb_object", - "category" : "food", - "inventoryIcon" : "meatchunks.png", - "description" : "Chunks of pulverized meat. A little overcooked.", - "shortdescription" : "Meat Chunks", - "handPosition" : [0, -2], - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_meatchunks", + "rarity": "Common", + "price": 15, + "foodValue": 15, + "tooltipKind": "sb_object", + "category": "food", + "inventoryIcon": "meatchunks.png", + "description": "Chunks of pulverized meat. A little overcooked.", + "shortdescription": "Meat Chunks", + "handPosition": [0, -2], + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/sb_meat/meatchunks.png b/items/generic/sb_meat/meatchunks.png index 9c37d06b..5a2efdbc 100644 Binary files a/items/generic/sb_meat/meatchunks.png and b/items/generic/sb_meat/meatchunks.png differ diff --git a/items/generic/sb_meat/offal.consumable b/items/generic/sb_meat/offal.consumable index ceaffa1e..87b9f6db 100644 --- a/items/generic/sb_meat/offal.consumable +++ b/items/generic/sb_meat/offal.consumable @@ -1,13 +1,17 @@ { - "itemName" : "sb_offal", - "rarity" : "rare", - "price" : 90, - "foodValue" : 60, - "effects" : [["foodpoison"]], - "tooltipKind" : "sb_object", - "inventoryIcon" : "offal.png", - "category" : "food", - "description" : "All the scraps that most people won't touch. Good, if you can get past the texture...", - "shortdescription" : "Offal", - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_offal", + "rarity": "rare", + "price": 90, + "foodValue": 60, + "effects": [[{ + "effect": "foodpoison", + "duration": 5 + } + ]], + "tooltipKind": "sb_object", + "inventoryIcon": "offal.png", + "category": "food", + "description": "All the scraps that most people won't touch. Good, if you can get past the texture...", + "shortdescription": "Offal", + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/sb_meat/rawfleshlump.consumable b/items/generic/sb_meat/rawfleshlump.consumable index 7f344385..2245f553 100644 --- a/items/generic/sb_meat/rawfleshlump.consumable +++ b/items/generic/sb_meat/rawfleshlump.consumable @@ -1,14 +1,14 @@ { - "itemName" : "sb_rawfleshlump", - "rarity" : "Common", - "price" : 20, - "foodValue" : 10, - "tooltipKind" : "sb_object", - "inventoryIcon" : "rawfleshlump.png", - "category" : "food", - "description" : "A raw lump of flesh of questionable origin. It'd be more palatable cooked.", - "shortdescription" : "Flesh Lump", - "learnBlueprintsOnPickup" : ["sb_cookedfleshlump"], - "handPosition" : [0, -4], - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_rawfleshlump", + "rarity": "Common", + "price": 20, + "foodValue": 10, + "tooltipKind": "sb_object", + "inventoryIcon": "rawfleshlump.png", + "category": "food", + "description": "A raw lump of flesh of questionable origin. It'd be more palatable cooked.", + "shortdescription": "Flesh Lump", + "learnBlueprintsOnPickup": ["sb_cookedfleshlump"], + "handPosition": [0, -4], + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/sb_meat/rawfleshlump.png b/items/generic/sb_meat/rawfleshlump.png index 17df6939..db23550c 100644 Binary files a/items/generic/sb_meat/rawfleshlump.png and b/items/generic/sb_meat/rawfleshlump.png differ diff --git a/items/generic/sb_meat/soylentgreen.consumable b/items/generic/sb_meat/soylentgreen.consumable index ae7777c1..64542e44 100644 --- a/items/generic/sb_meat/soylentgreen.consumable +++ b/items/generic/sb_meat/soylentgreen.consumable @@ -1,12 +1,12 @@ { - "itemName" : "sb_soylentgreen", - "rarity" : "Common", - "price" : 20, - "foodValue" : 10, - "tooltipKind" : "sb_object", - "inventoryIcon" : "soylentgreen.png", - "category" : "food", - "description" : "I wonder what this is...", - "shortdescription" : "Soylent Green", - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_soylentgreen", + "rarity": "Common", + "price": 20, + "foodValue": 10, + "tooltipKind": "sb_object", + "inventoryIcon": "soylentgreen.png", + "category": "food", + "description": "I wonder what this is...", + "shortdescription": "Soylent Green", + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/shop/cannedfood.consumable.patch b/items/generic/shop/cannedfood.consumable.patch index 5e134ccb..60f1cca7 100644 --- a/items/generic/shop/cannedfood.consumable.patch +++ b/items/generic/shop/cannedfood.consumable.patch @@ -1,4 +1,7 @@ [ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], -[{"op":"add","path":"/sb_plateImage","value":true},{"op":"add","path":"/sb_plateHide","value":true}] +[{"op":"add","path":"/sb_plateImage","value":true},{"op":"add","path":"/sb_plateHide","value":true}], +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Rare"}], +[{"op":"test","path":"/price","value":40},{"op":"replace","path":"/price","value":125}], +[{"op":"test","path":"/category","value":"food"},{"op":"replace","path":"/category","value":"preparedFood"}] ] \ No newline at end of file diff --git a/items/generic/shop/chocolate.consumable.patch b/items/generic/shop/chocolate.consumable.patch index 0cf7ae4e..ae3c35ab 100644 --- a/items/generic/shop/chocolate.consumable.patch +++ b/items/generic/shop/chocolate.consumable.patch @@ -2,7 +2,7 @@ [{"op":"test","path":"/maxStack"},{"op":"remove","path":"/maxStack"}], [{"op":"test","path":"/effects","inverse":true},{"op":"add","path":"/effects","value":[[]]}], -[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":30}}], +[{"op":"add","path":"/effects/0/-","value":{"effect":"runboostfood","duration":135}}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_chocolate"}] diff --git a/items/generic/shop/sb_candy.consumable b/items/generic/shop/sb_candy.consumable index 9d350b2e..de38dc23 100644 --- a/items/generic/shop/sb_candy.consumable +++ b/items/generic/shop/sb_candy.consumable @@ -1,17 +1,20 @@ { - "itemName" : "sb_candy", - "rarity" : "Common", - "price" : 50, - "foodValue" : 5, - "tooltipKind" : "sb_object4", - "inventoryIcon" : "sb_candy.png", - "category" : "preparedFood", - "description" : "Hard candy. It probably won't do much for me if I'm starving, but it sure is tasty.", - "effects" : [[ - "sb_foodheal10" - ]], - "shortdescription" : "Candy", - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 5 -} \ No newline at end of file + "itemName": "sb_candy", + "rarity": "Common", + "price": 50, + "foodValue": 5, + "tooltipKind": "sb_object4", + "inventoryIcon": "sb_candy.png", + "category": "preparedFood", + "description": "Hard candy. It probably won't do much for me if I'm starving, but it sure is tasty.", + "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 45 + }, + "sb_foodheal10" + ]], + "shortdescription": "Candy", + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 5 +} diff --git a/items/generic/shop/sb_meatballs.consumable b/items/generic/shop/sb_meatballs.consumable index f505affc..88a7dda3 100644 --- a/items/generic/shop/sb_meatballs.consumable +++ b/items/generic/shop/sb_meatballs.consumable @@ -1,19 +1,19 @@ { - "itemName" : "sb_meatballs", - "rarity" : "unCommon", - "sb_plateHide" : true, - "price" : 20, - "foodValue" : 30, - "tooltipKind" : "sb_object4", - "effects" : [[ - "sb_foodheal95" - ]], - "inventoryIcon" : "sb_meatballs.png", - "category" : "food", - "description" : "Meatballs in a can. Not quite homemade, but then again, we're in space.", - "shortdescription" : "Meatballs", - "handPosition" : [0, -2], - "builder" : "/items/buildscripts/starbound/buildfood.lua", - "itemAgingScripts" : ["/scripts/items/rotting.lua"], - "rottingMultiplier" : 10 -} \ No newline at end of file + "itemName": "sb_meatballs", + "rarity": "unCommon", + "sb_plateHide": true, + "price": 75, + "foodValue": 30, + "tooltipKind": "sb_object4b", + "effects": [[ + "sb_foodheal95" + ]], + "inventoryIcon": "sb_meatballs.png", + "category": "food", + "description": "Meatballs in a can. Not quite homemade, but then again, we're in space. Plus, they'll keep a lot longer.", + "shortdescription": "Canned Meatballs", + "handPosition": [0, -2], + "builder": "/items/buildscripts/starbound/buildfood.lua", + "itemAgingScripts": ["/scripts/items/rotting.lua"], + "rottingMultiplier": 10 +} diff --git a/items/generic/tradingcards/sb_card01.png b/items/generic/tradingcards/sb_card01.png index 3aa83c27..58af1294 100644 Binary files a/items/generic/tradingcards/sb_card01.png and b/items/generic/tradingcards/sb_card01.png differ diff --git a/items/generic/unlock/sb_blueprint.activeitem b/items/generic/unlock/sb_blueprint.activeitem index 8911a874..e7f95898 100644 --- a/items/generic/unlock/sb_blueprint.activeitem +++ b/items/generic/unlock/sb_blueprint.activeitem @@ -1,14 +1,14 @@ { - "itemName" : "sb_blueprint", - "rarity" : "uncommon", - "tooltipKind" : "sb_object",//"base", - "shortdescription" : "Blueprint", - "category" : "Blueprint", - "twoHanded" : false, - "sb_copybook" : true, - "inventoryIcon" : "sb_blueprint.png", - "sb_recipe" : "perfectlygenericitem", - "animation" : "sb_blueprint.animation", - "scripts" : ["sb_blueprint.lua"], - "swingTime" : 0.15 -} \ No newline at end of file + "itemName": "sb_blueprint", + "rarity": "uncommon", + "tooltipKind": "sb_object", //"base", + "shortdescription": "Blueprint", + "category": "Blueprint", + "twoHanded": false, + "itemTags": ["sb_copybook"], //for lectern + "inventoryIcon": "sb_blueprint.png", + "sb_recipe": "perfectlygenericitem", + "animation": "sb_blueprint.animation", + "scripts": ["sb_blueprint.lua"], + "useTime": 0.05 +} diff --git a/items/generic/unlock/sb_blueprint.lua b/items/generic/unlock/sb_blueprint.lua index 863d0b40..6bf05094 100644 --- a/items/generic/unlock/sb_blueprint.lua +++ b/items/generic/unlock/sb_blueprint.lua @@ -1,51 +1,24 @@ require "/scripts/sb_uimessage.lua" require "/scripts/sb_assetmissing.lua" ---does not work with sb_swing -function init() - swingTime = config.getParameter("swingTime",1) - activeItem.setArmAngle(-math.pi / 2) -end +require "/scripts/activeitem/sb_swing.lua" -function update(dt, fireMode, shiftHeld) - updateAim() +function init() swingInit() end - if not swingTimer and fireMode == "primary" and player then - swingTimer = swingTime - end - - if swingTimer then - swingTimer = math.max(0, swingTimer - dt) - activeItem.setArmAngle((-math.pi / 2) * (swingTimer / swingTime)) - if swingTimer == 0 then - learnBlueprint(shiftHeld) - activeItem.setArmAngle(-math.pi / 2) - end - end -end - -function learnBlueprint(shiftHeld) +function swingAction(_, _, shiftHeld) local recipe = config.getParameter("recipe",config.getParameter("sb_recipe","perfectlygenericitem")) if shiftHeld then if sb_itemExists((type(recipe)=="string" and recipe or recipe.name).."-recipe") then if type(recipe) ~= "string" then recipe = recipe.name or config.getParameter("sb_recipe","perfectlygenericitem") end player.giveItem(recipe.."-recipe") item.consume(1) - swingTimer = swingTime return end end if not player.blueprintKnown(recipe) then player.giveBlueprint(recipe) item.consume(1) - script.setUpdateDelta(0) animator.playSound("learnBlueprint") else - script.setUpdateDelta(0) - sb_uiMessage(7) + sb_uiMessage("blueprintKnown") end -end - -function updateAim() - aimAngle, aimDirection = activeItem.aimAngleAndDirection(0, activeItem.ownerAimPosition()) - activeItem.setFacingDirection(aimDirection) end \ No newline at end of file diff --git a/items/generic/unlock/sb_blueprint.png b/items/generic/unlock/sb_blueprint.png index f703fd04..e7bafbb6 100644 Binary files a/items/generic/unlock/sb_blueprint.png and b/items/generic/unlock/sb_blueprint.png differ diff --git a/items/generic/unlock/sb_blueprints.png b/items/generic/unlock/sb_blueprints.png index 67c80850..e6c5fce8 100644 Binary files a/items/generic/unlock/sb_blueprints.png and b/items/generic/unlock/sb_blueprints.png differ diff --git a/items/generic/unlock/sb_musicsheet.item b/items/generic/unlock/sb_musicsheet.item index 21f34247..386b7c1b 100644 --- a/items/generic/unlock/sb_musicsheet.item +++ b/items/generic/unlock/sb_musicsheet.item @@ -1,14 +1,16 @@ { - "itemName" : "sb_musicsheet", - "price" : 100, - "tooltipKind" : "sb_object", - "rarity" : "uncommon", - "inventoryIcon" : "sb_musicsheet.png", - "category" : "musicalInstrument", - "tooltipFields" : {"subtitle" : "Other"}, - "description" : "This music sheet can be played from a ^orange;Portable or Stationary Radio!^reset;", - "shortdescription" : "Music Sheet", - "sb_copybook" : true, - "radioMessagesOnPickup" : ["sb_pickupmusicsheet"], - "builder" : "/items/buildscripts/starbound/buildmusic.lua" -} \ No newline at end of file + "itemName": "sb_musicsheet", + "price": 100, + "tooltipKind": "sb_object", + "rarity": "uncommon", + "inventoryIcon": "sb_musicsheet.png", + "category": "musicalInstrument", + "tooltipFields": { + "subtitle": "Other" + }, + "description": "This music sheet can be played from a ^orange;Portable or Stationary Radio!^reset;", + "shortdescription": "Music Sheet", + "itemTags": ["sb_copybook"], + "radioMessagesOnPickup": ["sb_pickupmusicsheet"], + "builder": "/items/buildscripts/starbound/buildmusic.lua" +} diff --git a/items/generic/unlock/sb_musicsheet.png b/items/generic/unlock/sb_musicsheet.png index 054134cd..2c01689a 100644 Binary files a/items/generic/unlock/sb_musicsheet.png and b/items/generic/unlock/sb_musicsheet.png differ diff --git a/items/generic/unlock/sb_portable3dprinter.activeitem b/items/generic/unlock/sb_portable3dprinter.activeitem deleted file mode 100644 index ca47035b..00000000 --- a/items/generic/unlock/sb_portable3dprinter.activeitem +++ /dev/null @@ -1,12 +0,0 @@ -{ - "itemName" : "sb_portable3dprinter", - "rarity" : "Legendary", - "category" : "tool", - "price" : 750, - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_portable3dprinter.png", //slightly modified icon with 254 alpha - "animation" : "sb_portable3dprinter.animation", - "shortdescription" : "^orange;Portable Pixel Printer^reset;", - "description" : "Used to craft small hi-tech items on-the-fly.", - "scripts" : ["sb_portable3dprinter.lua"] -} \ No newline at end of file diff --git a/items/generic/unlock/sb_portable3dprinter.animation b/items/generic/unlock/sb_portable3dprinter.animation deleted file mode 100644 index 55333fb0..00000000 --- a/items/generic/unlock/sb_portable3dprinter.animation +++ /dev/null @@ -1 +0,0 @@ -{"sounds":{"error":["/sfx/interface/clickon_error.ogg"],"success":["/sfx/interface/stationtransponder_valid2.ogg"]}} \ No newline at end of file diff --git a/items/generic/unlock/sb_portable3dprinter.lua b/items/generic/unlock/sb_portable3dprinter.lua deleted file mode 100644 index eee9c037..00000000 --- a/items/generic/unlock/sb_portable3dprinter.lua +++ /dev/null @@ -1,5 +0,0 @@ -require "/scripts/sb_uimessage.lua" -require "/scripts/activeitem/sb_cursors.lua" -function init() sb_cursor("power") activeItem.setHoldingItem(false) end -function activate() if world.placeObject("sb_portable3dprinterobject",world.entityPosition(activeItem.ownerEntityId())) == false then -animator.playSound("error") sb_uiMessage(4) else animator.playSound("success") end end \ No newline at end of file diff --git a/items/generic/unlock/sb_portable3dprinter.png b/items/generic/unlock/sb_portable3dprinter.png deleted file mode 100644 index 5bace00f..00000000 Binary files a/items/generic/unlock/sb_portable3dprinter.png and /dev/null differ diff --git a/items/generic/unlock/sb_quest.png b/items/generic/unlock/sb_quest.png index 24c2b0d9..b863c19b 100644 Binary files a/items/generic/unlock/sb_quest.png and b/items/generic/unlock/sb_quest.png differ diff --git a/items/generic/unlock/sb_techupgrade.animation b/items/generic/unlock/sb_techupgrade.animation new file mode 100644 index 00000000..7cb4ee0d --- /dev/null +++ b/items/generic/unlock/sb_techupgrade.animation @@ -0,0 +1 @@ +{"sounds":{"success":["/sfx/interface/item_holster.ogg"]}} \ No newline at end of file diff --git a/items/generic/celestial/sb_techupgrade.lua b/items/generic/unlock/sb_techupgrade.lua similarity index 80% rename from items/generic/celestial/sb_techupgrade.lua rename to items/generic/unlock/sb_techupgrade.lua index 6b6d098d..9ea9227f 100644 --- a/items/generic/celestial/sb_techupgrade.lua +++ b/items/generic/unlock/sb_techupgrade.lua @@ -4,10 +4,14 @@ require "/scripts/activeitem/sb_swing.lua" function init() swingInit() recipes = config.getParameter("recipes",{"money"}) + reset() +end + +function reset() reusable, consume, used = config.getParameter("reusable",false), false, false end -function swingAction() animateSwing() +function swingAction() for i = 1, #recipes do if not player.blueprintKnown(recipes[i]) then consume = not reusable @@ -19,6 +23,7 @@ function swingAction() animateSwing() if used then animator.playSound("success") else - sb_uiMessage(11) + sb_uiMessage("blueprint"..(#recipes == 1 and "" or "s").."Known") end + reset() end \ No newline at end of file diff --git a/items/generic/unlock/sb_techupgrade1.activeitem b/items/generic/unlock/sb_techupgrade1.activeitem new file mode 100644 index 00000000..a079ae7e --- /dev/null +++ b/items/generic/unlock/sb_techupgrade1.activeitem @@ -0,0 +1,17 @@ +{ + "itemName": "sb_techupgrade1", + "price": 325, + "rarity": "essential", + "tooltipFields": { + "rarityLabel": "Critical", + "subtitle": "Tech Upgrade" + }, + "tooltipKind": "sb_object", + "shortdescription": "^#ff0;Metalworking Upgrade^reset;", + "description": "Unlocks the ability to create steel, an alloy made with iron at an ^orange;Industrial Furnace^reset;.", + "category": "upgradeComponent", + "animation": "sb_techupgrade.animation", + "inventoryIcon": "sb_techupgrade1.png", + "scripts": ["sb_techupgrade.lua"], + "recipes": ["sb_steelbar"] +} diff --git a/items/generic/celestial/sb_techupgrade1.png b/items/generic/unlock/sb_techupgrade1.png similarity index 100% rename from items/generic/celestial/sb_techupgrade1.png rename to items/generic/unlock/sb_techupgrade1.png diff --git a/items/generic/unlock/sb_techupgrade2.activeitem b/items/generic/unlock/sb_techupgrade2.activeitem new file mode 100644 index 00000000..81f40cad --- /dev/null +++ b/items/generic/unlock/sb_techupgrade2.activeitem @@ -0,0 +1,17 @@ +{ + "itemName": "sb_techupgrade2", + "price": 750, + "rarity": "essential", + "tooltipFields": { + "rarityLabel": "Critical", + "subtitle": "Tech Upgrade" + }, + "tooltipKind": "sb_object4", + "shortdescription": "^#ff0;Compounding Upgrade^reset;", + "description": "Unlocks the ability to create scintillium, cerulium, and impervium compounds at an ^orange;Atomic Furnace^reset;.", + "category": "upgradeComponent", + "animation": "sb_techupgrade.animation", + "inventoryIcon": "sb_techupgrade2.png", + "scripts": ["sb_techupgrade.lua"], + "recipes": ["sb_feroziumcompound", "sb_ceruliumcompound", "sb_imperviumcompound"] +} diff --git a/items/generic/celestial/sb_techupgrade2.png b/items/generic/unlock/sb_techupgrade2.png similarity index 100% rename from items/generic/celestial/sb_techupgrade2.png rename to items/generic/unlock/sb_techupgrade2.png diff --git a/items/generic/unsorted/sb_empty.currency b/items/generic/unsorted/sb_empty.currency index e017e453..cda9da53 100644 --- a/items/generic/unsorted/sb_empty.currency +++ b/items/generic/unsorted/sb_empty.currency @@ -1,12 +1,12 @@ { - "itemName" : "sb_empty", - "shortdescription" : "^clear;", - "currency" : "sb_uimessage", - "rarity" : "essential", - "tooltipKind" : "simpleTooltip", - "inventoryIcon" : "/interface/actionbar/actionbarcover.png?replace;000=0000?border=1;000", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/item_equip.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file + "itemName": "sb_empty", + "shortdescription": "^clear;", + "currency": "sb_uimessage", + "rarity": "essential", + "tooltipKind": "simpleTooltip", + "inventoryIcon": "/interface/actionbar/actionbarcover.png?replace;000=0000?border=1;000", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/item_equip.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/items/generic/unsorted/sb_revoltingstew.png b/items/generic/unsorted/sb_revoltingstew.png index 087b7351..595dc380 100644 Binary files a/items/generic/unsorted/sb_revoltingstew.png and b/items/generic/unsorted/sb_revoltingstew.png differ diff --git a/items/generic/unsorted/sb_rottenapple.consumable b/items/generic/unsorted/sb_rottenapple.consumable index f8e41869..e21f1933 100644 --- a/items/generic/unsorted/sb_rottenapple.consumable +++ b/items/generic/unsorted/sb_rottenapple.consumable @@ -1,15 +1,17 @@ { - "itemName" : "sb_rottenapple", - "price" : 10, - "foodValue" : 4.7, - "tooltipKind" : "sb_object", - "rarity" : "Common", - "inventoryIcon" : "sb_rottenapple.png", - "category" : "foodJunk", - "description" : "This apple is clearly rotten. It's even got a worm writhing around in it... do I dare?", - "tooltipFields" : {"subtitle" : "Food"}, - "shortdescription" : "Rotten Apple", - "handPosition" : [2, 0], - "learnBlueprintsOnPickup" : ["sb_rottenapple"], - "builder" : "/items/buildscripts/starbound/buildfood.lua" -} \ No newline at end of file + "itemName": "sb_rottenapple", + "price": 10, + "foodValue": 4.7, + "tooltipKind": "sb_object", + "rarity": "Common", + "inventoryIcon": "sb_rottenapple.png", + "category": "foodJunk", + "description": "This apple is clearly rotten. It's even got a worm writhing around in it... do I dare?", + "tooltipFields": { + "subtitle": "Food" + }, + "shortdescription": "Rotten Apple", + "handPosition": [2, 0], + "learnBlueprintsOnPickup": ["sb_rottenapple"], + "builder": "/items/buildscripts/starbound/buildfood.lua" +} diff --git a/items/generic/unsorted/sb_rottenapple.png b/items/generic/unsorted/sb_rottenapple.png index 669733e8..7ff54325 100644 Binary files a/items/generic/unsorted/sb_rottenapple.png and b/items/generic/unsorted/sb_rottenapple.png differ diff --git a/items/liquids/sb_liquidalienjuice.png b/items/liquids/sb_liquidalienjuice.png index cf90785d..4b2b4468 100644 Binary files a/items/liquids/sb_liquidalienjuice.png and b/items/liquids/sb_liquidalienjuice.png differ diff --git a/items/liquids/sb_liquidcoffee.liqitem b/items/liquids/sb_liquidcoffee.liqitem index e462f3a8..5f2009f2 100644 --- a/items/liquids/sb_liquidcoffee.liqitem +++ b/items/liquids/sb_liquidcoffee.liqitem @@ -6,6 +6,6 @@ "category" : "liquid", "inventoryIcon" : "sb_liquidcoffee.png", "description" : "A measure of nice, warm coffee.", - "shortdescription" : "Coffee", + "shortdescription" : "Liquid Coffee", "liquid" : "sb_coffee" } \ No newline at end of file diff --git a/items/liquids/sb_liquidtentaclejuice.png b/items/liquids/sb_liquidtentaclejuice.png index 06f2a180..69b583c5 100644 Binary files a/items/liquids/sb_liquidtentaclejuice.png and b/items/liquids/sb_liquidtentaclejuice.png differ diff --git a/items/materials/alienstripedwood.png b/items/materials/alienstripedwood.png index c1180926..910c6aed 100644 Binary files a/items/materials/alienstripedwood.png and b/items/materials/alienstripedwood.png differ diff --git a/items/materials/junktech.matitem.patch b/items/materials/junktech.matitem.patch index 091d3712..7c73ec0a 100644 --- a/items/materials/junktech.matitem.patch +++ b/items/materials/junktech.matitem.patch @@ -1,3 +1,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":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/items/materials/ridgebrick.matitem.patch b/items/materials/ridgebrick.matitem.patch new file mode 100644 index 00000000..48402525 --- /dev/null +++ b/items/materials/ridgebrick.matitem.patch @@ -0,0 +1,11 @@ +[ + [ + {"op":"test","path":"/learnBlueprintsOnPickup","inverse":true}, + {"op":"add","path":"/learnBlueprintsOnPickup","value":[]} + ], + [ + {"op":"test","path":"/shortdescription","value":"Ridged Block"}, + {"op":"replace","path":"/shortdescription","value":"Ridged Brick"} + ], + [{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"ridgebrick"}] +] \ No newline at end of file diff --git a/items/materials/sb_brains.png b/items/materials/sb_brains.png index 20d9b12b..202ec575 100644 Binary files a/items/materials/sb_brains.png and b/items/materials/sb_brains.png differ diff --git a/items/materials/sb_hive.png b/items/materials/sb_hive.png index 00ee067d..8264b61a 100644 Binary files a/items/materials/sb_hive.png and b/items/materials/sb_hive.png differ diff --git a/items/materials/sb_slopedpolygonicon.png b/items/materials/sb_slopedpolygonicon.png index bfb1076b..75019192 100644 Binary files a/items/materials/sb_slopedpolygonicon.png and b/items/materials/sb_slopedpolygonicon.png differ diff --git a/items/materials/sb_smoothconcreteicon.png b/items/materials/sb_smoothconcreteicon.png index 6482eb09..f9c27d30 100644 Binary files a/items/materials/sb_smoothconcreteicon.png and b/items/materials/sb_smoothconcreteicon.png differ diff --git a/items/sb_consumable.animation b/items/sb_consumable.animation index e25d38f4..456e9e1f 100644 --- a/items/sb_consumable.animation +++ b/items/sb_consumable.animation @@ -1,8 +1,15 @@ { - "sounds" : { - "none" : [], - "drink" : ["/sfx/humanoid/drink.ogg"], - "food" : ["/sfx/humanoid/eat3.ogg"], - "medicine" : ["/sfx/statuseffects/stimuse.ogg", "/sfx/statuseffects/powerup.ogg"] + "sounds": { + "none": [], + "drink": ["/sfx/humanoid/drink.ogg"], + "food": ["/sfx/humanoid/eat1.ogg", "/sfx/humanoid/eat2.ogg", "/sfx/humanoid/eat3.ogg", "/sfx/humanoid/eat4.ogg"], + "medicine": ["/sfx/statuseffects/stimuse.ogg"], + "medicine2": ["/sfx/statuseffects/powerup.ogg"] + }, + //effectsources can play an entire list of sounds at once, whereas playSound plays a single one from the list + //This is my solution. I did it this way so it can be patched by multiple mods + //Also I don't really want to add crumbs + "extraSounds": { + "medicine": ["2"] } -} \ No newline at end of file +} diff --git a/items/sb_consumable.lua b/items/sb_consumable.lua index af168cd3..4e7ef361 100644 --- a/items/sb_consumable.lua +++ b/items/sb_consumable.lua @@ -1,4 +1,9 @@ function init() + animationConfig = config.getParameter("animation") + if animationConfig then + local itemConfig = root.itemConfig(config.getParameter("itemName")) + animationConfig = root.assetJson(animationConfig:sub(1,1) == "/" and animationConfig or itemConfig.directory..itemConfig.config.animation).extraSounds + end activeItem.setArmAngle(-math.pi / 2) swingStart = config.getParameter("swingStart", -60) * math.pi / 180 swingFinish = config.getParameter("swingFinish", 40) * math.pi / 180 @@ -47,7 +52,15 @@ function update(dt, fireMode) if currentAngle >= swingFinish then -- and useTimer <= 0 then applyAdditionalEffects() - animator.playSound(soundSet[math.random(#soundSet)]) + local selectedSoundSet = soundSet[math.random(#soundSet)] + if animationConfig[selectedSoundSet] then + animator.playSound(selectedSoundSet) + for i = 1, #animationConfig[selectedSoundSet] do + animator.playSound(selectedSoundSet..animationConfig[selectedSoundSet][i]) + end + else + animator.playSound(selectedSoundSet) + end if emote then activeItem.emote(emote[math.random(#emote)]) end if status.isResource(resource) then if giveWellfed and status.resourceMax(resource) <= foodValue + status.resource(resource) then diff --git a/items/skyrail/skyrailicon_asc.png b/items/skyrail/skyrailicon_asc.png index 37619694..5a817949 100644 Binary files a/items/skyrail/skyrailicon_asc.png and b/items/skyrail/skyrailicon_asc.png differ diff --git a/items/skyrail/skyrailicon_boost.png b/items/skyrail/skyrailicon_boost.png index 2852d284..db3fe034 100644 Binary files a/items/skyrail/skyrailicon_boost.png and b/items/skyrail/skyrailicon_boost.png differ diff --git a/items/skyrail/skyrailicon_break.png b/items/skyrail/skyrailicon_break.png index bdfb6cf8..f0214f1f 100644 Binary files a/items/skyrail/skyrailicon_break.png and b/items/skyrail/skyrailicon_break.png differ diff --git a/items/skyrail/skyrailicon_desc.png b/items/skyrail/skyrailicon_desc.png index d825a446..31aecdfb 100644 Binary files a/items/skyrail/skyrailicon_desc.png and b/items/skyrail/skyrailicon_desc.png differ diff --git a/items/skyrail/skyrailicon_diodel.png b/items/skyrail/skyrailicon_diodel.png index 5ee978b5..4e3f0879 100644 Binary files a/items/skyrail/skyrailicon_diodel.png and b/items/skyrail/skyrailicon_diodel.png differ diff --git a/items/skyrail/skyrailicon_dioder.png b/items/skyrail/skyrailicon_dioder.png index fc79f3cb..c1669183 100644 Binary files a/items/skyrail/skyrailicon_dioder.png and b/items/skyrail/skyrailicon_dioder.png differ diff --git a/items/skyrail/skyrailplatform.png b/items/skyrail/skyrailplatform.png index e5f13fbc..03edf7f5 100644 Binary files a/items/skyrail/skyrailplatform.png and b/items/skyrail/skyrailplatform.png differ diff --git a/items/throwables/bomb.thrownitem.patch b/items/throwables/bomb.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/bomb.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/bowlingball.thrownitem.patch b/items/throwables/bowlingball.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/bowlingball.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/capturepod.thrownitem.patch b/items/throwables/capturepod.thrownitem.patch new file mode 100644 index 00000000..7e7f9c7d --- /dev/null +++ b/items/throwables/capturepod.thrownitem.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"rare"}] +] \ No newline at end of file diff --git a/items/throwables/coconut.thrownitem.patch b/items/throwables/coconut.thrownitem.patch index 9f0871ac..d8c484bf 100644 --- a/items/throwables/coconut.thrownitem.patch +++ b/items/throwables/coconut.thrownitem.patch @@ -1,4 +1,8 @@ [ [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"coconutblock"}] +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"coconutblock"}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/energyjavelin.thrownitem.patch b/items/throwables/energyjavelin.thrownitem.patch index 7e7f9c7d..e70aedd9 100644 --- a/items/throwables/energyjavelin.thrownitem.patch +++ b/items/throwables/energyjavelin.thrownitem.patch @@ -1,3 +1,7 @@ [ -[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"rare"}] +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"rare"}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":6}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/firework.thrownitem.patch b/items/throwables/firework.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/firework.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/fireworkblue.thrownitem.patch b/items/throwables/fireworkblue.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/fireworkblue.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/fireworkgreen.thrownitem.patch b/items/throwables/fireworkgreen.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/fireworkgreen.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/hivebomb.thrownitem.patch b/items/throwables/hivebomb.thrownitem.patch index 318f041d..36857636 100644 --- a/items/throwables/hivebomb.thrownitem.patch +++ b/items/throwables/hivebomb.thrownitem.patch @@ -2,5 +2,9 @@ [{"op":"test","path":"/description","value":"Careful! These bugs have a deadly sting."}, {"op":"replace","path":"/description","value":"Mind your aim and be careful! These creepy critters have a deadly sting and can eat through just about anything."}], [{"op":"test","path":"/tooltipKind","inverse":true}, -{"op":"add","path":"/tooltipKind","value":"fossil"}] +{"op":"add","path":"/tooltipKind","value":"fossil"}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":2}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/huntingspear.thrownitem.patch b/items/throwables/huntingspear.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/huntingspear.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/javelin.thrownitem.patch b/items/throwables/javelin.thrownitem.patch index ae273901..f7ec521b 100644 --- a/items/throwables/javelin.thrownitem.patch +++ b/items/throwables/javelin.thrownitem.patch @@ -1,5 +1,9 @@ [ [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], -[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":5}] +[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":5}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":4}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/molotov.thrownitem.patch b/items/throwables/molotov.thrownitem.patch index b6970cee..347628a0 100644 --- a/items/throwables/molotov.thrownitem.patch +++ b/items/throwables/molotov.thrownitem.patch @@ -1,5 +1,9 @@ [ [{"op":"test","path":"/description","value":"The liquid in this bottle is highly flammable."}, {"op":"replace","path":"/description","value":"The liquid in this bottle is highly flammable. For the anarchist in all of us."}], -[{"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":"/level","inverse":true},{"op":"add","path":"/level","value":3}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/sb_capturepod.png b/items/throwables/sb_capturepod.png deleted file mode 100644 index 6f01e1cf..00000000 Binary files a/items/throwables/sb_capturepod.png and /dev/null differ diff --git a/items/throwables/sb_capturepod.thrownitem b/items/throwables/sb_capturepod.thrownitem deleted file mode 100644 index 4ee1bc49..00000000 --- a/items/throwables/sb_capturepod.thrownitem +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_capturepod", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_capturepod.png", - "image" : "sb_capturepod.png", - "shortdescription" : "Transport Pod", - "category" : "throwableItem", - "description" : "Throw it at a small grounded monster below 50% health. Maybe you'll get lucky.", - "price" : 120, - "ammoUsage" : 1, - - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "sb_capturepod", - "projectileConfig" : { - "speed" : 30, - "level" : 7, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] - } - ] - } -} \ No newline at end of file diff --git a/items/throwables/sb_corrosivegrenade.thrownitem b/items/throwables/sb_corrosivegrenade.thrownitem index 8bbdf8cf..bc275d86 100644 --- a/items/throwables/sb_corrosivegrenade.thrownitem +++ b/items/throwables/sb_corrosivegrenade.thrownitem @@ -1,30 +1,30 @@ { - "itemName" : "sb_corrosivegrenade", - "rarity" : "unCommon", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_corrosivegrenade.png", - "image" : "sb_corrosivegrenade.png", - "category" : "throwableItem", - "shortdescription" : "Corrosive Grenade", - "description" : "A grenade which explodes into corrosive particles.", + "itemName": "sb_corrosivegrenade", + "rarity": "unCommon", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_corrosivegrenade.png", + "image": "sb_corrosivegrenade.png", + "category": "throwableItem", + "shortdescription": "Corrosive Grenade", + "description": "A grenade which explodes into corrosive particles.", + "price": 70, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 4, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "ammoUsage" : 1, - - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "sb_corrosivegrenade", - "projectileConfig" : { - "speed" : 40, - "power" : 15, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_corrosivegrenade", + "projectileConfig": { + "speed": 40, + "power": 15, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_crittercapturepod.png b/items/throwables/sb_crittercapturepod.png deleted file mode 100644 index 81694e20..00000000 Binary files a/items/throwables/sb_crittercapturepod.png and /dev/null differ diff --git a/items/throwables/sb_crittercapturepod.thrownitem b/items/throwables/sb_crittercapturepod.thrownitem deleted file mode 100644 index 776a2182..00000000 --- a/items/throwables/sb_crittercapturepod.thrownitem +++ /dev/null @@ -1,30 +0,0 @@ -{ - "itemName" : "sb_crittercapturepod", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_crittercapturepod.png", - "image" : "sb_crittercapturepod.png", - "shortdescription" : "Critter Capture Pod", - "category" : "throwableItem", - "description" : "Throw it at a critter to gently entrap it and bring it to a new home.", - "price" : 200, - "ammoUsage" : 1, - - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "sb_crittercapturepod", - "projectileConfig" : { - "speed" : 30, - "level" : 7, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] - } - ] - } -} \ No newline at end of file diff --git a/items/throwables/sb_cutterleaf.thrownitem b/items/throwables/sb_cutterleaf.thrownitem index c784047e..33ef92a4 100644 --- a/items/throwables/sb_cutterleaf.thrownitem +++ b/items/throwables/sb_cutterleaf.thrownitem @@ -1,30 +1,28 @@ { - "itemName" : "sb_cutterleaf", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_cutterleaf.png", - "image" : "sb_cutterleaf.png", - "shortdescription" : "Cutter Leaf", - "category" : "throwableItem", - "description" : "A sharp-edged leaf that can be thrown for low damage.", - - "ammoUsage" : 1, - - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.2, - - "projectileType" : "sb_cutterleaf", - "projectileConfig" : { - "speed" : 35, - "power" : 5, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "itemName": "sb_cutterleaf", + "rarity": "Common", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_cutterleaf.png", + "image": "sb_cutterleaf.png", + "shortdescription": "Cutter Leaf", + "category": "throwableItem", + "description": "A sharp-edged leaf that can be thrown for low damage.", + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 1, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.2, + "projectileType": "sb_cutterleaf", + "projectileConfig": { + "speed": 35, + "power": 5, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_electrogrenade.png b/items/throwables/sb_electrogrenade.png index cce1193d..eab03830 100644 Binary files a/items/throwables/sb_electrogrenade.png and b/items/throwables/sb_electrogrenade.png differ diff --git a/items/throwables/sb_electrogrenade.thrownitem b/items/throwables/sb_electrogrenade.thrownitem index bed00c6e..41b06c18 100644 --- a/items/throwables/sb_electrogrenade.thrownitem +++ b/items/throwables/sb_electrogrenade.thrownitem @@ -1,29 +1,30 @@ { - "itemName" : "sb_electrogrenade", - "rarity" : "uncommon", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_electrogrenade.png", - "image" : "sb_electrogrenade.png", - "shortdescription" : "Electro Grenade", - "category" : "throwableItem", - "description" : "A grenade which discharges electricity on impact. Shocking!", - "ammoUsage" : 1, - "price" : 95, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "itemName": "sb_electrogrenade", + "rarity": "uncommon", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_electrogrenade.png", + "image": "sb_electrogrenade.png", + "shortdescription": "Electro Grenade", + "category": "throwableItem", + "description": "A grenade which discharges electricity on impact. Shocking!", + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 3, + "ammoUsage": 1, + "price": 95, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_electrogrenade", - "projectileConfig" : { - "speed" : 45, - "power" : 17.5, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_electrogrenade", + "projectileConfig": { + "speed": 45, + "power": 17.5, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_filledcapturepod.png b/items/throwables/sb_filledcapturepod.png deleted file mode 100644 index ef2e71c3..00000000 Binary files a/items/throwables/sb_filledcapturepod.png and /dev/null differ diff --git a/items/throwables/sb_filledcapturepod.thrownitem b/items/throwables/sb_filledcapturepod.thrownitem index ed38bd9d..537e2a92 100644 --- a/items/throwables/sb_filledcapturepod.thrownitem +++ b/items/throwables/sb_filledcapturepod.thrownitem @@ -1,31 +1,28 @@ { - "itemName" : "sb_filledcapturepod", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_filledcapturepod.png", - "image" : "sb_filledcapturepod.png", - "shortdescription" : "Filled Transport Pod", - "category" : "throwableItem", - "description" : "Throw it... Who knows what'll happen?", - "price" : 240, - "maxStack" : 100, - "ammoUsage" : 1, + "itemName": "sb_filledcapturepod", + "rarity": "Rare", + "tooltipKind": "sb_object", + "inventoryIcon": "/items/active/unsorted/filledcapturepod/filledcapturepodicon.png", + "image": "/items/active/unsorted/filledcapturepod/filledcapturepodicon.png", + "shortdescription": "Filled Capture Pod", + "category": "throwableItem", + "description": "Throw it down to release the creature captured inside!", + "price": 1000, + "ammoUsage": 1, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_filledcapturepod", - "projectileConfig" : { - "speed" : 70, - "level" : 7, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_filledcapturepod", + "projectileConfig": { + "speed": 70, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_filledcrittercapturepod.png b/items/throwables/sb_filledcrittercapturepod.png deleted file mode 100644 index 6255328b..00000000 Binary files a/items/throwables/sb_filledcrittercapturepod.png and /dev/null differ diff --git a/items/throwables/sb_filledcrittercapturepod.thrownitem b/items/throwables/sb_filledcrittercapturepod.thrownitem index 8f19df72..ad083747 100644 --- a/items/throwables/sb_filledcrittercapturepod.thrownitem +++ b/items/throwables/sb_filledcrittercapturepod.thrownitem @@ -1,30 +1,27 @@ { - "itemName" : "sb_filledcrittercapturepod", - "rarity" : "Common", - "inventoryIcon" : "sb_filledcrittercapturepod.png", - "image" : "sb_filledcrittercapturepod.png", - "shortdescription" : "Filled Critter Capture Pod", - "category" : "throwableItem", - "description" : "Throw it down to release the critter captured inside!", - "tooltipKind" : "sb_object", - "maxStack" : 100, - "ammoUsage" : 1, - "price" : 500, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "itemName": "sb_filledcrittercapturepod", + "rarity": "Rare", + "inventoryIcon": "/items/active/unsorted/filledcapturepod/filledcapturepodicon.png", + "image": "/items/active/unsorted/filledcapturepod/filledcapturepodicon.png", + "shortdescription": "Filled Capture Pod", + "category": "throwableItem", + "description": "Throw it down to release the creature captured inside!", + "tooltipKind": "sb_object", + "ammoUsage": 1, + "price": 1000, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_filledcrittercapturepod", - "projectileConfig" : { - "speed" : 40, - "level" : 7, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_filledcrittercapturepod", + "projectileConfig": { + "speed": 40, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_gasgrenade.png b/items/throwables/sb_gasgrenade.png index 1d176bfa..a161032e 100644 Binary files a/items/throwables/sb_gasgrenade.png and b/items/throwables/sb_gasgrenade.png differ diff --git a/items/throwables/sb_gasgrenade.thrownitem b/items/throwables/sb_gasgrenade.thrownitem index 47949632..8c6c63f3 100644 --- a/items/throwables/sb_gasgrenade.thrownitem +++ b/items/throwables/sb_gasgrenade.thrownitem @@ -1,30 +1,30 @@ { - "itemName" : "sb_gasgrenade", - "rarity" : "uncommon", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_gasgrenade.png", - "image" : "sb_gasgrenade.png", - "shortdescription" : "Gas Grenade", - "category" : "throwableItem", - "description" : "A gas grenade. It doesn't smell nice!", - "price" : 95, - "ammoUsage" : 1, + "itemName": "sb_gasgrenade", + "rarity": "uncommon", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_gasgrenade.png", + "image": "sb_gasgrenade.png", + "shortdescription": "Gas Grenade", + "category": "throwableItem", + "description": "A gas grenade. It doesn't smell nice!", + "price": 95, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 3, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "sb_gasgrenade", - "projectileConfig" : { - "speed" : 45, - "power" : 15, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_gasgrenade", + "projectileConfig": { + "speed": 45, + "power": 15, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_groundfirebomb.thrownitem b/items/throwables/sb_groundfirebomb.thrownitem index f1bf38c0..dc20801e 100644 --- a/items/throwables/sb_groundfirebomb.thrownitem +++ b/items/throwables/sb_groundfirebomb.thrownitem @@ -1,30 +1,30 @@ { - "itemName" : "sb_groundfirebomb", - "rarity" : "Uncommon", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_groundfirebomb.png", - "image" : "sb_groundfirebomb.png", - "shortdescription" : "Spreading Fire Bomb", - "description" : "A real earth-scorcher!", - "category" : "throwableItem", - "price" : 120, - "ammoUsage" : 1, + "itemName": "sb_groundfirebomb", + "rarity": "Uncommon", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_groundfirebomb.png", + "image": "sb_groundfirebomb.png", + "shortdescription": "Spreading Fire Bomb", + "description": "A real earth-scorcher!", + "category": "throwableItem", + "price": 120, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 3, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "edgeTrigger" : true, - "windupTime" : 0, - "cooldown" : 0.4, - - "projectileType" : "sb_groundfirebomb", - "projectileConfig" : { - "speed" : 25, - "power" : 50, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : ["/sfx/projectiles/throw_item.ogg"] + "projectileType": "sb_groundfirebomb", + "projectileConfig": { + "speed": 25, + "power": 50, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_handgrenade.png b/items/throwables/sb_handgrenade.png index e22f88db..fed99e31 100644 Binary files a/items/throwables/sb_handgrenade.png and b/items/throwables/sb_handgrenade.png differ diff --git a/items/throwables/sb_handgrenade.thrownitem b/items/throwables/sb_handgrenade.thrownitem index 5fa4de09..4e2bf162 100644 --- a/items/throwables/sb_handgrenade.thrownitem +++ b/items/throwables/sb_handgrenade.thrownitem @@ -1,30 +1,30 @@ { - "itemName" : "sb_handgrenade", - "rarity" : "unCommon", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_handgrenade.png", - "image" : "sb_handgrenade.png", - "shortdescription" : "Hand Grenade", - "category" : "throwableItem", - "description" : "USCM Standard Issue Hand Grenade. Has a 3 second fuse.", - "price" : 80, - "ammoUsage" : 1, + "itemName": "sb_handgrenade", + "rarity": "unCommon", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_handgrenade.png", + "image": "sb_handgrenade.png", + "shortdescription": "Hand Grenade", + "category": "throwableItem", + "description": "USCM Standard Issue Hand Grenade. Has a 3 second fuse.", + "price": 80, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 2, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "edgeTrigger" : true, - "windupTime" : 0, - "cooldown" : 0.4, - - "projectileType" : "sb_handgrenade", - "projectileConfig" : { - "speed" : 30, - "power" : 45, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : ["/sfx/projectiles/throw_item_small.ogg"] + "projectileType": "sb_handgrenade", + "projectileConfig": { + "speed": 30, + "power": 45, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_jumpbomb.thrownitem b/items/throwables/sb_jumpbomb.thrownitem index 0ab03f75..6ab9b054 100644 --- a/items/throwables/sb_jumpbomb.thrownitem +++ b/items/throwables/sb_jumpbomb.thrownitem @@ -1,29 +1,28 @@ { - "itemName" : "sb_jumpbomb", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_jumpbomb.png", - "image" : "sb_jumpbomb.png", - "shortdescription" : "The Bouncer", - "category" : "throwableItem", - "description" : "A bomb to put a spring in your step.", - "price" : 110, - "ammoUsage" : 1, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "itemName": "sb_jumpbomb", + "rarity": "Common", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_jumpbomb.png", + "image": "sb_jumpbomb.png", + "shortdescription": "The Bouncer", + "category": "throwableItem", + "description": "A bomb to put a spring in your step.", + "price": 110, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_jumpbomb", - "projectileConfig" : { - "speed" : 25, - "level" : 0, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_jumpbomb", + "projectileConfig": { + "speed": 25, + "level": 0, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_phoenixemblem.png b/items/throwables/sb_phoenixemblem.png index 6ba22581..f70cadf9 100644 Binary files a/items/throwables/sb_phoenixemblem.png and b/items/throwables/sb_phoenixemblem.png differ diff --git a/items/throwables/sb_phoenixemblem.thrownitem b/items/throwables/sb_phoenixemblem.thrownitem index 5c2bb255..34b9dcbd 100644 --- a/items/throwables/sb_phoenixemblem.thrownitem +++ b/items/throwables/sb_phoenixemblem.thrownitem @@ -1,30 +1,28 @@ { - "itemName" : "sb_phoenixemblem", - "rarity" : "rare", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_phoenixemblem.png", - "image" : "sb_phoenixemblem.png", - "shortdescription" : "Phoenix Emblem", - "category" : "throwableItem", - "description" : "A fiery phoenix emblem, an ancient Avian tool of combat.", - - "ammoUsage" : 1, - - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "sb_phoenix", - "projectileConfig" : { - "speed" : 45, - "power" : 15, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "itemName": "sb_phoenixemblem", + "rarity": "rare", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_phoenixemblem.png", + "image": "sb_phoenixemblem.png", + "shortdescription": "Phoenix Emblem", + "category": "throwableItem", + "description": "A fiery phoenix emblem, an ancient Avian tool of combat.", + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 6, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, + "projectileType": "sb_phoenix", + "projectileConfig": { + "speed": 45, + "power": 15, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_plasmagrenade.png b/items/throwables/sb_plasmagrenade.png index 4c4c69d1..b25f0466 100644 Binary files a/items/throwables/sb_plasmagrenade.png and b/items/throwables/sb_plasmagrenade.png differ diff --git a/items/throwables/sb_plasmagrenade.thrownitem b/items/throwables/sb_plasmagrenade.thrownitem index fd6f4dd6..1ff079b2 100644 --- a/items/throwables/sb_plasmagrenade.thrownitem +++ b/items/throwables/sb_plasmagrenade.thrownitem @@ -8,6 +8,8 @@ "shortdescription" : "Plasma Grenade", "description" : "A grenade made from explosive plasma. Duck and cover!", "price" : 95, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 3, "ammoUsage" : 1, "edgeTrigger" : true, "windupTime" : 0, diff --git a/items/throwables/sb_poisonballoon.png b/items/throwables/sb_poisonballoon.png index 4eb4891d..ae12e0e7 100644 Binary files a/items/throwables/sb_poisonballoon.png and b/items/throwables/sb_poisonballoon.png differ diff --git a/items/throwables/sb_poisonballoon.thrownitem b/items/throwables/sb_poisonballoon.thrownitem index 1ead0905..a349b2d6 100644 --- a/items/throwables/sb_poisonballoon.thrownitem +++ b/items/throwables/sb_poisonballoon.thrownitem @@ -1,27 +1,26 @@ { - "itemName" : "sb_poisonballoon", - "rarity" : "Common", - "category" : "throwableItem", - "inventoryIcon" : "sb_poisonballoonicon.png", - "image" : "sb_poisonballoon.png", - "tooltipKind" : "sb_object", - "shortdescription" : "Poison Balloon", - "description" : "Just like a water balloon, with one noticeable difference.", - "ammoUsage" : 1, - "edgeTrigger" : true, - "windupTime" : 0, - "cooldown" : 0.4, - "projectileType" : "poisonballoon", - "projectileConfig" : { - "speed" : 40, - "power" : 0, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : ["/sfx/projectiles/throw_item_small.ogg"] + "itemName": "sb_poisonballoon", + "rarity": "Common", + "category": "throwableItem", + "inventoryIcon": "sb_poisonballoonicon.png", + "image": "sb_poisonballoon.png", + "tooltipKind": "sb_object", + "shortdescription": "Poison Balloon", + "description": "Just like a water balloon, with one noticeable difference.", + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, + "projectileType": "poisonballoon", + "projectileConfig": { + "speed": 40, + "power": 0, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_protectionbomb.thrownitem b/items/throwables/sb_protectionbomb.thrownitem index d0496292..166dd5fb 100644 --- a/items/throwables/sb_protectionbomb.thrownitem +++ b/items/throwables/sb_protectionbomb.thrownitem @@ -1,29 +1,28 @@ { - "itemName" : "sb_protectionbomb", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_protectionbomb.png", - "image" : "sb_protectionbomb.png", - "shortdescription" : "The Defender", - "category" : "throwableItem", - "description" : "A bomb for when you have to be sturdy.", - "price" : 110, - "ammoUsage" : 1, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "itemName": "sb_protectionbomb", + "rarity": "Common", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_protectionbomb.png", + "image": "sb_protectionbomb.png", + "shortdescription": "The Defender", + "category": "throwableItem", + "description": "A bomb for when you have to be sturdy.", + "price": 110, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_protectionbomb", - "projectileConfig" : { - "speed" : 25, - "level" : 0, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : ["/sfx/projectiles/throw_item_small.ogg"] + "projectileType": "sb_protectionbomb", + "projectileConfig": { + "speed": 25, + "level": 0, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_ragebomb.thrownitem b/items/throwables/sb_ragebomb.thrownitem index 09016239..7831b3a9 100644 --- a/items/throwables/sb_ragebomb.thrownitem +++ b/items/throwables/sb_ragebomb.thrownitem @@ -1,29 +1,28 @@ { - "itemName" : "sb_ragebomb", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_ragebomb.png", - "image" : "sb_ragebomb.png", - "shortdescription" : "The Rager", - "category" : "throwableItem", - "description" : "A bomb for when you feel the need to break things.", - "price" : 110, - "ammoUsage" : 1, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "itemName": "sb_ragebomb", + "rarity": "Common", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_ragebomb.png", + "image": "sb_ragebomb.png", + "shortdescription": "The Rager", + "category": "throwableItem", + "description": "A bomb for when you feel the need to break things.", + "price": 110, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_ragebomb", - "projectileConfig" : { - "speed" : 25, - "level" : 0, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_ragebomb", + "projectileConfig": { + "speed": 25, + "level": 0, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_runbomb.thrownitem b/items/throwables/sb_runbomb.thrownitem index a0f2fad0..24d94012 100644 --- a/items/throwables/sb_runbomb.thrownitem +++ b/items/throwables/sb_runbomb.thrownitem @@ -1,29 +1,28 @@ { - "itemName" : "sb_runbomb", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_runbomb.png", - "image" : "sb_runbomb.png", - "shortdescription" : "The Sprinter", - "category" : "throwableItem", - "description" : "A bomb for when you feel the need for explosive speed.", - "price" : 110, - "ammoUsage" : 1, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, + "itemName": "sb_runbomb", + "rarity": "Common", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_runbomb.png", + "image": "sb_runbomb.png", + "shortdescription": "The Sprinter", + "category": "throwableItem", + "description": "A bomb for when you feel the need for explosive speed.", + "price": 110, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "projectileType" : "sb_runbomb", - "projectileConfig" : { - "speed" : 25, - "level" : 0, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "sb_runbomb", + "projectileConfig": { + "speed": 25, + "level": 0, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_shuriken.png b/items/throwables/sb_shuriken.png deleted file mode 100644 index 111adfbf..00000000 Binary files a/items/throwables/sb_shuriken.png and /dev/null differ diff --git a/items/throwables/sb_shuriken.thrownitem b/items/throwables/sb_shuriken.thrownitem index 4bcb9d04..20028ebb 100644 --- a/items/throwables/sb_shuriken.thrownitem +++ b/items/throwables/sb_shuriken.thrownitem @@ -1,30 +1,31 @@ { - "itemName" : "sb_shuriken", - "rarity" : "rare", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_shuriken.png", - "image" : "sb_shuriken.png", - "shortdescription" : "Plasma Shuriken", - "category" : "throwableItem", - "description" : "A shuriken cloaked in plasma.", + "itemName": "sb_shuriken", + "rarity": "rare", + "tooltipKind": "sb_object", + "inventoryIcon": "/projectiles/guns/unsorted/shuriken/icon.png?multiply=fffffffe", + "image": "/projectiles/guns/unsorted/shuriken/icon.png?multiply=fffffffe", + "shortdescription": "Plasma Shuriken", + "category": "throwableItem", + "description": "A shuriken made of pure energy, ideal for cutting right through foes.", + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 6, + "ammoUsage": 1, + "price": 40, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "ammoUsage" : 1, - "price" : 40, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "shuriken", - "projectileConfig" : { - "speed" : 45, - "power" : 40, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "shuriken", + "projectileConfig": { + "speed": 75, + "power": 8.5, + "persistentAudio": "/sfx/projectiles/throwingstar_loop.ogg", + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_smokegrenade.png b/items/throwables/sb_smokegrenade.png index 29203c1b..b60d24c0 100644 Binary files a/items/throwables/sb_smokegrenade.png and b/items/throwables/sb_smokegrenade.png differ diff --git a/items/throwables/sb_smokegrenade.thrownitem b/items/throwables/sb_smokegrenade.thrownitem index 947d17e2..ce3ee809 100644 --- a/items/throwables/sb_smokegrenade.thrownitem +++ b/items/throwables/sb_smokegrenade.thrownitem @@ -1,30 +1,30 @@ { - "itemName" : "sb_smokegrenade", - "rarity" : "Common", - "tooltipKind" : "sb_object4", - "inventoryIcon" : "sb_smokegrenade.png", - "image" : "sb_smokegrenade.png", - "shortdescription" : "Heated Smoke Grenade", - "category" : "throwableItem", - "description" : "This grenade won't explode, but it will release a steady stream of super-heated smoke.", - "price" : 120, - "ammoUsage" : 1, + "itemName": "sb_smokegrenade", + "rarity": "Common", + "tooltipKind": "sb_object4", + "inventoryIcon": "sb_smokegrenade.png", + "image": "sb_smokegrenade.png", + "shortdescription": "Heated Smoke Grenade", + "category": "throwableItem", + "description": "This grenade won't explode, but it will release a steady stream of super-heated smoke.", + "price": 120, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 1, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "edgeTrigger" : true, - "windupTime" : 0, - "cooldown" : 0.4, - - "projectileType" : "sb_smokegrenade", - "projectileConfig" : { - "speed" : 30, - "power" : 45, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : ["/sfx/projectiles/throw_item_small.ogg"] + "projectileType": "sb_smokegrenade", + "projectileConfig": { + "speed": 30, + "power": 45, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_throwingneedle.png b/items/throwables/sb_throwingneedle.png index 6900dee6..9ce14074 100644 Binary files a/items/throwables/sb_throwingneedle.png and b/items/throwables/sb_throwingneedle.png differ diff --git a/items/throwables/sb_throwingneedle.thrownitem b/items/throwables/sb_throwingneedle.thrownitem index 07a782ef..068c45c8 100644 --- a/items/throwables/sb_throwingneedle.thrownitem +++ b/items/throwables/sb_throwingneedle.thrownitem @@ -1,30 +1,30 @@ { - "itemName" : "sb_throwingneedle", - "rarity" : "Common", - "tooltipKind" : "sb_object", - "inventoryIcon" : "sb_throwingneedle.png", - "image" : "sb_throwingneedle.png", - "shortdescription" : "Throwing Needle", - "category" : "throwableItem", - "description" : "Great against evil haystacks.", - "price" : 8, - "ammoUsage" : 1, + "itemName": "sb_throwingneedle", + "rarity": "Common", + "tooltipKind": "sb_object", + "inventoryIcon": "sb_throwingneedle.png", + "image": "sb_throwingneedle.png", + "shortdescription": "Throwing Needle", + "category": "throwableItem", + "description": "Great against evil haystacks.", + "price": 8, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 1, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 0.4, - "edgeTrigger" : true, - "windupTime" : 0.0, - "cooldown" : 0.4, - - "projectileType" : "sb_throwingneedle", - "projectileConfig" : { - "speed" : 75, - "power" : 6, - "periodicActions" : [ - { - "time" : 0, - "repeat" : false, - "action" : "sound", - "options" : [ "/sfx/projectiles/throw_item_small.ogg" ] + "projectileType": "throwingneedle", + "projectileConfig": { + "speed": 75, + "power": 6, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item_small.ogg"] } ] } -} \ No newline at end of file +} diff --git a/items/throwables/sb_throwingreed.png b/items/throwables/sb_throwingreed.png new file mode 100644 index 00000000..c9dec0c5 Binary files /dev/null and b/items/throwables/sb_throwingreed.png differ diff --git a/items/throwables/sb_throwingreed.thrownitem b/items/throwables/sb_throwingreed.thrownitem new file mode 100644 index 00000000..5b399a38 --- /dev/null +++ b/items/throwables/sb_throwingreed.thrownitem @@ -0,0 +1,29 @@ +{ + "itemName": "sb_throwingreed", + "rarity": "Common", + "category": "throwableItem", + "inventoryIcon": "/projectiles/guns/unsorted/reed/icon.png", + "image": "sb_throwingreed.png", + "tooltipKind": "sb_object", + "shortdescription": "Sharpened Reed", + "description": "A large sharpened reed, suitable for hunting. Lightweight, yet effective.", + "price": 3, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 2, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 1, + "projectileType": "reed", + "projectileConfig": { + "speed": 55, + "knockback": 20, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item.ogg"] + } + ] + } +} diff --git a/items/throwables/sb_toxicbarrel.png b/items/throwables/sb_toxicbarrel.png new file mode 100644 index 00000000..47a637a4 Binary files /dev/null and b/items/throwables/sb_toxicbarrel.png differ diff --git a/items/throwables/sb_toxicbarrel.thrownitem b/items/throwables/sb_toxicbarrel.thrownitem new file mode 100644 index 00000000..aa78840b --- /dev/null +++ b/items/throwables/sb_toxicbarrel.thrownitem @@ -0,0 +1,29 @@ +{ + "itemName": "sb_toxicbarrel", + "rarity": "Uncommon", + "category": "throwableItem", + "inventoryIcon": "sb_toxicbarrel.png", + "image": "sb_toxicbarrel.png?replace;000=1a1c1d", + "tooltipKind": "sb_object4", + "shortdescription": "Toxic Barrel", + "description": "An unmarked barrel brimming with faintly glowing toxic waste. It might violate some safety standards.", + "price": 130, + "builder": "/items/buildscripts/starbound/buildthrowable.lua", + "level": 4, + "ammoUsage": 1, + "edgeTrigger": true, + "windupTime": 0, + "cooldown": 1.5, + "projectileType": "sb_toxicbarrel", + "projectileConfig": { + "speed": 15, + "knockback": 0, + "periodicActions": [{ + "time": 0, + "repeat": false, + "action": "sound", + "options": ["/sfx/projectiles/throw_item.ogg"] + } + ] + } +} diff --git a/items/throwables/snowball.thrownitem.patch b/items/throwables/snowball.thrownitem.patch index 50184542..2c8be364 100644 --- a/items/throwables/snowball.thrownitem.patch +++ b/items/throwables/snowball.thrownitem.patch @@ -1,7 +1,8 @@ [ -[{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"sb_snowcone"}], - [{"op":"test","path":"/description","value":"A snowball, the perfect size for throwing."}, -{"op":"replace","path":"/description","value":"A snowball, the perfect size for throwing. It's begging to be thrown."}] +{"op":"replace","path":"/description","value":"A snowball, the perfect size for throwing. It's begging to be thrown."}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/snowballgigantic.thrownitem.patch b/items/throwables/snowballgigantic.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/snowballgigantic.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/snowballlarge.thrownitem.patch b/items/throwables/snowballlarge.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/snowballlarge.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/snowballmedium.thrownitem.patch b/items/throwables/snowballmedium.thrownitem.patch new file mode 100644 index 00000000..2c8be364 --- /dev/null +++ b/items/throwables/snowballmedium.thrownitem.patch @@ -0,0 +1,8 @@ +[ +[{"op":"test","path":"/description","value":"A snowball, the perfect size for throwing."}, +{"op":"replace","path":"/description","value":"A snowball, the perfect size for throwing. It's begging to be thrown."}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/snowflakeshuriken.thrownitem.patch b/items/throwables/snowflakeshuriken.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/snowflakeshuriken.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/tarball.thrownitem.patch b/items/throwables/tarball.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/tarball.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/thorngrenade.thrownitem.patch b/items/throwables/thorngrenade.thrownitem.patch index 6c11cf5b..04f19621 100644 --- a/items/throwables/thorngrenade.thrownitem.patch +++ b/items/throwables/thorngrenade.thrownitem.patch @@ -7,5 +7,9 @@ [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"uncommon"}], -[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":310}] +[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":310}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":2}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwingaxe.thrownitem.patch b/items/throwables/throwingaxe.thrownitem.patch index 21f203b6..6a9a70e5 100644 --- a/items/throwables/throwingaxe.thrownitem.patch +++ b/items/throwables/throwingaxe.thrownitem.patch @@ -11,5 +11,9 @@ [{"op":"test","path":"/tooltipKind","inverse":true}, {"op":"add","path":"/tooltipKind","value":"fossil"}], -[{"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":"/level","inverse":true},{"op":"add","path":"/level","value":3}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwingblock.thrownitem.patch b/items/throwables/throwingblock.thrownitem.patch new file mode 100644 index 00000000..2c8be364 --- /dev/null +++ b/items/throwables/throwingblock.thrownitem.patch @@ -0,0 +1,8 @@ +[ +[{"op":"test","path":"/description","value":"A snowball, the perfect size for throwing."}, +{"op":"replace","path":"/description","value":"A snowball, the perfect size for throwing. It's begging to be thrown."}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/throwingbones.thrownitem.patch b/items/throwables/throwingbones.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/throwingbones.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/throwingboulder.thrownitem.patch b/items/throwables/throwingboulder.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/throwingboulder.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/throwingdagger.thrownitem.patch b/items/throwables/throwingdagger.thrownitem.patch index fa601b88..9e8a3515 100644 --- a/items/throwables/throwingdagger.thrownitem.patch +++ b/items/throwables/throwingdagger.thrownitem.patch @@ -3,5 +3,9 @@ [{"op":"test","path":"/price","value":3},{"op":"replace","path":"/price","value":13}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"throwingdagger"}] +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"throwingdagger"}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":2}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwingdart.thrownitem.patch b/items/throwables/throwingdart.thrownitem.patch index 400a6076..53cf4df9 100644 --- a/items/throwables/throwingdart.thrownitem.patch +++ b/items/throwables/throwingdart.thrownitem.patch @@ -1,4 +1,8 @@ [ [{"op":"test","path":"/description","value":"A throwing dart, aim for the bullseye."}, -{"op":"replace","path":"/description","value":"A throwing dart, aim for the bullseye... One hundred and eightyyyyyy!"}] +{"op":"replace","path":"/description","value":"A throwing dart, aim for the bullseye... One hundred and eightyyyyyy!"}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwinggnome.thrownitem.patch b/items/throwables/throwinggnome.thrownitem.patch new file mode 100644 index 00000000..a9fe2e41 --- /dev/null +++ b/items/throwables/throwinggnome.thrownitem.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":1}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] +] \ No newline at end of file diff --git a/items/throwables/throwingknife.thrownitem.patch b/items/throwables/throwingknife.thrownitem.patch index 842d2ff1..08fd4499 100644 --- a/items/throwables/throwingknife.thrownitem.patch +++ b/items/throwables/throwingknife.thrownitem.patch @@ -1,3 +1,7 @@ [ -[{"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":"/level","inverse":true},{"op":"add","path":"/level","value":2}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwingkunai.thrownitem.patch b/items/throwables/throwingkunai.thrownitem.patch index 283be126..440cf55e 100644 --- a/items/throwables/throwingkunai.thrownitem.patch +++ b/items/throwables/throwingkunai.thrownitem.patch @@ -2,5 +2,9 @@ [{"op":"test","path":"/description","value":"A specialized throwing knife with a heavy blade."}, {"op":"replace","path":"/description","value":"A specialized throwing knife with a heavy blade. Focus your chakra then let loose!"}], -[{"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":"/level","inverse":true},{"op":"add","path":"/level","value":3}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwingspear.thrownitem.patch b/items/throwables/throwingspear.thrownitem.patch index a97ec269..1090063f 100644 --- a/items/throwables/throwingspear.thrownitem.patch +++ b/items/throwables/throwingspear.thrownitem.patch @@ -3,5 +3,9 @@ [{"op":"test","path":"/price","value":1},{"op":"replace","path":"/price","value":20}], [{"op":"test","path":"/learnBlueprintsOnPickup","inverse":true},{"op":"add","path":"/learnBlueprintsOnPickup","value":[]}], -[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"throwingspear"}] +[{"op":"add","path":"/learnBlueprintsOnPickup/-","value":"throwingspear"}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":2}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/throwables/throwingstar.thrownitem.patch b/items/throwables/throwingstar.thrownitem.patch index 26f18f66..d54c54b3 100644 --- a/items/throwables/throwingstar.thrownitem.patch +++ b/items/throwables/throwingstar.thrownitem.patch @@ -4,5 +4,9 @@ [{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"rare"}], -[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":8}] +[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":8}], + +[{"op":"test","path":"/level","inverse":true},{"op":"add","path":"/level","value":5}], +[{"op":"test","path":"/builder"},{"op":"move","from":"/builder","path":"/sb_builder"}], +[{"op":"add","path":"/builder","value":"/items/buildscripts/starbound/buildthrowable.lua"}] ] \ No newline at end of file diff --git a/items/tools/miningtools/sb_beamaxe.activeitem b/items/tools/miningtools/sb_beamaxe.activeitem index 691bd432..0c39aac1 100644 --- a/items/tools/miningtools/sb_beamaxe.activeitem +++ b/items/tools/miningtools/sb_beamaxe.activeitem @@ -30,7 +30,7 @@ "manipulatorOptics": "/items/tools/miningtools/sb_mastermanipulatorfb.png" }, //"image" : "/items/tools/miningtools/sb_gravgun2.png", - "endImages": ["/humanoid/any/ball2.png", "/humanoid/any/sb_tileglow.png?setcolor=66a0bb?multiply=ffffff40"], + "endImages": ["/humanoid/any/ball2.png", "/humanoid/any/sb_tileglow.png?setcolor=66a0bb?multiply=ffffff40"], //No, this isn't a leftover, it NEEDS those directives "handPosition": [-2, 0], "firePosition": [5, 0], "animationScripts": ["sb_beamaxeanimation.lua"], diff --git a/items/tools/miningtools/sb_drill.weaponability b/items/tools/miningtools/sb_drill.weaponability new file mode 100644 index 00000000..d8f37b29 --- /dev/null +++ b/items/tools/miningtools/sb_drill.weaponability @@ -0,0 +1,86 @@ +{ + "animationParts": {}, + "animationCustom": { + "animatedParts": { + "stateTypes": { + "tool": { + //I decided against having rev up/down sfx because they keep swapping when breaking blocks + "states": { + "inactive": { + "properties": { + "particleEmittersOff": ["smoke"] + } + }, + "active": { + "properties": { + "persistentSound": "/sfx/tools/chainsaw_idle.ogg", + "particleEmittersOn": ["smoke"] + } + } + } + } + } + }, + "parts": { + "tool": { + "partStates": { + "tool": { + "active": { + "properties": { + "offset": [1, 1] + } + } + } + } + } + }, + "sounds": { + "fire": ["/sfx/tools/drill_hit.ogg"] + } + }, + + "ability": { + "type": "sb_drill", + "scripts": ["/items/tools/miningtools/sb_miningtool.lua"], + "class": "MiningTool", + "blockRadius": 4, + "altBlockRadius": 1, + "harvestLevel": 99, + "hitObjects": true, + "canBeRepaired": true, + "animated": true, + + "tilledMods": { + "31": "tilled" + }, + + "stances": { + "idle": { + "armRotation": -1.25, + "weaponRotation": -1.25, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true, + "weaponOffset": [0, 0.5] + }, + "windup": { + "duration": 0, + "armRotation": -1.25, + "weaponRotation": -1.25, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true, + "weaponOffset": [0, 0.5] + }, + "fire": { + "duration": 0.1, + "armRotation": -1.25, + "weaponRotation": -1.25, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true, + "weaponOffset": [0, 0.5] + } + } + } +} diff --git a/items/tools/miningtools/sb_fossiltool.png b/items/tools/miningtools/sb_fossiltool.png index 9292c6e1..0dc2140b 100644 Binary files a/items/tools/miningtools/sb_fossiltool.png and b/items/tools/miningtools/sb_fossiltool.png differ diff --git a/items/tools/miningtools/sb_fossiltoolbig.png b/items/tools/miningtools/sb_fossiltoolbig.png index 5c5cb046..707b0352 100644 Binary files a/items/tools/miningtools/sb_fossiltoolbig.png and b/items/tools/miningtools/sb_fossiltoolbig.png differ diff --git a/items/tools/miningtools/sb_gravgun1.png b/items/tools/miningtools/sb_gravgun1.png index 684e96aa..5f96567b 100644 Binary files a/items/tools/miningtools/sb_gravgun1.png and b/items/tools/miningtools/sb_gravgun1.png differ diff --git a/items/tools/miningtools/sb_gravgun2.png b/items/tools/miningtools/sb_gravgun2.png index f205128f..f2277693 100644 Binary files a/items/tools/miningtools/sb_gravgun2.png and b/items/tools/miningtools/sb_gravgun2.png differ diff --git a/items/tools/miningtools/sb_gravgunicon.png b/items/tools/miningtools/sb_gravgunicon.png index f4d26c34..0cb0facf 100644 Binary files a/items/tools/miningtools/sb_gravgunicon.png and b/items/tools/miningtools/sb_gravgunicon.png differ diff --git a/items/tools/miningtools/sb_gravgunlarge.png b/items/tools/miningtools/sb_gravgunlarge.png index 066426f1..73057f64 100644 Binary files a/items/tools/miningtools/sb_gravgunlarge.png and b/items/tools/miningtools/sb_gravgunlarge.png differ diff --git a/items/tools/miningtools/sb_handdrill.miningtool b/items/tools/miningtools/sb_handdrill.miningtool index 005d962d..381db25e 100644 --- a/items/tools/miningtools/sb_handdrill.miningtool +++ b/items/tools/miningtools/sb_handdrill.miningtool @@ -1,34 +1,34 @@ { - "itemName" : "sb_handdrill", - "price" : 150, - "category" : "tool", - "inventoryIcon" : "handdrillicon.png", - "maxStack" : 1, - "rarity" : "Uncommon", - "tooltipKind" : "sb_tool", - "description" : "A drill! This is more like it.", - "shortdescription" : "Hand Drill", - "largeImage" : "handdrillbig.png", - "image" : "handdrill.png:{frame}", - "frames" : 5, - "animationCycle" : 0.1, - "handPosition" : [-8, 1], - "pointable" : true, - "learnBlueprintsOnPickup" : ["copperdrill"], - "radioMessagesOnPickup" : ["sb_pickupminingtool"], - "swingStart" : 0, - "swingFinish" : 0, - "fireTime" : 0.1, - "blockRadius" : 4, - "altBlockRadius" : 1, - "twoHanded" : true, - "idleSound" : "/sfx/tools/chainsaw_idle.ogg", - "strikeSounds" : [ "/sfx/tools/drill_hit.ogg" ], - "breakSound" : "/sfx/tools/pickaxe_break.ogg", - "durability" : 500, - "durabilityPerUse" : 1, - "tileDamage" : 1.5, - "harvestLevel" : 99, - "tileDamageBlunted" : 0.2, - "canBeRepaired" : true -} \ No newline at end of file + "itemName": "sb_handdrill", + "price": 150, + "category": "tool", + "inventoryIcon": "handdrillicon.png", + "maxStack": 1, + "rarity": "Uncommon", + "tooltipKind": "sb_tool", + "description": "A drill! This is more like it.", + "shortdescription": "Hand Drill", + "largeImage": "handdrillbig.png", + "image": "handdrill.png:{frame}", + "frames": 5, + "animationCycle": 0.1, + "handPosition": [-8, 1], + "pointable": true, + "learnBlueprintsOnPickup": ["copperdrill"], + "radioMessagesOnPickup": ["sb_pickupminingtool"], + "swingStart": 0, + "swingFinish": 0, + "fireTime": 0.1, + "blockRadius": 4, + "altBlockRadius": 1, + "twoHanded": true, + "idleSound": "/sfx/tools/chainsaw_idle.ogg", //TODO: is this used?? + "strikeSounds": ["/sfx/tools/drill_hit.ogg"], + "breakSound": "/sfx/tools/pickaxe_break.ogg", + "durability": 500, + "durabilityPerUse": 1, + "tileDamage": 1.5, + "harvestLevel": 99, + "tileDamageBlunted": 0.2, + "canBeRepaired": true +} diff --git a/items/tools/miningtools/sb_mastermanipulator.png b/items/tools/miningtools/sb_mastermanipulator.png index 9f954cfe..b44c2d49 100644 Binary files a/items/tools/miningtools/sb_mastermanipulator.png and b/items/tools/miningtools/sb_mastermanipulator.png differ diff --git a/items/tools/miningtools/sb_mastermanipulatoricon.png b/items/tools/miningtools/sb_mastermanipulatoricon.png index 14cceee3..8b377011 100644 Binary files a/items/tools/miningtools/sb_mastermanipulatoricon.png and b/items/tools/miningtools/sb_mastermanipulatoricon.png differ diff --git a/items/tools/miningtools/sb_miningtool.animation b/items/tools/miningtools/sb_miningtool.animation new file mode 100644 index 00000000..db8584cf --- /dev/null +++ b/items/tools/miningtools/sb_miningtool.animation @@ -0,0 +1,82 @@ +{ + "animatedParts": { + "stateTypes": { + "tool": { + "default": "idle", + "states": { + "idle": {}, + "inactive": {}, + "active": { + "frames": 4, + "cycle": 0.1, + "mode": "loop", + "properties": {} + } + } + } + }, + + "parts": { + "tool": { + "properties": { + "zLevel": 0, + "centered": true, + "offset": [0.75, 0.75], + "transformationGroups": ["weapon"], + "rotationCenter": [0, 0] + }, + "partStates": { + "tool": { + "idle": { + "properties": { + "image": "" + } + }, + "inactive": { + "properties": { + "image": ":idle", + "offset": [1, -0.125], + "rotationCenter": [1, 0] + } + }, + "active": { + "properties": { + "image": ":", + "offset": [1, -0.125], + "rotationCenter": [1, 0] + } + } + } + } + } + } + }, + + "transformationGroups": { + "weapon": {}, + "swoosh": {} + }, + + "sounds": { + "fire": ["/sfx/tools/pickaxe_hit.ogg"], + "blockSound": [], //Intentionally left empty + "break": ["/sfx/tools/pickaxe_break.ogg"] + }, + + "particleEmitters": { + "smoke": { + "active": false, + "transformationGroups": ["weapon"], + "emissionRate": 10, + "offsetRegion": [0.25, 0.5, 0.40, 0], + "particles": [{ + "particle": "tinyrocketsmoke" + }, { + "particle": "burningvehiclesmokefront" + }, { + "particle": "rocketsmoke" + } + ] + } + } +} diff --git a/items/tools/miningtools/sb_miningtool.lua b/items/tools/miningtools/sb_miningtool.lua new file mode 100644 index 00000000..9bfe3b22 --- /dev/null +++ b/items/tools/miningtools/sb_miningtool.lua @@ -0,0 +1,170 @@ +require "/scripts/util.lua" +require "/scripts/vec2.lua" +require "/items/active/weapons/weapon.lua" + +MiningTool = WeaponAbility:new() +function MiningTool:init() + self.toolRange = root.assetJson("/player.config:interactRadius") + local client = root.assetJson("/client.config") + self.defaultFootstepSound = client.defaultFootstepSound + self.defaultDingSound = client.defaultDingSound + + --Define these in the item's root instead of in both ability slots + self.durability = config.getParameter("durability") + self.durabilityPerUse = config.getParameter("durabilityPerUse", self.durabilityPerUse) + self.canBeRepaired = config.getParameter("canBeRepaired", self.canBeRepaired) + + self.blockRadius = config.getParameter("blockRadius", self.blockRadius) + self.altBlockRadius = config.getParameter("altBlockRadius", self.altBlockRadius) + self.tileDamageType = config.getParameter("tileDamageType", self.tileDamageType) + self.tileDamage = config.getParameter("tileDamage", 1.5) + self.tileDamageBlunted = config.getParameter("tileDamageBlunted", 0.1) + self.animated = config.getParameter("animated", self.animated) + self.hitObjects = config.getParameter("hitObjects", self.hitObjects) + + local sfx = root.assetJson("/sfx.config") + animator.setSoundVolume("fire", sfx.miningToolVolume) + animator.setSoundVolume("blockSound", sfx.miningBlockVolume) + + self.weapon:setStance(self.stances.idle) + animator.setAnimationState("tool", self.animated and "inactive" or "idle") + + self.weapon.onLeaveAbility = function() + self.weapon:setStance(self.stances.idle) + animator.setAnimationState("tool", self.animated and "inactive" or "idle") + end +end + +function MiningTool:update(dt, fireMode, shiftHeld) + WeaponAbility.update(self, dt, fireMode, shiftHeld) + + if not self.weapon.currentAbility and self:shouldFire() then + self:setState(self.windup) + end +end + +function MiningTool:shouldFire() + return self.fireMode == self.activatingFireMode +end + +function MiningTool:windup() + self.weapon:setStance(self.stances.windup) + self.weapon:updateAim() + + if self:shouldFire() then + self:setState(self.fire) + end +end + +function MiningTool:fire() + if self.animated then animator.setAnimationState("tool", "active") end + local entityPosition = world.entityPosition(activeItem.ownerEntityId()) + self.hitPosition = activeItem.ownerAimPosition() + local distance = vec2.mag(world.distance(entityPosition, self.hitPosition)) + if distance > (player.isAdmin() and distance + 1 or self.toolRange) then + return + end + + local radius = self.shiftHeld and self.altBlockRadius or self.blockRadius + local brushArea = self:tileAreaBrush(radius, self.hitPosition) + local valid = false + for i = 1, #brushArea do + valid = world.material(brushArea[i], self.layer) or (self.hitObjects and world.tileIsOccupied(brushArea[i])) + if valid then break end + end + if not valid then return end + + --I could make the hoe not damage tilled soil... But on the other hand, I could like, *not* do that... + local unprotected = world.damageTiles(brushArea, self.layer, entityPosition, self.tileDamageType, self:getTileDamage(), self.harvestLevel, activeItem.ownerEntityId()) + if not unprotected then + coroutine.yield() + return + else + if self.tileDamageType == "tilling" then + self:till(brushArea) + else + self:changeDurability() + --so 'perUse' was literal... I thought it meant 'perHit'... since you can hit multiple blocks in one use... + --Anyway, only take durability for hoes if they actually till something + end + end + + animator.setSoundPool("blockSound", {self:getBlockSound(brushArea)}) + self.weapon:setStance(self.stances.fire) + self.weapon:updateAim() + + coroutine.yield() + + animator.playSound("blockSound") + animator.playSound("fire") + + util.wait(self.stances.fire.duration) + + if self:shouldFire() then + self:setState(self.fire) + end +end + +function MiningTool:getTileDamage() + return self.durability and config.getParameter("durabilityHit", 1) <= 0 and self.tileDamageBlunted or self.tileDamage +end + +function MiningTool:till(brushArea) + for i = 1, #brushArea do + if not world.material({brushArea[1][1], brushArea[1][2]+1}, self.layer) then + if not world.mod(brushArea[i], self.layer) then --placeMod erases whatever was there + local target = world.material(brushArea[i], self.layer) + if target and target:sub(1, 13) ~= "metamaterial:" then + target = root.materialConfig(target).config + if target.tillableMod and target.soil then --root.modConfig only accepts strings while root.liquidConfig accepts strings and ID's my BELOATHED + world.placeMod(brushArea[i], self.layer, self.tilledMods[tostring(target.tillableMod)] or "tilleddry", 0, true) + self:changeDurability() + end + end + end + end + end +end + +function MiningTool:changeDurability(amount) + if self.durability and not player.isAdmin() then + activeItem.setInstanceValue("durabilityHit", config.getParameter("durabilityHit", self.durability) - self.durabilityPerUse) + if config.getParameter("durabilityHit") <= 0 and not self.canBeRepaired then + animator.playSound("break") + item.consume(1) + end + end +end + +function MiningTool:getBlockSound(brushArea) + for _,pos in pairs(brushArea) do + if world.isTileProtected(pos) then + return self.defaultDingSound + else + local material = world.material(pos, self.layer) + local mod = world.mod(pos, self.layer) + if type(material) ~= "string" then return nil end + local blockSound = material and root.materialMiningSound(material, mod) or root.materialFootstepSound(material, mod) + return (type(blockSound) == "string" and blockSound ~= self.defaultFootstepSound and blockSound) or nil + end + end +end + +function MiningTool:tileAreaBrush(radius, centerPosition) + local result = jarray() + local offset = {-radius/2, -radius/2} + local intOffset = util.map(vec2.add(offset, centerPosition), util.round) + + for x = 0, radius-1 do + for y = 0, radius-1 do + local intPos = util.map({x, y}, util.round) + table.insert(result, vec2.add(intPos, intOffset)) + end + end + return result +end + +function MiningTool:uninit() + self.weapon:setStance(self.stances.idle) + animator.setAnimationState("tool", self.animated and "inactive" or "idle") +end diff --git a/items/tools/miningtools/sb_miningtool.weaponability b/items/tools/miningtools/sb_miningtool.weaponability new file mode 100644 index 00000000..c604f142 --- /dev/null +++ b/items/tools/miningtools/sb_miningtool.weaponability @@ -0,0 +1,45 @@ +{ + "animationParts": {}, + "animationCustom": {}, + + "ability": { + "type": "sb_miningtool", + "scripts": ["/items/tools/miningtools/sb_miningtool.lua"], + "class": "MiningTool", + "blockRadius": 3, + "altBlockRadius": 1, + "harvestLevel": 99, + + "tilledMods": { + "31": "tilled" + }, + + "stances": { + "idle": { + "armRotation": 0, + "weaponRotation": -25, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true, + "aimAngle": 0 + }, + "windup": { + "duration": 0, + "armRotation": 60, + "weaponRotation": 50, + "twoHanded": true, + "allowRotate": false, + "allowFlip": true + }, + "fire": { + "duration": 0.25, + "armRotation": 40, + "weaponRotation": 10, + "armAngularVelocity": -360, + "twoHanded": true, + "allowRotate": true, + "allowFlip": true + } + } + } +} diff --git a/items/tools/miningtools/sb_stonepickaxe.miningtool b/items/tools/miningtools/sb_stonepickaxe.miningtool index c5ee682c..934f61a2 100644 --- a/items/tools/miningtools/sb_stonepickaxe.miningtool +++ b/items/tools/miningtools/sb_stonepickaxe.miningtool @@ -1,30 +1,30 @@ { - "itemName" : "sb_stonepickaxe", - "inventoryIcon" : "sb_stonepickaxeicon.png", - "maxStack" : 1, - "rarity" : "common", - "price" : 25, - "tooltipKind" : "sb_tool", - "category" : "tool", - "description" : "Pickaxes are so last millennium!", - "shortdescription" : "Stone Pickaxe", - "image" : "sb_stonepickaxe.png", - "largeImage" : "/items/tools/miningtools/sb_stonepickaxebig.png", - "handPosition" : [-3, -4], - "fireTime" : 0.3, - "swingStart" : -40, - "swingFinish" : 60, - "blockRadius" : 3, - "altBlockRadius" : 1, - "learnBlueprintsOnPickup" : ["copperpickaxe"], - "radioMessagesOnPickup" : ["sb_pickupminingtool"], - "twoHanded" : true, - "strikeSounds" : ["/sfx/tools/pickaxe_hit.ogg"], - "breakSound" : "/sfx/tools/pickaxe_break.ogg", - "durability" : 300, - "harvestLevel" : 99, - "durabilityPerUse" : 1, - "tileDamage" : 0.8, - "tileDamageBlunted" : 0.3, - "canBeRepaired" : true + "itemName": "sb_stonepickaxe", + "inventoryIcon": "sb_stonepickaxeicon.png", + "maxStack": 1, + "rarity": "common", + "price": 80, + "tooltipKind": "sb_tool", + "category": "tool", + "description": "Pickaxes are so last millennium!", + "shortdescription": "Stone Pickaxe", + "image": "sb_stonepickaxe.png", + "largeImage": "/items/tools/miningtools/sb_stonepickaxebig.png", + "handPosition": [-3, -4], + "fireTime": 0.3, + "swingStart": -40, + "swingFinish": 60, + "blockRadius": 3, + "altBlockRadius": 1, + "learnBlueprintsOnPickup": ["copperpickaxe"], + "radioMessagesOnPickup": ["sb_pickupminingtool"], + "twoHanded": true, + "strikeSounds": ["/sfx/tools/pickaxe_hit.ogg"], + "breakSound": "/sfx/tools/pickaxe_break.ogg", + "durability": 300, + "harvestLevel": 99, + "durabilityPerUse": 1, + "tileDamage": 0.8, + "tileDamageBlunted": 0.3, + "canBeRepaired": true } diff --git a/items/tools/miningtools/sb_stonepickaxe.png b/items/tools/miningtools/sb_stonepickaxe.png index 0d76d70e..5060a06c 100644 Binary files a/items/tools/miningtools/sb_stonepickaxe.png and b/items/tools/miningtools/sb_stonepickaxe.png differ diff --git a/items/tools/miningtools/sb_stonepickaxebig.png b/items/tools/miningtools/sb_stonepickaxebig.png index 164ded4c..0c5caafa 100644 Binary files a/items/tools/miningtools/sb_stonepickaxebig.png and b/items/tools/miningtools/sb_stonepickaxebig.png differ diff --git a/items/tools/miningtools/sb_stonepickaxeicon.png b/items/tools/miningtools/sb_stonepickaxeicon.png index 8f44787c..74ff9d19 100644 Binary files a/items/tools/miningtools/sb_stonepickaxeicon.png and b/items/tools/miningtools/sb_stonepickaxeicon.png differ diff --git a/items/tools/sb_chainsaw.activeitem b/items/tools/sb_chainsaw.activeitem new file mode 100644 index 00000000..a19a71cd --- /dev/null +++ b/items/tools/sb_chainsaw.activeitem @@ -0,0 +1,35 @@ +{ + "itemName": "sb_chainsaw", + "price": 350, + "maxStack": 1, + "rarity": "uncommon", + "category": "tool", + "description": "Great for chopping down trees. Try to avoid massacres.", + "shortdescription" : "Chainsaw", + "tooltipKind": "sb_tool", + "largeImage": "chainsawbig.png", + "twoHanded": true, + "itemTags": ["tool"], + "inventoryIcon": "sb_chainsaw.png", + "animation": "/items/tools/miningtools/sb_miningtool.animation", + "animationParts": { + "tool": "chainsaw.png" + }, + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + + "blockRadius": 3, + "tileDamageType": "plantish", + "tileDamage": 1.5, + + "primaryAbilityType": "sb_drill", + "primaryAbility": { + "layer": "foreground", + "activatingFireMode": "primary" + }, + "altAbilityType": "sb_drill", + "altAbility": { + "layer": "background", + "activatingFireMode": "alt" + }, + "builder": "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/tools/sb_chainsaw.miningtool b/items/tools/sb_chainsaw.miningtool deleted file mode 100644 index 4834e551..00000000 --- a/items/tools/sb_chainsaw.miningtool +++ /dev/null @@ -1,32 +0,0 @@ -{ - "itemName" : "sb_chainsaw", - "price" : 350, - "category" : "tool", - "inventoryIcon" : "chainsaw.png:idle?border=1;000", - "maxStack" : 1, - "rarity" : "Uncommon", - "tooltipKind" : "sb_tool", - "description" : "Great for chopping down trees. Try to avoid massacres.", - "shortdescription" : "Chainsaw", - "largeImage" : "chainsawbig.png", - "image" : "chainsaw.png:{frame}", - "frames" : 5, - "animationCycle" : 0.1, - "handPosition" : [-6, -2], - "pointable" : true, - "swingStart" : 0, - "swingFinish" : 0, - "fireTime" : 0.1, - "blockRadius" : 2, - "altBlockRadius" : 1, - "twoHanded" : true, - "idleSound" : "/sfx/tools/chainsaw_idle.ogg", - "strikeSounds" : [ "/sfx/tools/chainsaw_idle.ogg" ], - "breakSound" : "/sfx/tools/pickaxe_break.ogg", - "durability" : 5, - "durabilityPerUse" : 0, - "tileDamage" : 1.5, - "harvestLevel" : 99, - "tileDamageBlunted" : 0.2, - "tileDamageType" : "plantish" -} \ No newline at end of file diff --git a/items/tools/sb_chainsaw.png b/items/tools/sb_chainsaw.png new file mode 100644 index 00000000..043adc8b Binary files /dev/null and b/items/tools/sb_chainsaw.png differ diff --git a/items/tools/sb_draintool.painttool b/items/tools/sb_draintool.painttool index fd9e2aff..801f9a75 100644 --- a/items/tools/sb_draintool.painttool +++ b/items/tools/sb_draintool.painttool @@ -1,44 +1,41 @@ { - "itemName" : "sb_draintool", - "price" : 1062, - "inventoryIcon" : "sb_paintergun2icon.png", - "maxStack" : 1, - "rarity" : "Uncommon", - "description" : "Secondary fire extracts natural hue from tiles for later use.", - "shortdescription" : "Drain Tool", - "fireTime" : 0.05, - "blockRadius" : 1, - "altBlockRadius" : 1, - "twoHanded" : true, - "strikeSounds" : [ "/sfx/tools/paint_splash.ogg" ], - "largeImage" : "/items/tools/sb_paintergunlarge.png", - "tooltipKind" : "sb_tool", - "category" : "tool", - "image" : "/items/tools/sb_paintergun2.png", - "endImages" : [ "/humanoid/any/ball.png", "/humanoid/any/tileglow.png", "/humanoid/any/4tileglow.png" ], - "scripts" : ["/items/tools/sb_draintool.lua"], - "handPosition" : [-3, 0], - "firePosition" : [6, 2], - "segmentsPerUnit" : 1, - "nearControlPointElasticity" : 0.1, - "farControlPointElasticity" : 0.9, - "nearControlPointDistance" : 0.9, - "targetSegmentRun" : 1, - "innerBrightnessScale" : 20, - "firstStripeThickness" : 1, - "secondStripeThickness" : 1, - "minBeamWidth" : 0.3, - "maxBeamWidth" : 0.3, - "maxBeamJitter" : 0.2, - "minBeamJitter" : 0.1, - "minBeamTrans" : 0.6, - "maxBeamTrans" : 0.6, - "minBeamLines" : 1, - "maxBeamLines" : 5, + "itemName": "sb_draintool", + "price": 1000, + "inventoryIcon": "sb_paintergun2icon.png", + "maxStack": 1, + "rarity": "Uncommon", + "description": "Secondary fire extracts natural hue from tiles for later use.", + "shortdescription": "Drain Tool", + "fireTime": 0.05, + "blockRadius": 1, + "altBlockRadius": 1, + "twoHanded": true, + "strikeSounds": ["/sfx/tools/paint_splash.ogg"], + "largeImage": "/items/tools/sb_paintergunlarge.png", + "tooltipKind": "sb_tool", + "category": "tool", + "image": "/items/tools/sb_paintergun2.png", + "endImages": ["/humanoid/any/ball.png", "/humanoid/any/tileglow.png", "/humanoid/any/4tileglow.png"], + "scripts": ["/items/tools/sb_draintool.lua"], + "handPosition": [-3, 0], + "firePosition": [6, 2], + "segmentsPerUnit": 1, + "nearControlPointElasticity": 0.1, + "farControlPointElasticity": 0.9, + "nearControlPointDistance": 0.9, + "targetSegmentRun": 1, + "innerBrightnessScale": 20, + "firstStripeThickness": 1, + "secondStripeThickness": 1, + "minBeamWidth": 0.3, + "maxBeamWidth": 0.3, + "maxBeamJitter": 0.2, + "minBeamJitter": 0.1, + "minBeamTrans": 0.6, + "maxBeamTrans": 0.6, + "minBeamLines": 1, + "maxBeamLines": 5, - "colorNumbers" : [ - [0, 0, 0, 0]], - "colorKeys" : [ - "" - ] + "colorNumbers": [[0, 0, 0, 0]], + "colorKeys": [""] } diff --git a/items/tools/sb_iceaxe.activeitem b/items/tools/sb_iceaxe.activeitem index 078f2ca1..e5cd217c 100644 --- a/items/tools/sb_iceaxe.activeitem +++ b/items/tools/sb_iceaxe.activeitem @@ -1,41 +1,57 @@ { - "itemName" : "sb_iceaxe", - "price" : 250, -// "inventoryIcon" : "sb_iceaxebig.png", - "inventoryIcon" : [{"image":"sb_iceaxebig.png"},{"image":"/interface/sb_inventory/x.png"}], - "rarity" : "Rare", - "maxStack" : 1, - "description" : "An ice axe used for climbing.", - "shortdescription" : "Ice Axe", - "category" : "tool", - "twoHanded" : false, - "tooltipKind" : "sb_tool", - "largeImage" : "sb_iceaxebig.png", - - "scripts" : ["/items/active/grapplinghooks/grapplinghook.lua"], - "animationScripts" : ["/items/active/effects/renderrope.lua"], - - "animation" : "sb_grapplinghook.animation", - "animationCustom" : {"animatedParts":{"parts":{"rope":{"properties":{"image":"sb_iceaxe.png","offset":[0.25,0]}}}}}, - "fireOffset" : [0.1, 0.2], - "ropeOffset" : [0, 0], - "ropeVisualOffset" : [-0.5, 0.0], - - "consumeOnUse" : false, - - "projectileType" : "sb_iceaxehook", - - "ropeWidth" : 1, - "ropeColor" : [181, 181, 181, 0], - - "reelInDistance" : 0, - "reelOutLength" : 1.5, - "breakLength" : 4, - - "minSwingDistance" : 0, - - "reelSpeed" : 60, - "controlForce" : 7000, - - "groundLagTime" : 0 + "itemName": "sb_iceaxe", + "price": 250, + // "inventoryIcon" : "sb_iceaxebig.png", + "inventoryIcon": [{ + "image": "sb_iceaxebig.png" + }, { + "image": "/interface/x.png" + } + ], + "rarity": "Rare", + "maxStack": 1, + "description": "An ice axe used for climbing.", + "shortdescription": "Ice Axe", + "category": "tool", + "twoHanded": false, + "tooltipKind": "sb_tool", + "largeImage": "sb_iceaxebig.png", + + "scripts": ["/items/active/grapplinghooks/grapplinghook.lua"], + "animationScripts": ["/items/active/effects/renderrope.lua"], + + "animation": "sb_grapplinghook.animation", + "animationCustom": { + "animatedParts": { + "parts": { + "rope": { + "properties": { + "image": "sb_iceaxe.png", + "offset": [0.25, 0] + } + } + } + } + }, + "fireOffset": [0.1, 0.2], + "ropeOffset": [0, 0], + "ropeVisualOffset": [-0.5, 0.0], + + "consumeOnUse": false, + + "projectileType": "sb_iceaxehook", + + "ropeWidth": 1, + "ropeColor": [181, 181, 181, 0], + + "reelInDistance": 0, + "reelOutLength": 1.5, + "breakLength": 4, + + "minSwingDistance": 0, + + "reelSpeed": 60, + "controlForce": 7000, + + "groundLagTime": 0 } diff --git a/items/tools/sb_iceaxe.png b/items/tools/sb_iceaxe.png index 684de63e..983d3403 100644 Binary files a/items/tools/sb_iceaxe.png and b/items/tools/sb_iceaxe.png differ diff --git a/items/tools/sb_iceaxebig.png b/items/tools/sb_iceaxebig.png index ee974251..7f340dd5 100644 Binary files a/items/tools/sb_iceaxebig.png and b/items/tools/sb_iceaxebig.png differ diff --git a/items/tools/sb_ironaxe.miningtool b/items/tools/sb_ironaxe.miningtool index 36293adb..b2c8afea 100644 --- a/items/tools/sb_ironaxe.miningtool +++ b/items/tools/sb_ironaxe.miningtool @@ -1,27 +1,29 @@ { - "itemName" : "sb_ironaxe", - "inventoryIcon" : "sb_ironaxeicon.png", - "maxStack" : 1, - "rarity" : "common", - "price" : 220, - "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.", - "shortdescription" : "Iron Axe", - "image" : "sb_ironaxe.png", - "tooltipFields" : {"objectImage":"/items/tools/sb_ironaxebig.png"}, - "handPosition" : [-3, -4], - "pointable" : true, - "fireTime" : 0.25, - "swingStart" : 60, - "swingFinish" : -40, - "tileDamageType" : "plantish", - "blockRadius" : 3, - "altBlockRadius" : 1, - "twoHanded" : true, - "strikeSounds" : ["/sfx/tools/pickaxe_hit.ogg"], - "durability" : 9, - "durabilityPerUse" : 0, - "harvestLevel" : 99, - "tileDamage" : 1.75 -} \ No newline at end of file + "itemName": "sb_ironaxe", + "inventoryIcon": "sb_ironaxeicon.png", + "maxStack": 1, + "rarity": "common", + "price": 220, + "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.", + "shortdescription": "Iron Axe", + "image": "sb_ironaxe.png", + "tooltipFields": { + "objectImage": "/items/tools/sb_ironaxebig.png" + }, + "handPosition": [-3, -4], + "pointable": true, + "fireTime": 0.25, + "swingStart": 60, + "swingFinish": -40, + "tileDamageType": "plantish", + "blockRadius": 3, + "altBlockRadius": 1, + "twoHanded": true, + "strikeSounds": ["/sfx/tools/pickaxe_hit.ogg"], + "durability": 1, + "durabilityPerUse": 0, + "harvestLevel": 99, + "tileDamage": 1.75 +} diff --git a/items/tools/sb_ironaxe.png b/items/tools/sb_ironaxe.png index 2a2ef290..7dba579f 100644 Binary files a/items/tools/sb_ironaxe.png and b/items/tools/sb_ironaxe.png differ diff --git a/items/tools/sb_ironaxebig.png b/items/tools/sb_ironaxebig.png index 152a8427..93951ed5 100644 Binary files a/items/tools/sb_ironaxebig.png and b/items/tools/sb_ironaxebig.png differ diff --git a/items/tools/sb_ironaxeicon.png b/items/tools/sb_ironaxeicon.png index 0b72e384..48d2d9dc 100644 Binary files a/items/tools/sb_ironaxeicon.png and b/items/tools/sb_ironaxeicon.png differ diff --git a/items/tools/sb_mininglantern.animation b/items/tools/sb_mininglantern.animation index fdeb64e6..4b4e0ea1 100644 --- a/items/tools/sb_mininglantern.animation +++ b/items/tools/sb_mininglantern.animation @@ -23,7 +23,6 @@ "centered": false, "offset": [-0.5, -1] }, - "partStates": { "light": { "off": { @@ -31,7 +30,6 @@ "image": ":.off" } }, - "on": { "properties": { "image": ":.", diff --git a/items/tools/sb_paintergun2.png b/items/tools/sb_paintergun2.png index 828aadb2..ae8a7dd5 100644 Binary files a/items/tools/sb_paintergun2.png and b/items/tools/sb_paintergun2.png differ diff --git a/items/tools/sb_paintergun2icon.png b/items/tools/sb_paintergun2icon.png index 090dea19..5768ae23 100644 Binary files a/items/tools/sb_paintergun2icon.png and b/items/tools/sb_paintergun2icon.png differ diff --git a/items/tools/sb_paintergunicon.png b/items/tools/sb_paintergunicon.png index 8becfb50..73bd4377 100644 Binary files a/items/tools/sb_paintergunicon.png and b/items/tools/sb_paintergunicon.png differ diff --git a/items/tools/sb_paintergunlarge.png b/items/tools/sb_paintergunlarge.png index acf10f49..26d52c5d 100644 Binary files a/items/tools/sb_paintergunlarge.png and b/items/tools/sb_paintergunlarge.png differ diff --git a/items/tools/sb_paintergunvariants.png b/items/tools/sb_paintergunvariants.png index 92bf1ce4..6eaddda8 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 d8db4aaf..fddb06c9 100644 --- a/items/tools/sb_painttool.painttool +++ b/items/tools/sb_painttool.painttool @@ -1,47 +1,47 @@ { - "itemName" : "sb_painttool", - "price" : 1042, - "inventoryIcon" : "sb_paintergunicon.png", - "maxStack" : 1, - "rarity" : "Uncommon", - "description" : "Primary fire applies paint, secondary changes colour.", - "shortdescription" : "Paint Tool", - "fireTime" : 0.05, - "blockRadius" : 3, - "altBlockRadius" : 1, - "twoHanded" : true, - "strikeSounds" : [ "/sfx/tools/paint_splash.ogg" ], - "largeImage" : "/items/tools/sb_paintergunlarge.png", - "tooltipKind" : "sb_tool", - "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], + "itemName": "sb_painttool", + "price": 1000, + "inventoryIcon": "sb_paintergunicon.png", + "maxStack": 1, + "rarity": "Uncommon", + "description": "Primary fire applies paint, secondary changes colour.", + "shortdescription": "Paint Tool", + "fireTime": 0.05, + "blockRadius": 3, + "altBlockRadius": 1, + "twoHanded": true, + "strikeSounds": ["/sfx/tools/paint_splash.ogg"], + "largeImage": "/items/tools/sb_paintergunlarge.png", + "tooltipKind": "sb_tool", + "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], - "segmentsPerUnit" : 1, - "nearControlPointElasticity" : 0.1, - "farControlPointElasticity" : 0.9, - "nearControlPointDistance" : 0.9, - "targetSegmentRun" : 1, - "innerBrightnessScale" : 20, - "firstStripeThickness" : 0.2, - "secondStripeThickness" : 0.05, - "minBeamWidth" : 1, - "maxBeamWidth" : 2, - "maxBeamJitter" : 0.2, - "minBeamJitter" : 0.1, - "minBeamTrans" : 0.6, - "maxBeamTrans" : 0.6, - "minBeamLines" : 1, - "maxBeamLines" : 5, + // "handPosition" : [-2, 0], + // "firePosition" : [5, 0], + "segmentsPerUnit": 1, + "nearControlPointElasticity": 0.1, + "farControlPointElasticity": 0.9, + "nearControlPointDistance": 0.9, + "targetSegmentRun": 1, + "innerBrightnessScale": 20, + "firstStripeThickness": 0.2, + "secondStripeThickness": 0.05, + "minBeamWidth": 1, + "maxBeamWidth": 2, + "maxBeamJitter": 0.2, + "minBeamJitter": 0.1, + "minBeamTrans": 0.6, + "maxBeamTrans": 0.6, + "minBeamLines": 1, + "maxBeamLines": 5, - "colorNumbers" : [ + "colorNumbers": [ [0, 0, 0, 0], "red", "blue", "green", "yellow", "orange", [210, 45, 193, 255], "black", "white" ], - "colorKeys" : [ + "colorKeys": [ "", ".red", ".blue", ".green", ".yellow", ".orange", ".pink", ".black", ".white" ] } diff --git a/items/tools/sb_slimehandgrapple.activeitem b/items/tools/sb_slimehandgrapple.activeitem index 99a45976..2a03d445 100644 --- a/items/tools/sb_slimehandgrapple.activeitem +++ b/items/tools/sb_slimehandgrapple.activeitem @@ -1,35 +1,35 @@ { - "itemName" : "sb_slimehandgrapple", - "price" : 25, - "inventoryIcon" : "sb_slimehandgrappleicon.png", - "rarity" : "Common", - "description" : "Sticky, stretchy, undeniably handy!",//"It sticks to the walls.", - "shortdescription" : "Slime Hand Grapple", - "category" : "tool", - "twoHanded" : true, - "tooltipKind" : "sb_tool", - "largeImage" : "sb_slimehandgrappleicon.png", + "itemName": "sb_slimehandgrapple", + "price": 25, + "inventoryIcon": "sb_slimehandgrappleicon.png", + "rarity": "Common", + "description": "Sticky, stretchy, undeniably handy!", //"It sticks to the walls.", + "shortdescription": "Slime Hand Grapple", + "category": "tool", + "twoHanded": true, + "tooltipKind": "sb_tool", + "largeImage": "sb_slimehandgrappleicon.png", - "scripts" : ["/items/active/grapplinghooks/grapplinghook.lua"], - "animationScripts" : ["/items/active/effects/renderrope.lua"], - "animation" : "sb_grapplinghook.animation", + "scripts": ["/items/active/grapplinghooks/grapplinghook.lua"], + "animationScripts": ["/items/active/effects/renderrope.lua"], + "animation": "sb_grapplinghook.animation", - "fireOffset" : [0, 0], - "ropeOffset" : [-1.75, 0], - "ropeVisualOffset" : [-0.5, 0.0], - "consumeOnUse" : true, - "projectileType" : "sb_slimehook", - "projectileParameters" : { - "speed" : 120, - "timeToLive" : 2.5 + "fireOffset": [0, 0], + "ropeOffset": [-1.75, 0], + "ropeVisualOffset": [-0.5, 0.0], + "consumeOnUse": true, + "projectileType": "sb_slimehook", + "projectileParameters": { + "speed": 120, + "timeToLive": 2.5 }, - "ropeWidth" : 0.6, - "ropeColor" : [90, 211, 133, 255], - "reelInDistance" : 4.5, - "reelOutLength" : 70, - "breakLength" : 90, - "minSwingDistance" : 1.5, - "reelSpeed" : 20, - "controlForce" : 4000, - "groundLagTime" : 0.2 -} \ No newline at end of file + "ropeWidth": 0.6, + "ropeColor": [90, 211, 133, 255], + "reelInDistance": 4.5, + "reelOutLength": 70, + "breakLength": 90, + "minSwingDistance": 1.5, + "reelSpeed": 20, + "controlForce": 4000, + "groundLagTime": 0.2 +} diff --git a/items/tools/sb_slimehandgrapple.png b/items/tools/sb_slimehandgrapple.png index 87e35dd3..512e9331 100644 Binary files a/items/tools/sb_slimehandgrapple.png and b/items/tools/sb_slimehandgrapple.png differ diff --git a/items/tools/sb_stoneaxe.harvestingtool b/items/tools/sb_stoneaxe.harvestingtool deleted file mode 100644 index 8712eec5..00000000 --- a/items/tools/sb_stoneaxe.harvestingtool +++ /dev/null @@ -1,18 +0,0 @@ -{ - "itemName" : "sb_stoneaxe", - "inventoryIcon" : "sb_stoneaxeicon.png", - "maxStack" : 1, - "price" : 110, - "rarity" : "Common", - "tooltipKind" : "sb_tool", - "category" : "tool", - "largeImage" : "/items/tools/sb_stoneaxebig.png", - "description" : "Chop chop!", - "shortdescription" : "Stone Axe", - "image" : "sb_stoneaxe.png", - "handPosition" : [-4, -8], - "fireTime" : 0.25, - "tileDamageType" : "plantish", - "twoHanded" : true, - "strikeSounds" : ["/sfx/tools/pickaxe_hit.ogg"] -} \ No newline at end of file diff --git a/items/tools/sb_stoneaxe.miningtool b/items/tools/sb_stoneaxe.miningtool new file mode 100644 index 00000000..fbfe26b7 --- /dev/null +++ b/items/tools/sb_stoneaxe.miningtool @@ -0,0 +1,29 @@ +{ + "itemName": "sb_stoneaxe", + "inventoryIcon": "sb_stoneaxeicon.png", + "maxStack": 1, + "rarity": "common", + "price": 110, + "tooltipKind": "sb_object", + "category": "tool", + "description": "Chop chop! This axe will make getting wood easier.", + "shortdescription": "Stone Axe", + "image": "sb_stoneaxe.png", + "tooltipFields": { + "objectImage": "/items/tools/sb_stoneaxebig.png" + }, + "handPosition": [-4, -8], + "pointable": true, + "fireTime": 0.25, + "swingStart": 60, + "swingFinish": -40, + "tileDamageType": "plantish", + "blockRadius": 2, + "altBlockRadius": 1, + "twoHanded": true, + "strikeSounds": ["/sfx/tools/pickaxe_hit.ogg"], + "durability": 1, + "durabilityPerUse": 0, + "harvestLevel": 99, + "tileDamage": 1 +} diff --git a/items/tools/sb_stoneaxebig.png b/items/tools/sb_stoneaxebig.png index 06ae7a58..8dadee05 100644 Binary files a/items/tools/sb_stoneaxebig.png and b/items/tools/sb_stoneaxebig.png differ diff --git a/items/tools/sb_stonehoe.activeitem b/items/tools/sb_stonehoe.activeitem new file mode 100644 index 00000000..b600ea5f --- /dev/null +++ b/items/tools/sb_stonehoe.activeitem @@ -0,0 +1,39 @@ +{ + "itemName": "sb_stonehoe", + "price": 110, + "maxStack": 1, + "rarity": "common", + "category": "tool", + "description": "A stone hoe for tilling soil to grow crops. It won't last long, but it'll get the job done.", + "shortdescription": "Stone Hoe", + "tooltipKind": "sb_tool", + "largeImage": "/items/tools/sb_stonehoebig.png", + "twoHanded": true, + "itemTags": ["tool"], + "inventoryIcon": "sb_stonehoeicon.png", + "animation": "/items/tools/miningtools/sb_miningtool.animation", + "animationParts": { + "tool": "sb_stonehoe.png" + }, + "scripts": ["/items/active/weapons/melee/meleeweapon.lua"], + + "durability": 50, + "durabilityPerUse": 1, + "blockRadius": 1, + "tileDamage": 0.001, + "tileDamageType": "tilling", + "canBeRepaired": false, + "sb_unrepairable": true, + + "primaryAbilityType": "sb_miningtool", + "primaryAbility": { + "layer": "foreground", + "activatingFireMode": "primary" + }, + "altAbilityType": "sb_miningtool", + "altAbility": { + "layer": "background", + "activatingFireMode": "alt" + }, + "builder": "/items/buildscripts/buildunrandweapon.lua" +} diff --git a/items/tools/sb_stonehoe.png b/items/tools/sb_stonehoe.png index 09c4d474..239a2d59 100644 Binary files a/items/tools/sb_stonehoe.png and b/items/tools/sb_stonehoe.png differ diff --git a/items/tools/sb_stonehoe.tillingtool b/items/tools/sb_stonehoe.tillingtool deleted file mode 100644 index 5db6e67d..00000000 --- a/items/tools/sb_stonehoe.tillingtool +++ /dev/null @@ -1,21 +0,0 @@ -{ - "itemName" : "sb_stonehoe", - "inventoryIcon" : "sb_stonehoeicon.png", - "maxStack" : 1, - "rarity" : "Common", - "price" : 110, - "tooltipKind" : "sb_tool", - "category" : "tool", - "largeImage" : "/items/tools/sb_stonehoebig.png", - "description" : "A stone hoe, useful for farming.", - "shortdescription" : "Stone Hoe", - "image" : "sb_stonehoe.png", - "handPosition" : [-5, -4], //x-4 - "fireTime" : 0.29, - "blockRadius" : 5, - "altBlockRadius" : 1, - "twoHanded" : true, - "strikeSounds" : ["/sfx/tools/pickaxe_hit.ogg"], - "learnBlueprintsOnPickup" : ["woodenwateringcan","sb_wateringcan"] -//"pickupQuestTemplates" : [ "firstcrops" ] -} \ No newline at end of file diff --git a/items/tools/sb_stonehoebig.png b/items/tools/sb_stonehoebig.png index c1f10cb2..fe39627f 100644 Binary files a/items/tools/sb_stonehoebig.png and b/items/tools/sb_stonehoebig.png differ diff --git a/items/tools/sb_stonehoeicon.png b/items/tools/sb_stonehoeicon.png index c4416702..05df955e 100644 Binary files a/items/tools/sb_stonehoeicon.png and b/items/tools/sb_stonehoeicon.png differ diff --git a/items/tools/sb_swingingvine.activeitem b/items/tools/sb_swingingvine.activeitem index 94a56baa..b4679b52 100644 --- a/items/tools/sb_swingingvine.activeitem +++ b/items/tools/sb_swingingvine.activeitem @@ -1,37 +1,47 @@ { - "itemName" : "sb_swingingvine", - "price" : 250, - "inventoryIcon" : "sb_swingingvineicon.png", - "rarity" : "uncommon", - "maxStack" : 1, - "description" : "Swing around as much as you like!", - "shortdescription" : "Swinging Vine", - "category" : "tool", - "twoHanded" : false, - "tooltipKind" : "sb_tool", - "largeImage" : "sb_swingingvineicon.png", + "itemName": "sb_swingingvine", + "price": 250, + "inventoryIcon": "sb_swingingvineicon.png", + "rarity": "uncommon", + "maxStack": 1, + "description": "Swing around as much as you like!", + "shortdescription": "Swinging Vine", + "category": "tool", + "twoHanded": false, + "tooltipKind": "sb_tool", + "largeImage": "sb_swingingvineicon.png", - "scripts" : ["/items/active/grapplinghooks/grapplinghook.lua"], - "animationScripts" : ["/items/active/effects/renderrope.lua"], - "animation" : "sb_grapplinghook.animation", - "animationCustom" : {"animatedParts":{"parts":{"rope":{"properties":{"image":"vinehandle.png"}}}}}, + "scripts": ["/items/active/grapplinghooks/grapplinghook.lua"], + "animationScripts": ["/items/active/effects/renderrope.lua"], + "animation": "sb_grapplinghook.animation", + "animationCustom": { + "animatedParts": { + "parts": { + "rope": { + "properties": { + "image": "vinehandle.png" + } + } + } + } + }, - "fireOffset" : [0, 0], - "ropeOffset" : [-1.75, 0], - "ropeVisualOffset" : [-0.5, 0.0], - "consumeOnUse" : false, - "projectileType" : "sb_vinehook", - "projectileParameters" : { - "speed" : 50, - "timeToLive" : 2.5 + "fireOffset": [0, 0], + "ropeOffset": [-1.75, 0], + "ropeVisualOffset": [-0.5, 0.0], + "consumeOnUse": false, + "projectileType": "sb_vinehook", + "projectileParameters": { + "speed": 50, + "timeToLive": 2.5 }, - "ropeWidth" : 0.8, - "ropeColor" : [72, 130, 47, 255], - "reelInDistance" : 2.5, - "reelOutLength" : 50, - "breakLength" : 60, - "minSwingDistance" : 1.5, - "reelSpeed" : 4, - "controlForce" : 2000, - "groundLagTime" : 0.2 -} \ No newline at end of file + "ropeWidth": 0.8, + "ropeColor": [72, 130, 47, 255], + "reelInDistance": 2.5, + "reelOutLength": 50, + "breakLength": 60, + "minSwingDistance": 1.5, + "reelSpeed": 4, + "controlForce": 2000, + "groundLagTime": 0.2 +} diff --git a/items/tools/sb_swingingvineicon.png b/items/tools/sb_swingingvineicon.png index 509f958d..24b4984a 100644 Binary files a/items/tools/sb_swingingvineicon.png and b/items/tools/sb_swingingvineicon.png differ diff --git a/items/tools/sb_wiretool.wiretool b/items/tools/sb_wiretool.wiretool index f9dcb795..e85b547c 100644 --- a/items/tools/sb_wiretool.wiretool +++ b/items/tools/sb_wiretool.wiretool @@ -1,35 +1,35 @@ { - "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], - "fireTime" : 0.25, - "twoHanded" : true, - "price" : 1050, - "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], - "segmentsPerUnit" : 1, - "nearControlPointElasticity" : 0.1, - "farControlPointElasticity" : 0.9, - "nearControlPointDistance" : 0.9, - "targetSegmentRun" : 1, - "innerBrightnessScale" : 20, - "firstStripeThickness" : 0.05, - "secondStripeThickness" : 0.1, - "minBeamWidth" : 2, - "maxBeamWidth" : 4, - "minBeamJitter" : 0.05, - "maxBeamJitter" : 0.1, - "minBeamTrans" : 0.1, - "maxBeamTrans" : 0.4, - "minBeamLines" : 3, - "maxBeamLines" : 5 -} \ No newline at end of file + "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], + "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], + "segmentsPerUnit": 1, + "nearControlPointElasticity": 0.1, + "farControlPointElasticity": 0.9, + "nearControlPointDistance": 0.9, + "targetSegmentRun": 1, + "innerBrightnessScale": 20, + "firstStripeThickness": 0.05, + "secondStripeThickness": 0.1, + "minBeamWidth": 2, + "maxBeamWidth": 4, + "minBeamJitter": 0.05, + "maxBeamJitter": 0.1, + "minBeamTrans": 0.1, + "maxBeamTrans": 0.4, + "minBeamLines": 3, + "maxBeamLines": 5 +} diff --git a/items/tools/sb_wiretoolbig.png b/items/tools/sb_wiretoolbig.png index 87ff34dc..283640fd 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 b7a766f3..a1bfb24b 100644 Binary files a/items/tools/sb_wiringgun2icon.png and b/items/tools/sb_wiringgun2icon.png differ diff --git a/monsters/boss/penguinUfo/sb_penguinUfo.monstertype b/monsters/boss/penguinUfo/sb_penguinUfo.monstertype index 9d9051b5..efac1ba1 100644 --- a/monsters/boss/penguinUfo/sb_penguinUfo.monstertype +++ b/monsters/boss/penguinUfo/sb_penguinUfo.monstertype @@ -1,17 +1,17 @@ { - "type" : "sb_penguinUfo", - "shortdescription" : "^#f00;Dreadwing^reset;", - "description" : "The infamous Penguin pirate Dreadwing, in his unmistakable UFO.", - "categories" : [ "penguinUfo" ], - "parts" : [ "ufo", "pilot" ], + "type": "sb_penguinUfo", + "shortdescription": "^#f00;Dreadwing^reset;", + "description": "The infamous Penguin pirate Dreadwing, in his unmistakable UFO.", + "categories": ["penguinUfo"], + "parts": ["ufo", "pilot"], - "animation" : "sb_penguinUfo.animation", - "reversed" : true, + "animation": "sb_penguinUfo.animation", + "reversed": true, - "dropPools" : [ "dreadwingDrop" ], + "dropPools": ["dreadwingDrop"], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/boss/bossMonster.lua", "/monsters/simpleRangedAttack.lua", "/scripts/stateMachine.lua", @@ -23,203 +23,196 @@ "/monsters/sb_bossmonster.lua" ], - "skills" : ["ufoMoveFireAttack", "ufoSwoopAttack", "ufoReinforcementsAttack", "ufoSlamAttack", "ufoTeleportAttack", "ufoPulseCannonAttack"], - "skillCount" : 6, - - "phases" : [ - { - "skills" : ["ufoMoveFireAttack", "ufoSwoopAttack"] - }, - { - "enterPhase" : "ufoReinforcementsAttack", - "trigger" : "healthPercentage", - "healthPercentage" : 0.8, - "skills" : ["ufoMoveFireAttack", "ufoSwoopAttack", "ufoReinforcementsAttack", "ufoMoveFireAttack", "ufoSlamAttack", "ufoReinforcementsAttack"] - }, - { - "enterPhase" : "ufoReinforcementsAttack", - "trigger" : "healthPercentage", - "healthPercentage" : 0.4, - "skills" : ["ufoMoveFireAttack", "ufoTeleportAttack", "ufoSlamAttack", "ufoReinforcementsAttack", "ufoPulseCannonAttack"] + "skills": ["ufoMoveFireAttack", "ufoSwoopAttack", "ufoReinforcementsAttack", "ufoSlamAttack", "ufoTeleportAttack", "ufoPulseCannonAttack"], + "skillCount": 6, + + "phases": [{ + "skills": ["ufoMoveFireAttack", "ufoSwoopAttack"] + }, { + "enterPhase": "ufoReinforcementsAttack", + "trigger": "healthPercentage", + "healthPercentage": 0.8, + "skills": ["ufoMoveFireAttack", "ufoSwoopAttack", "ufoReinforcementsAttack", "ufoMoveFireAttack", "ufoSlamAttack", "ufoReinforcementsAttack"] + }, { + "enterPhase": "ufoReinforcementsAttack", + "trigger": "healthPercentage", + "healthPercentage": 0.4, + "skills": ["ufoMoveFireAttack", "ufoTeleportAttack", "ufoSlamAttack", "ufoReinforcementsAttack", "ufoPulseCannonAttack"] } ], - "universeFlagOnDeath" : "outpost_beakeasy", + "universeFlagOnDeath": "outpost_beakeasy", - "queryTargetDistance" : 50.0, - "switchTargetDistance" : 10.0, - "keepTargetInSight" : false, + "queryTargetDistance": 50.0, + "switchTargetDistance": 10.0, + "keepTargetInSight": false, - "cruiseDistance" : 25, + "cruiseDistance": 25, - "metaBoundBox" : [-14.0, -4.0, 14.0, 4.0], - "scale" : 1.0, + "metaBoundBox": [-14.0, -4.0, 14.0, 4.0], + "scale": 1.0, - "movementSettings" : { - "gravityEnabled" : false, - "collisionPoly" : [ [-14.0, -4.0], [14.0, -4.0], [14.0, 4.0], [-14.0, 4.0] ], + "movementSettings": { + "gravityEnabled": false, + "collisionPoly": [[-14.0, -4.0], [14.0, -4.0], [14.0, 4.0], [-14.0, 4.0]], - "mass" : 4.0, - "flySpeed" : 20, - "airForce" : 200.0, - "physicsEffectCategories" : ["boss"] + "mass": 4.0, + "flySpeed": 20, + "airForce": 200.0, + "physicsEffectCategories": ["boss"] }, - "knockoutTime" : 0.1, - "knockoutEffect" : "blink", - "deathParticles" : "deathPoof", + "knockoutTime": 0.1, + "knockoutEffect": "blink", + "deathParticles": "deathPoof", - "touchDamage" : { - "poly" : [ [-14.0, -2.0], [0.0, -6.0], [14.0, -2.0], [14.0, 0.0], [0.0, 6.0], [-14.0, 0.0] ], - "damage" : 20, + "touchDamage": { + "poly": [[-14.0, -2.0], [0.0, -6.0], [14.0, -2.0], [14.0, 0.0], [0.0, 6.0], [-14.0, 0.0]], + "damage": 20, - "teamType" : "enemy", - "damageSourceKind" : "hammer", - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "hammer", + "statusEffects": [] }, - "statusSettings" : { - "statusProperties" : { - "bossMusic" : "/music/arctic-battle2-loop.ogg", - "targetMaterialKind" : "robotic" + "statusSettings": { + "statusProperties": { + "displayTitle": "Boss", + "bossMusic": "/music/arctic-battle2-loop.ogg", + "targetMaterialKind": "robotic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : false, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": false, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "grit" : { - "baseValue" : 1.0 + "grit": { + "baseValue": 1.0 }, - "maxHealth" : { - "baseValue" : 750 + "maxHealth": { + "baseValue": 750 }, - "protection" : { - "baseValue" : 50.0 + "protection": { + "baseValue": 50.0 }, - "healthRegen" : { - "baseValue" : 0.0 + "healthRegen": { + "baseValue": 0.0 }, - "fireStatusImmunity" : { - "baseValue" : 1.0 + "fireStatusImmunity": { + "baseValue": 1.0 }, - "iceStatusImmunity" : { - "baseValue" : 1.0 + "iceStatusImmunity": { + "baseValue": 1.0 }, - "electricStatusImmunity" : { - "baseValue" : 1.0 + "electricStatusImmunity": { + "baseValue": 1.0 }, - "poisonStatusImmunity" : { - "baseValue" : 1.0 + "poisonStatusImmunity": { + "baseValue": 1.0 }, - "specialStatusImmunity" : { - "baseValue" : 1.0 + "specialStatusImmunity": { + "baseValue": 1.0 }, - "healingStatusImmunity" : { - "baseValue" : 1.0 + "healingStatusImmunity": { + "baseValue": 1.0 }, - "stunImmunity" : { - "baseValue" : 1.0 + "stunImmunity": { + "baseValue": 1.0 }, - "powerMultiplier" : { - "baseValue" : 1.0 + "powerMultiplier": { + "baseValue": 1.0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0, - "maxValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0, + "maxValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - - "beamSourceOffset" : [0, -5.5], - "targetYOffsetRange" : [18.0, 22.0], - - "attackTime" : 5.0, - "fireInterval" : 0.6, - "cooldownTime" : 0.25, - - "projectiles" : { - "deathexplosion" : { - "type" : "regularexplosionknockback", - "config" : { - "speed" : 0.1, - "power" : 2, - - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/regularexplosion2/regularexplosionknockback.config" - }, - { - "action" : "projectile", - "type" : "sb_dreadwreckage", - "inheritDamageFactor" : 0.2, - "fuzzAngle" : 30, - "angleAdjust" : 0 - }, - { - "action" : "projectile", - "type" : "sb_dreadwreckage", - "inheritDamageFactor" : 0.2, - "fuzzAngle" : 30, - "angleAdjust" : 45 - }, - { - "action" : "projectile", - "type" : "sb_dreadwreckage", - "inheritDamageFactor" : 0.2, - "fuzzAngle" : 30, - "angleAdjust" : -45 + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + + "beamSourceOffset": [0, -5.5], + "targetYOffsetRange": [18.0, 22.0], + + "attackTime": 5.0, + "fireInterval": 0.6, + "cooldownTime": 0.25, + + "projectiles": { + "deathexplosion": { + "type": "regularexplosionknockback", + "config": { + "speed": 0.1, + "power": 2, + + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/regularexplosion2/regularexplosionknockback.config" + }, { + "action": "projectile", + "type": "sb_dreadwreckage", + "inheritDamageFactor": 0.2, + "fuzzAngle": 30, + "angleAdjust": 0 + }, { + "action": "projectile", + "type": "sb_dreadwreckage", + "inheritDamageFactor": 0.2, + "fuzzAngle": 30, + "angleAdjust": 45 + }, { + "action": "projectile", + "type": "sb_dreadwreckage", + "inheritDamageFactor": 0.2, + "fuzzAngle": 30, + "angleAdjust": -45 } ] }, - "fireTime" : 8.0, - "fireInterval" : 0.2, - "cooldown" : 0.1 + "fireTime": 8.0, + "fireInterval": 0.2, + "cooldown": 0.1 }, - "blockbreaker" : { - "type" : "invisibleprojectile", - "config" : { - "speed" : 0.1, - "power" : 0, - - "actionOnReap" : [ - { - "action" : "explosion", - "foregroundRadius" : 6, - "backgroundRadius" : 0, - "explosiveDamageAmount" : 100, - "delaySteps" : 1 + "blockbreaker": { + "type": "invisibleprojectile", + "config": { + "speed": 0.1, + "power": 0, + + "actionOnReap": [{ + "action": "explosion", + "foregroundRadius": 6, + "backgroundRadius": 0, + "explosiveDamageAmount": 100, + "delaySteps": 1 } ] }, - "fireTime" : 0.2, - "fireInterval" : 0.1, - "cooldown" : 0.1 + "fireTime": 0.2, + "fireInterval": 0.1, + "cooldown": 0.1 } } } diff --git a/monsters/boss/sb_jellyboss/jellyboss.monstertype b/monsters/boss/sb_jellyboss/jellyboss.monstertype index 9a681798..db5c843c 100644 --- a/monsters/boss/sb_jellyboss/jellyboss.monstertype +++ b/monsters/boss/sb_jellyboss/jellyboss.monstertype @@ -217,6 +217,7 @@ "statusSettings": { "statusProperties": { + "displayTitle": "Boss", "bossMusic": "/music/tentacle-battle1-loop.ogg", "targetMaterialKind": "organic" }, diff --git a/monsters/boss/sb_jellyboss/jellyboss.png b/monsters/boss/sb_jellyboss/jellyboss.png index bffd3558..d0d0b139 100644 Binary files a/monsters/boss/sb_jellyboss/jellyboss.png and b/monsters/boss/sb_jellyboss/jellyboss.png differ diff --git a/monsters/boss/sb_jellyboss/skeye.monstertype b/monsters/boss/sb_jellyboss/skeye.monstertype index e735b85c..30f959d1 100644 --- a/monsters/boss/sb_jellyboss/skeye.monstertype +++ b/monsters/boss/sb_jellyboss/skeye.monstertype @@ -1,274 +1,269 @@ { - "type" : "sb_skeye", - "shortdescription" : "^#f00;Skeye Jelly^reset;", - "description" : "A minion birthed from a larger jelly. It probably doesn't taste very good.", - "categories" : ["sb_skeye_organic"], - "parts" : ["body"], - "animation" : "skeye.animation", - "dropPools" : ["sb_boss3Treasure_2"], - "reversed" : true, + "type": "sb_skeye", + "shortdescription": "^#f00;Skeye Jelly^reset;", + "description": "A minion birthed from a larger jelly. It probably doesn't taste very good.", + "categories": ["sb_skeye_organic"], + "parts": ["body"], + "animation": "skeye.animation", + "dropPools": ["sb_boss3Treasure_2"], + "reversed": true, - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/scripts/util.lua", "/monsters/monster.lua", "/scripts/vec2.lua" ], - "behavior" : "monster", - "renderLayer" : "foregroundEntity", + "behavior": "monster", + "renderLayer": "foregroundEntity", - "behaviorConfig" : { - "damageOnTouch" : true, - "targetQueryRange" : 40, - "targetOnDamage" : true, - "keepTargetInSight" : false, - "keepTargetInRange" : 160, - "targetOutOfSightTime" : 8, - "hurtTime" : 0.05, - "hurtWaitForGround" : false, - "foundTargetActions" : [], - "hostileActions" : [ - { - "name" : "action-charge", - "cooldown" : 0.4, - "parameters" : { - "maximumRange" : 50, - "windupStopForce" : 50, - "windupState" : "", - "windupTime" : 0, - "onGround" : false, - "wallCollide" : false, - "aimAtTarget" : true, - "inaccuracy" : 1, - "airDirection" : [1, 0], - "chargeState" : "charge", - "chargeTime" : 0.1, - "chargeSpeed" : 20, - "chargeControlForce" : 250, - "wallCrashSound" : "", - "winddownTime" : 0, - "winddownStopForce" : 0, - "winddownState" : "" + "behaviorConfig": { + "damageOnTouch": true, + "targetQueryRange": 40, + "targetOnDamage": true, + "keepTargetInSight": false, + "keepTargetInRange": 160, + "targetOutOfSightTime": 8, + "hurtTime": 0.05, + "hurtWaitForGround": false, + "foundTargetActions": [], + "hostileActions": [{ + "name": "action-charge", + "cooldown": 0.4, + "parameters": { + "maximumRange": 50, + "windupStopForce": 50, + "windupState": "", + "windupTime": 0, + "onGround": false, + "wallCollide": false, + "aimAtTarget": true, + "inaccuracy": 1, + "airDirection": [1, 0], + "chargeState": "charge", + "chargeTime": 0.1, + "chargeSpeed": 20, + "chargeControlForce": 250, + "wallCrashSound": "", + "winddownTime": 0, + "winddownStopForce": 0, + "winddownState": "" } - }, - { - "name" : "action-fire", - "cooldown" : 4, - "parameters" : { - "requireLineOfSight" : true, - "maximumRange" : 20, - "minimumRange" : 4, - "onGround" : false, - "windupStopForce" : 50, - "windupTime" : 0.8, - "projectileType" : "sb_jellybossgoo", - "projectileParameters" : { - "speed" : 30, - "timeToLive" : 8 + }, { + "name": "action-fire", + "cooldown": 4, + "parameters": { + "requireLineOfSight": true, + "maximumRange": 20, + "minimumRange": 4, + "onGround": false, + "windupStopForce": 50, + "windupTime": 0.8, + "projectileType": "sb_jellybossgoo", + "projectileParameters": { + "speed": 30, + "timeToLive": 8 }, - "fireOffset" : [0, 0], - "aimAtTarget" : true, - "inaccuracy" : 0, - "fireState" : "fire", - "fireDelay" : 0.1, - "fireSound" : "", - "winddownState" : "", - "winddownTime" : 0.5 + "fireOffset": [0, 0], + "aimAtTarget": true, + "inaccuracy": 0, + "fireState": "fire", + "fireDelay": 0.1, + "fireSound": "", + "winddownState": "", + "winddownTime": 0.5 } - }, - { - "name" : "action-fire", - "cooldown" : 2, - "parameters" : { - "requireLineOfSight" : true, - "maximumRange" : 12, - "minimumRange" : 2, - "windupState" : "wavewindup", - "windupTime" : 1.37, - "projectileType" : "sb_jellybossgoo", - "power" : 1, - "fireOffset" : [1, 1], - "aimAtTarget" : true, - "projectileCount" : 1, - "fireSound" : "attack", + }, { + "name": "action-fire", + "cooldown": 2, + "parameters": { + "requireLineOfSight": true, + "maximumRange": 12, + "minimumRange": 2, + "windupState": "wavewindup", + "windupTime": 1.37, + "projectileType": "sb_jellybossgoo", + "power": 1, + "fireOffset": [1, 1], + "aimAtTarget": true, + "projectileCount": 1, + "fireSound": "attack", "range": 18, - "fireState" : "hurt", - "winddownState" : "chargewinddown", - "winddownTime" : 0.45 + "fireState": "hurt", + "winddownState": "chargewinddown", + "winddownTime": 0.45 } } ], - "periodicActions" : [], - "approachActions" : [ - { - "name" : "approach-fly", - "parameters" : { - "usePathfinding" : false + "periodicActions": [], + "approachActions": [{ + "name": "approach-fly", + "parameters": { + "usePathfinding": false } } ], - "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { - } - }, - { - "name" : "approach-fly", - "parameters" : { - "usePathfinding" : false + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + }, { + "name": "approach-fly", + "parameters": { + "usePathfinding": false } } ], - "wanderActions" : [ { - "name" : "action-fire", - "cooldown" : 2, - "parameters" : { - "requireLineOfSight" : true, - "maximumRange" : 12, - "minimumRange" : 2, - "windupState" : "wavewindup", - "windupTime" : 1.37, - "projectileType" : "sb_jellybossgoo", - "power" : 1, - "fireOffset" : [1, 1], - "aimAtTarget" : true, - "projectileCount" : 1, - "fireSound" : "attack", + "wanderActions": [{ + "name": "action-fire", + "cooldown": 2, + "parameters": { + "requireLineOfSight": true, + "maximumRange": 12, + "minimumRange": 2, + "windupState": "wavewindup", + "windupTime": 1.37, + "projectileType": "sb_jellybossgoo", + "power": 1, + "fireOffset": [1, 1], + "aimAtTarget": true, + "projectileCount": 1, + "fireSound": "attack", "range": 18, - "fireState" : "hurt", - "winddownState" : "chargewinddown", - "winddownTime" : 0.45 + "fireState": "hurt", + "winddownState": "chargewinddown", + "winddownTime": 0.45 } } ] }, - "touchDamage" : { - "poly" : [[-2.5,0],[-1.25,-3],[1.25,-3],[2.5,0],[1.25,3],[-1.25,3]], - "damage" : 15, - "teamType" : "enemy", - "damageSourceKind" : "default", - "knockback" : 20, - "statusEffects" : ["sb_jellyslow"] + "touchDamage": { + "poly": [[-2.5, 0], [-1.25, -3], [1.25, -3], [2.5, 0], [1.25, 3], [-1.25, 3]], + "damage": 15, + "teamType": "enemy", + "damageSourceKind": "default", + "knockback": 20, + "statusEffects": ["sb_jellyslow"] }, - "metaBoundBox" : [-1, -3, 1, 3], - "blockedSensors" : [[-2.5,0],[-1.25,-3],[1.25,-3],[2.5,0],[1.25,3],[-1.25,3]], - "fallSensors" : [[-2.5,0],[-1.25,-3],[1.25,-3],[2.5,0],[1.25,3],[-1.25,3]], - "scale" : 1, + "metaBoundBox": [-1, -3, 1, 3], + "blockedSensors": [[-2.5, 0], [-1.25, -3], [1.25, -3], [2.5, 0], [1.25, 3], [-1.25, 3]], + "fallSensors": [[-2.5, 0], [-1.25, -3], [1.25, -3], [2.5, 0], [1.25, 3], [-1.25, 3]], + "scale": 1, - "movementSettings" : { - "collisionEnabled" : false, - "collisionPoly" : [[-2.5,0],[-1.25,-3],[1.25,-3],[2.5,0],[1.25,3],[-1.25,3]], - "gravityEnabled" : false, - "mass" : 0.6, - "walkSpeed" : 5, - "runSpeed" : 13, - "jumpMultiplier" : 1, - "jumpSpeed" : 20, - "airFriction" : 2, - "airForce" : 25, - "flySpeed" : 16 + "movementSettings": { + "collisionEnabled": false, + "collisionPoly": [[-2.5, 0], [-1.25, -3], [1.25, -3], [2.5, 0], [1.25, 3], [-1.25, 3]], + "gravityEnabled": false, + "mass": 0.6, + "walkSpeed": 5, + "runSpeed": 13, + "jumpMultiplier": 1, + "jumpSpeed": 20, + "airFriction": 2, + "airForce": 25, + "flySpeed": 16 }, - "bodyMaterialKind" : "organic", - "knockoutTime" : 1, - "aggressive" : true, - "knockoutAnimationStates" : { - "damage" : "stunned" + "bodyMaterialKind": "organic", + "knockoutTime": 1, + "aggressive": true, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.3, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.3, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "grit" : { - "baseValue" : 1 + "grit": { + "baseValue": 1 }, - "maxHealth" : { - "baseValue" : 400 + "maxHealth": { + "baseValue": 400 }, - "protection" : { - "baseValue" : 10 + "protection": { + "baseValue": 10 }, - "healthRegen" : { - "baseValue" : 0 + "healthRegen": { + "baseValue": 0 }, - "powerMultiplier" : { - "baseValue" : 0.5 + "powerMultiplier": { + "baseValue": 0.5 }, - "physicalResistance" : { - "baseValue" : 0.2 + "physicalResistance": { + "baseValue": 0.2 }, - "fireResistance" : { - "baseValue" : 0 + "fireResistance": { + "baseValue": 0 }, - "stunImmunity" : { - "baseValue" : 1 + "stunImmunity": { + "baseValue": 1 }, - "fireStatusImmunity" : { - "baseValue" : 0 + "fireStatusImmunity": { + "baseValue": 0 }, - "iceResistance" : { - "baseValue" : -0.2 + "iceResistance": { + "baseValue": -0.2 }, - "iceStatusImmunity" : { - "baseValue" : 0 + "iceStatusImmunity": { + "baseValue": 0 }, - "electricResistance" : { - "baseValue" : 0.2 + "electricResistance": { + "baseValue": 0.2 }, - "electricStatusImmunity" : { - "baseValue" : 0 + "electricStatusImmunity": { + "baseValue": 0 }, - "poisonResistance" : { - "baseValue" : 0.7 + "poisonResistance": { + "baseValue": 0.7 }, - "poisonStatusImmunity" : { - "baseValue" : 1 + "poisonStatusImmunity": { + "baseValue": 1 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1, - "initialValue" : 0 + "resources": { + "stunned": { + "deltaValue": -1, + "initialValue": 0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : true, - "captureHealthFraction" : 0.3, - "nametagColor" : [64, 200, 255], - "captureCollectables" : {"monsters" : "sb_skeye"} + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": true, + "captureHealthFraction": 0.3, + "nametagColor": [64, 200, 255], + "captureCollectables": { + "monsters": "sb_skeye" + } } -} \ No newline at end of file +} diff --git a/monsters/boss/sb_jellyboss/skeye.png b/monsters/boss/sb_jellyboss/skeye.png index 993ec1fe..443679bf 100644 Binary files a/monsters/boss/sb_jellyboss/skeye.png and b/monsters/boss/sb_jellyboss/skeye.png differ diff --git a/monsters/boss/sb_robotboss/portrait.png b/monsters/boss/sb_robotboss/portrait.png index 37abcf89..9adac307 100644 Binary files a/monsters/boss/sb_robotboss/portrait.png and b/monsters/boss/sb_robotboss/portrait.png differ diff --git a/monsters/boss/sb_robotboss/robotbarm.png b/monsters/boss/sb_robotboss/robotbarm.png index 6220ed80..b4bdcbcc 100644 Binary files a/monsters/boss/sb_robotboss/robotbarm.png and b/monsters/boss/sb_robotboss/robotbarm.png differ diff --git a/monsters/boss/sb_robotboss/robotbody.png b/monsters/boss/sb_robotboss/robotbody.png index 2b8a341f..1bca9fba 100644 Binary files a/monsters/boss/sb_robotboss/robotbody.png and b/monsters/boss/sb_robotboss/robotbody.png differ diff --git a/monsters/boss/sb_robotboss/robotboss.monstertype b/monsters/boss/sb_robotboss/robotboss.monstertype index 20032295..b744c595 100644 --- a/monsters/boss/sb_robotboss/robotboss.monstertype +++ b/monsters/boss/sb_robotboss/robotboss.monstertype @@ -186,6 +186,7 @@ "statusSettings": { "statusProperties": { + "displayTitle": "Boss", "bossMusic": "/music/desert-battle-2.ogg", "targetMaterialKind": "robotic" }, diff --git a/monsters/boss/sb_robotboss/robotfarm.png b/monsters/boss/sb_robotboss/robotfarm.png index 3a578659..2865a761 100644 Binary files a/monsters/boss/sb_robotboss/robotfarm.png and b/monsters/boss/sb_robotboss/robotfarm.png differ diff --git a/monsters/boss/sb_robotboss/robotlit.png b/monsters/boss/sb_robotboss/robotlit.png index f99013a8..67a3feea 100644 Binary files a/monsters/boss/sb_robotboss/robotlit.png and b/monsters/boss/sb_robotboss/robotlit.png differ diff --git a/monsters/bugs/sb_moondancer/body.png b/monsters/bugs/sb_moondancer/body.png index 4e8bb518..cd11ec83 100644 Binary files a/monsters/bugs/sb_moondancer/body.png and b/monsters/bugs/sb_moondancer/body.png differ diff --git a/monsters/bugs/sb_moondancer/glow.png b/monsters/bugs/sb_moondancer/glow.png index ff97189e..f26427de 100644 Binary files a/monsters/bugs/sb_moondancer/glow.png and b/monsters/bugs/sb_moondancer/glow.png differ diff --git a/monsters/bugs/sb_moondancer/moondancer.monstertype b/monsters/bugs/sb_moondancer/moondancer.monstertype index 33109c41..f751363c 100644 --- a/monsters/bugs/sb_moondancer/moondancer.monstertype +++ b/monsters/bugs/sb_moondancer/moondancer.monstertype @@ -1,113 +1,112 @@ { - "type" : "sb_moondancer", - - "categories" : ["sb_moondancer"], - "parts" : ["body", "head"], - "animation" : "moondancer.animation", - "dropPools" : [ - { - "default" : "empty", - "bugnet" : "sb_moondancer" + "type": "sb_moondancer", + "categories": ["sb_moondancer"], + "parts": ["body", "head"], + "shortdescription": "Moondancer", + "animation": "moondancer.animation", + "dropPools": [{ + "default": "empty", + "bugnet": "sb_moondancer" } ], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/bugs/bug.lua", "/scripts/util.lua", "/scripts/vec2.lua" ], - "buzzing" : { - "riseSpeed" : 2, - "minGroundDistance" : 2, - "fallSpeed" : 3, - "maxGroundDistance" : 5, - "changeDirSpeed" : 2, - "wanderDistance" : 5, + "buzzing": { + "riseSpeed": 2, + "minGroundDistance": 2, + "fallSpeed": 3, + "maxGroundDistance": 5, + "changeDirSpeed": 2, + "wanderDistance": 5, - "rotationSpeed" : 2, - "rotationChangeInterval" : 1 + "rotationSpeed": 2, + "rotationChangeInterval": 1 }, - "metaBoundBox" : [-0.5, -0.5, 0.5, 0.5], - "scale" : 1, + "metaBoundBox": [-0.5, -0.5, 0.5, 0.5], + "scale": 1, - "movementSettings" : { - "collisionPoly" : [[-0.5, -0.5], [0.5, -0.5], [0.5, 0.5], [-0.5, 0.5]], + "movementSettings": { + "collisionPoly": [[-0.5, -0.5], [0.5, -0.5], [0.5, 0.5], [-0.5, 0.5]], - "mass" : 1, - "walkSpeed" : 10, - "runSpeed" : 10, - "jumpSpeed" : 5, - "flySpeed" : 3, - "airFriction" : 0, - "airForce" : 100, - "gravityEnabled" : false + "mass": 1, + "walkSpeed": 10, + "runSpeed": 10, + "jumpSpeed": 5, + "flySpeed": 3, + "airFriction": 0, + "airForce": 100, + "gravityEnabled": false }, - "bodyMaterialKind" : "organic", + "bodyMaterialKind": "organic", - "knockoutTime" : 0.1, - "knockoutEffect" : "", + "knockoutTime": 0.1, + "knockoutEffect": "", - "damageTeamType" : "passive", + "damageTeamType": "passive", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : false, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": false, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 1 + "maxHealth": { + "baseValue": 1 }, - "protection" : { - "baseValue" : 0 + "protection": { + "baseValue": 0 }, - "healthRegen" : { - "baseValue" : 0 + "healthRegen": { + "baseValue": 0 }, - "wetImmunity" : { - "baseValue" : 1 + "wetImmunity": { + "baseValue": 1 }, - "powerMultiplier" : { - "baseValue" : 1 + "powerMultiplier": { + "baseValue": 1 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1, - "initialValue" : 0 + "resources": { + "stunned": { + "deltaValue": -1, + "initialValue": 0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], + "mouthOffset": [0, 0], + "feetOffset": [0, -8], - "capturable" : false, - "relocatable" : true + "capturable": false, + "relocatable": true } -} \ No newline at end of file +} diff --git a/monsters/crawlers/crustoise/crustoise.monstertype.patch b/monsters/crawlers/crustoise/crustoise.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/crustoise/crustoise.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/crustoise/icecrustoise.monstertype.patch b/monsters/crawlers/crustoise/icecrustoise.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/crustoise/icecrustoise.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/iguarmor/iceiguarmor.monstertype.patch b/monsters/crawlers/iguarmor/iceiguarmor.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/iguarmor/iceiguarmor.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/iguarmor/iguarmor.monstertype.patch b/monsters/crawlers/iguarmor/iguarmor.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/iguarmor/iguarmor.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/oculob/fireoculob.monstertype.patch b/monsters/crawlers/oculob/fireoculob.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/oculob/fireoculob.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/oculob/oculob.monstertype.patch b/monsters/crawlers/oculob/oculob.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/oculob/oculob.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/pulpin/poisonpulpin.monstertype.patch b/monsters/crawlers/pulpin/poisonpulpin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/pulpin/poisonpulpin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/pulpin/pulpin.monstertype.patch b/monsters/crawlers/pulpin/pulpin.monstertype.patch deleted file mode 100644 index b9f6e6e3..00000000 --- a/monsters/crawlers/pulpin/pulpin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/snaggler/icesnaggler.monstertype.patch b/monsters/crawlers/snaggler/icesnaggler.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/snaggler/icesnaggler.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/snaggler/snaggler.monstertype.patch b/monsters/crawlers/snaggler/snaggler.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/snaggler/snaggler.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/tentaclecrawler/tentaclecrawler.frames b/monsters/crawlers/tentaclecrawler/tentaclecrawler.frames deleted file mode 100644 index 5bc1b487..00000000 --- a/monsters/crawlers/tentaclecrawler/tentaclecrawler.frames +++ /dev/null @@ -1,12 +0,0 @@ -{ - "frameGrid" : { - "size" : [24, 16], - "dimensions" : [7, 2], - - "names" : [ - [ null, "idle.1", null, "walk.1", "walk.2", "walk.3", "walk.4" ], - [ "walk.5", "walk.6", "walk.7", null, "hurt.1", null, "fall.1" ] - ] - } -} - diff --git a/monsters/crawlers/tentaclecrawler/tentaclecrawler.monstertype.patch b/monsters/crawlers/tentaclecrawler/tentaclecrawler.monstertype.patch index 112b18e1..1cabf9ff 100644 --- a/monsters/crawlers/tentaclecrawler/tentaclecrawler.monstertype.patch +++ b/monsters/crawlers/tentaclecrawler/tentaclecrawler.monstertype.patch @@ -1,3 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], +[ [{"op":"test","path":"/dropPools","inverse":true},{"op":"add","path":"/dropPools","value":[]}], -[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}]] \ No newline at end of file +[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}] +] \ No newline at end of file diff --git a/monsters/crawlers/tintic/electrictintic.monstertype.patch b/monsters/crawlers/tintic/electrictintic.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/tintic/electrictintic.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/tintic/tintic.monstertype.patch b/monsters/crawlers/tintic/tintic.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/tintic/tintic.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/crawlers/triplod/triplod.monstertype.patch b/monsters/crawlers/triplod/triplod.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/crawlers/triplod/triplod.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/critter/apexscabcritter/apexscabcritter.monstertype.patch b/monsters/critter/apexscabcritter/apexscabcritter.monstertype.patch index 80c7d01b..9565a75f 100644 --- a/monsters/critter/apexscabcritter/apexscabcritter.monstertype.patch +++ b/monsters/critter/apexscabcritter/apexscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Apex Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/appofloatcritter/appofloatcritter.monstertype.patch b/monsters/critter/appofloatcritter/appofloatcritter.monstertype.patch index 2a1fd700..0f011ac7 100644 --- a/monsters/critter/appofloatcritter/appofloatcritter.monstertype.patch +++ b/monsters/critter/appofloatcritter/appofloatcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Appofloat"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/arcticfishcritter/arcticfishcritter.monstertype.patch b/monsters/critter/arcticfishcritter/arcticfishcritter.monstertype.patch index c6b701ae..24d1a96f 100644 --- a/monsters/critter/arcticfishcritter/arcticfishcritter.monstertype.patch +++ b/monsters/critter/arcticfishcritter/arcticfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Arctic Fish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/armadillocritter/armadillocritter.monstertype.patch b/monsters/critter/armadillocritter/armadillocritter.monstertype.patch index 45374ee6..1d9f5212 100644 --- a/monsters/critter/armadillocritter/armadillocritter.monstertype.patch +++ b/monsters/critter/armadillocritter/armadillocritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Armadillo"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/ashrockcritter/ashrockcritter.monstertype.patch b/monsters/critter/ashrockcritter/ashrockcritter.monstertype.patch index 46b5718a..f5c19651 100644 --- a/monsters/critter/ashrockcritter/ashrockcritter.monstertype.patch +++ b/monsters/critter/ashrockcritter/ashrockcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Ashrock"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/avianscabcritter/avianscabcritter.monstertype.patch b/monsters/critter/avianscabcritter/avianscabcritter.monstertype.patch index a974cba3..87a4dae3 100644 --- a/monsters/critter/avianscabcritter/avianscabcritter.monstertype.patch +++ b/monsters/critter/avianscabcritter/avianscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Avian Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/ballooncritter/ballooncritter.monstertype.patch b/monsters/critter/ballooncritter/ballooncritter.monstertype.patch index 67171cc3..73e99e4e 100644 --- a/monsters/critter/ballooncritter/ballooncritter.monstertype.patch +++ b/monsters/critter/ballooncritter/ballooncritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Balloon"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bigwormcritter/bigwormcritter.monstertype.patch b/monsters/critter/bigwormcritter/bigwormcritter.monstertype.patch index c4532d71..d934dbd0 100644 --- a/monsters/critter/bigwormcritter/bigwormcritter.monstertype.patch +++ b/monsters/critter/bigwormcritter/bigwormcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Big Worm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/birdcritter/birdcritter.monstertype.patch b/monsters/critter/birdcritter/birdcritter.monstertype.patch index d33c848f..163402c6 100644 --- a/monsters/critter/birdcritter/birdcritter.monstertype.patch +++ b/monsters/critter/birdcritter/birdcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Bird"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/blipcritter/blipcritter.monstertype.patch b/monsters/critter/blipcritter/blipcritter.monstertype.patch index 6eb0786b..c0bccc38 100644 --- a/monsters/critter/blipcritter/blipcritter.monstertype.patch +++ b/monsters/critter/blipcritter/blipcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Blip"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bloodtoadcritter/bloodtoadcritter.monstertype.patch b/monsters/critter/bloodtoadcritter/bloodtoadcritter.monstertype.patch index ff5b558e..9b8e40d1 100644 --- a/monsters/critter/bloodtoadcritter/bloodtoadcritter.monstertype.patch +++ b/monsters/critter/bloodtoadcritter/bloodtoadcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Bloodtoad"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bluebutterflycritter/bluebutterflycritter.monstertype.patch b/monsters/critter/bluebutterflycritter/bluebutterflycritter.monstertype.patch index 93e34314..53163c2e 100644 --- a/monsters/critter/bluebutterflycritter/bluebutterflycritter.monstertype.patch +++ b/monsters/critter/bluebutterflycritter/bluebutterflycritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Butterfly"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bouncebagcritter/bouncebagcritter.monstertype.patch b/monsters/critter/bouncebagcritter/bouncebagcritter.monstertype.patch index a44c3ca3..e6cb8607 100644 --- a/monsters/critter/bouncebagcritter/bouncebagcritter.monstertype.patch +++ b/monsters/critter/bouncebagcritter/bouncebagcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Bouncebag"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bouncercritter/bouncercritter.monstertype.patch b/monsters/critter/bouncercritter/bouncercritter.monstertype.patch index be2f7469..615edaae 100644 --- a/monsters/critter/bouncercritter/bouncercritter.monstertype.patch +++ b/monsters/critter/bouncercritter/bouncercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Bouncer"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bowbirdcritter/bowbirdcritter.monstertype.patch b/monsters/critter/bowbirdcritter/bowbirdcritter.monstertype.patch index cac7598c..8be968cc 100644 --- a/monsters/critter/bowbirdcritter/bowbirdcritter.monstertype.patch +++ b/monsters/critter/bowbirdcritter/bowbirdcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Bow Bird"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/breakercritter/breakercritter.monstertype.patch b/monsters/critter/breakercritter/breakercritter.monstertype.patch index 03f2feed..f3970879 100644 --- a/monsters/critter/breakercritter/breakercritter.monstertype.patch +++ b/monsters/critter/breakercritter/breakercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Breaker"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/breakerfemalecritter/breakerfemalecritter.monstertype.patch b/monsters/critter/breakerfemalecritter/breakerfemalecritter.monstertype.patch index d4b65958..23e6bd14 100644 --- a/monsters/critter/breakerfemalecritter/breakerfemalecritter.monstertype.patch +++ b/monsters/critter/breakerfemalecritter/breakerfemalecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Queen Breaker"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/bunnycritter/bunnycritter.monstertype.patch b/monsters/critter/bunnycritter/bunnycritter.monstertype.patch index f08299d5..b0245cb5 100644 --- a/monsters/critter/bunnycritter/bunnycritter.monstertype.patch +++ b/monsters/critter/bunnycritter/bunnycritter.monstertype.patch @@ -1,5 +1,4 @@ [ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Bunny"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}] diff --git a/monsters/critter/cell2critter/cell2critter.monstertype.patch b/monsters/critter/cell2critter/cell2critter.monstertype.patch index 21745f1c..d996ecf4 100644 --- a/monsters/critter/cell2critter/cell2critter.monstertype.patch +++ b/monsters/critter/cell2critter/cell2critter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Cell"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/cell3critter/cell3critter.monstertype.patch b/monsters/critter/cell3critter/cell3critter.monstertype.patch index 21745f1c..d996ecf4 100644 --- a/monsters/critter/cell3critter/cell3critter.monstertype.patch +++ b/monsters/critter/cell3critter/cell3critter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Cell"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/cellcritter/cellcritter.monstertype.patch b/monsters/critter/cellcritter/cellcritter.monstertype.patch index 21745f1c..d996ecf4 100644 --- a/monsters/critter/cellcritter/cellcritter.monstertype.patch +++ b/monsters/critter/cellcritter/cellcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Cell"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/cellnodividecritter/cellnodividecritter.monstertype.patch b/monsters/critter/cellnodividecritter/cellnodividecritter.monstertype.patch index 21745f1c..d996ecf4 100644 --- a/monsters/critter/cellnodividecritter/cellnodividecritter.monstertype.patch +++ b/monsters/critter/cellnodividecritter/cellnodividecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Cell"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/charfishcritter/charfishcritter.monstertype.patch b/monsters/critter/charfishcritter/charfishcritter.monstertype.patch index 5aced368..328a537b 100644 --- a/monsters/critter/charfishcritter/charfishcritter.monstertype.patch +++ b/monsters/critter/charfishcritter/charfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Charfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/chevcritter/chevcritter.monstertype.patch b/monsters/critter/chevcritter/chevcritter.monstertype.patch index 7af54822..c42cd5c3 100644 --- a/monsters/critter/chevcritter/chevcritter.monstertype.patch +++ b/monsters/critter/chevcritter/chevcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Chev"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/ciclesnail/ciclesnailcritter.monstertype.patch b/monsters/critter/ciclesnail/ciclesnailcritter.monstertype.patch index aa5768a0..6f2e8320 100644 --- a/monsters/critter/ciclesnail/ciclesnailcritter.monstertype.patch +++ b/monsters/critter/ciclesnail/ciclesnailcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snailcicle"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/cliffcritter/cliffcritter.monstertype.patch b/monsters/critter/cliffcritter/cliffcritter.monstertype.patch index 5cd337e7..2c6de202 100644 --- a/monsters/critter/cliffcritter/cliffcritter.monstertype.patch +++ b/monsters/critter/cliffcritter/cliffcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Cliff"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/crabcritter/crabcritter.monstertype.patch b/monsters/critter/crabcritter/crabcritter.monstertype.patch index 6a83889a..0b8ed18f 100644 --- a/monsters/critter/crabcritter/crabcritter.monstertype.patch +++ b/monsters/critter/crabcritter/crabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Crab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/crystalbirdcritter/crystalbirdcritter.monstertype.patch b/monsters/critter/crystalbirdcritter/crystalbirdcritter.monstertype.patch index 14b66790..feba3d12 100644 --- a/monsters/critter/crystalbirdcritter/crystalbirdcritter.monstertype.patch +++ b/monsters/critter/crystalbirdcritter/crystalbirdcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Crystal Bird"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/crystaltortoisecritter/crystaltortoisecritter.monstertype.patch b/monsters/critter/crystaltortoisecritter/crystaltortoisecritter.monstertype.patch index d008ce3f..5d583c9a 100644 --- a/monsters/critter/crystaltortoisecritter/crystaltortoisecritter.monstertype.patch +++ b/monsters/critter/crystaltortoisecritter/crystaltortoisecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Crystal Tortoise"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/dancercritter/dancercritter.monstertype.patch b/monsters/critter/dancercritter/dancercritter.monstertype.patch index 860078b8..ad5a26bf 100644 --- a/monsters/critter/dancercritter/dancercritter.monstertype.patch +++ b/monsters/critter/dancercritter/dancercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Dancer"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/darkballcritter/darkballcritter.monstertype.patch b/monsters/critter/darkballcritter/darkballcritter.monstertype.patch index b37c4586..5347ad8c 100644 --- a/monsters/critter/darkballcritter/darkballcritter.monstertype.patch +++ b/monsters/critter/darkballcritter/darkballcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Darkball"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/darknessscabcritter/darknessscabcritter.monstertype.patch b/monsters/critter/darknessscabcritter/darknessscabcritter.monstertype.patch index 9366cc6d..646ade90 100644 --- a/monsters/critter/darknessscabcritter/darknessscabcritter.monstertype.patch +++ b/monsters/critter/darknessscabcritter/darknessscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Shadow Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/darkoneeyecritter/darkoneeyecritter.monstertype.patch b/monsters/critter/darkoneeyecritter/darkoneeyecritter.monstertype.patch index a41e992d..41e47f68 100644 --- a/monsters/critter/darkoneeyecritter/darkoneeyecritter.monstertype.patch +++ b/monsters/critter/darkoneeyecritter/darkoneeyecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Darkeye"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/darkthreeeyescritter/darkthreeeyescritter.monstertype.patch b/monsters/critter/darkthreeeyescritter/darkthreeeyescritter.monstertype.patch index d9225af5..b7800f6a 100644 --- a/monsters/critter/darkthreeeyescritter/darkthreeeyescritter.monstertype.patch +++ b/monsters/critter/darkthreeeyescritter/darkthreeeyescritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Darkeyes"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/darkwormcritter/darkwormcritter.monstertype.patch b/monsters/critter/darkwormcritter/darkwormcritter.monstertype.patch index 2b09efd8..2b32bed7 100644 --- a/monsters/critter/darkwormcritter/darkwormcritter.monstertype.patch +++ b/monsters/critter/darkwormcritter/darkwormcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Dark Worm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/dartcritter/dartcritter.monstertype.patch b/monsters/critter/dartcritter/dartcritter.monstertype.patch index 57a6c808..949e4a46 100644 --- a/monsters/critter/dartcritter/dartcritter.monstertype.patch +++ b/monsters/critter/dartcritter/dartcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Dart"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/deserttortoisecritter/deserttortoisecritter.monstertype.patch b/monsters/critter/deserttortoisecritter/deserttortoisecritter.monstertype.patch index 7e5db436..44d0d51a 100644 --- a/monsters/critter/deserttortoisecritter/deserttortoisecritter.monstertype.patch +++ b/monsters/critter/deserttortoisecritter/deserttortoisecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Desert Tortoise"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/eggcellcritter/eggcellcritter.monstertype.patch b/monsters/critter/eggcellcritter/eggcellcritter.monstertype.patch index bcc22af7..893ad2e8 100644 --- a/monsters/critter/eggcellcritter/eggcellcritter.monstertype.patch +++ b/monsters/critter/eggcellcritter/eggcellcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Egg Cell"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/eggcellflycritter/eggcellflycritter.monstertype.patch b/monsters/critter/eggcellflycritter/eggcellflycritter.monstertype.patch index bcc22af7..893ad2e8 100644 --- a/monsters/critter/eggcellflycritter/eggcellflycritter.monstertype.patch +++ b/monsters/critter/eggcellflycritter/eggcellflycritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Egg Cell"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/eyefriendcritter/eyefriendcritter.monstertype.patch b/monsters/critter/eyefriendcritter/eyefriendcritter.monstertype.patch index 5b79cb0a..db9b1b20 100644 --- a/monsters/critter/eyefriendcritter/eyefriendcritter.monstertype.patch +++ b/monsters/critter/eyefriendcritter/eyefriendcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Eyefriend"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/eyepodcritter/eyepodcritter.monstertype.patch b/monsters/critter/eyepodcritter/eyepodcritter.monstertype.patch index 5d16ebbf..7717f5f2 100644 --- a/monsters/critter/eyepodcritter/eyepodcritter.monstertype.patch +++ b/monsters/critter/eyepodcritter/eyepodcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Eyepod"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/firekrawlcritter/firekrawlcritter.monstertype.patch b/monsters/critter/firekrawlcritter/firekrawlcritter.monstertype.patch index b15980fe..360afaed 100644 --- a/monsters/critter/firekrawlcritter/firekrawlcritter.monstertype.patch +++ b/monsters/critter/firekrawlcritter/firekrawlcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Firekrawl"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/firerockcritter/firerockcritter.monstertype.patch b/monsters/critter/firerockcritter/firerockcritter.monstertype.patch index d4e4170a..0ff99395 100644 --- a/monsters/critter/firerockcritter/firerockcritter.monstertype.patch +++ b/monsters/critter/firerockcritter/firerockcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Firerock"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/fishberrycritter/fishberrycritter.monstertype.patch b/monsters/critter/fishberrycritter/fishberrycritter.monstertype.patch index 80c8f757..0f5baf8e 100644 --- a/monsters/critter/fishberrycritter/fishberrycritter.monstertype.patch +++ b/monsters/critter/fishberrycritter/fishberrycritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Berryfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/fishchilicritter/fishchilicritter.monstertype.patch b/monsters/critter/fishchilicritter/fishchilicritter.monstertype.patch index 0027d3d9..77d57dcc 100644 --- a/monsters/critter/fishchilicritter/fishchilicritter.monstertype.patch +++ b/monsters/critter/fishchilicritter/fishchilicritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Chilifish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/fishcritter/fishcritter.monstertype.patch b/monsters/critter/fishcritter/fishcritter.monstertype.patch index 0d7dc9ae..08367801 100644 --- a/monsters/critter/fishcritter/fishcritter.monstertype.patch +++ b/monsters/critter/fishcritter/fishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Fish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/fisheyecritter/fisheyecritter.monstertype.patch b/monsters/critter/fisheyecritter/fisheyecritter.monstertype.patch index 0bb8c2b6..694c9cc1 100644 --- a/monsters/critter/fisheyecritter/fisheyecritter.monstertype.patch +++ b/monsters/critter/fisheyecritter/fisheyecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Eyefish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/fishlemoncritter/fishlemoncritter.monstertype.patch b/monsters/critter/fishlemoncritter/fishlemoncritter.monstertype.patch index c7087401..d9193114 100644 --- a/monsters/critter/fishlemoncritter/fishlemoncritter.monstertype.patch +++ b/monsters/critter/fishlemoncritter/fishlemoncritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Lemonfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/floatbagcritter/floatbagcritter.monstertype.patch b/monsters/critter/floatbagcritter/floatbagcritter.monstertype.patch index ef376b95..2665326c 100644 --- a/monsters/critter/floatbagcritter/floatbagcritter.monstertype.patch +++ b/monsters/critter/floatbagcritter/floatbagcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Floatbag"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/floatinggeodecritter/floatinggeodecritter.monstertype.patch b/monsters/critter/floatinggeodecritter/floatinggeodecritter.monstertype.patch index 6f2b6bdf..8d32f101 100644 --- a/monsters/critter/floatinggeodecritter/floatinggeodecritter.monstertype.patch +++ b/monsters/critter/floatinggeodecritter/floatinggeodecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Floating Geode"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/floranscabcritter/floranscabcritter.monstertype.patch b/monsters/critter/floranscabcritter/floranscabcritter.monstertype.patch index 88928c95..1b429261 100644 --- a/monsters/critter/floranscabcritter/floranscabcritter.monstertype.patch +++ b/monsters/critter/floranscabcritter/floranscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Floran Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/flurlcritter/flurlcritter.monstertype.patch b/monsters/critter/flurlcritter/flurlcritter.monstertype.patch index e716026f..9c71c7aa 100644 --- a/monsters/critter/flurlcritter/flurlcritter.monstertype.patch +++ b/monsters/critter/flurlcritter/flurlcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Flurl"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/frogcritter/frogcritter.monstertype.patch b/monsters/critter/frogcritter/frogcritter.monstertype.patch index e5aefc32..5abf1605 100644 --- a/monsters/critter/frogcritter/frogcritter.monstertype.patch +++ b/monsters/critter/frogcritter/frogcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Frog"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/froggpolecritter/frogpolecritter.monstertype.patch b/monsters/critter/froggpolecritter/frogpolecritter.monstertype.patch index 457918e9..2e7cc9be 100644 --- a/monsters/critter/froggpolecritter/frogpolecritter.monstertype.patch +++ b/monsters/critter/froggpolecritter/frogpolecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Frogpole"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/frozenowlcritter/frozenowlcritter.monstertype.patch b/monsters/critter/frozenowlcritter/frozenowlcritter.monstertype.patch index 11be64f8..94505b46 100644 --- a/monsters/critter/frozenowlcritter/frozenowlcritter.monstertype.patch +++ b/monsters/critter/frozenowlcritter/frozenowlcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Frozen Owl"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/glitchscabcritter/glitchscabcritter.monstertype.patch b/monsters/critter/glitchscabcritter/glitchscabcritter.monstertype.patch index 38e56b5c..f03cbbad 100644 --- a/monsters/critter/glitchscabcritter/glitchscabcritter.monstertype.patch +++ b/monsters/critter/glitchscabcritter/glitchscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Glitch Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/gloopcritter/gloopcritter.monstertype.patch b/monsters/critter/gloopcritter/gloopcritter.monstertype.patch index ee8216d9..14a122d0 100644 --- a/monsters/critter/gloopcritter/gloopcritter.monstertype.patch +++ b/monsters/critter/gloopcritter/gloopcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Gloop"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/glowingball2critter/glowingball2critter.monstertype.patch b/monsters/critter/glowingball2critter/glowingball2critter.monstertype.patch index 1c5611a2..df1b59f3 100644 --- a/monsters/critter/glowingball2critter/glowingball2critter.monstertype.patch +++ b/monsters/critter/glowingball2critter/glowingball2critter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Glowball"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/glowingballcritter/glowingballcritter.monstertype.patch b/monsters/critter/glowingballcritter/glowingballcritter.monstertype.patch index 1c5611a2..df1b59f3 100644 --- a/monsters/critter/glowingballcritter/glowingballcritter.monstertype.patch +++ b/monsters/critter/glowingballcritter/glowingballcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Glowball"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/glowingfishcritter/glowingfishcritter.monstertype.patch b/monsters/critter/glowingfishcritter/glowingfishcritter.monstertype.patch index 6ba68a1b..256b8587 100644 --- a/monsters/critter/glowingfishcritter/glowingfishcritter.monstertype.patch +++ b/monsters/critter/glowingfishcritter/glowingfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Glowfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/groopcritter/groopcritter.monstertype.patch b/monsters/critter/groopcritter/groopcritter.monstertype.patch index 5d04933d..7ba86189 100644 --- a/monsters/critter/groopcritter/groopcritter.monstertype.patch +++ b/monsters/critter/groopcritter/groopcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Groop"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/gullcritter/gullcritter.monstertype.patch b/monsters/critter/gullcritter/gullcritter.monstertype.patch index b38869b6..8be9e8aa 100644 --- a/monsters/critter/gullcritter/gullcritter.monstertype.patch +++ b/monsters/critter/gullcritter/gullcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Gull"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/harecritter/harecritter.monstertype.patch b/monsters/critter/harecritter/harecritter.monstertype.patch index 69529865..946f44db 100644 --- a/monsters/critter/harecritter/harecritter.monstertype.patch +++ b/monsters/critter/harecritter/harecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Hare"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/hazmatcritter/hazmatcritter.monstertype.patch b/monsters/critter/hazmatcritter/hazmatcritter.monstertype.patch index c5710511..f8d055da 100644 --- a/monsters/critter/hazmatcritter/hazmatcritter.monstertype.patch +++ b/monsters/critter/hazmatcritter/hazmatcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Hazmat Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/hedgehogcritter/hedgehogcritter.monstertype.patch b/monsters/critter/hedgehogcritter/hedgehogcritter.monstertype.patch index 0c656e28..dfd8702c 100644 --- a/monsters/critter/hedgehogcritter/hedgehogcritter.monstertype.patch +++ b/monsters/critter/hedgehogcritter/hedgehogcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Hedgehog"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/hollowcritter/hollowcritter.monstertype.patch b/monsters/critter/hollowcritter/hollowcritter.monstertype.patch index d41b80e4..2868b95d 100644 --- a/monsters/critter/hollowcritter/hollowcritter.monstertype.patch +++ b/monsters/critter/hollowcritter/hollowcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Hollow"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/humanscabcritter/humanscabcritter.monstertype.patch b/monsters/critter/humanscabcritter/humanscabcritter.monstertype.patch index ddb2bc0e..0004d15b 100644 --- a/monsters/critter/humanscabcritter/humanscabcritter.monstertype.patch +++ b/monsters/critter/humanscabcritter/humanscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Human Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/hylotlscabcritter/hylotlscabcritter.monstertype.patch b/monsters/critter/hylotlscabcritter/hylotlscabcritter.monstertype.patch index 7dc0d4bd..baf318bb 100644 --- a/monsters/critter/hylotlscabcritter/hylotlscabcritter.monstertype.patch +++ b/monsters/critter/hylotlscabcritter/hylotlscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Hylotl Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/icescabcritter/icescabcritter.monstertype.patch b/monsters/critter/icescabcritter/icescabcritter.monstertype.patch index b8ce7bc6..c6bcccb2 100644 --- a/monsters/critter/icescabcritter/icescabcritter.monstertype.patch +++ b/monsters/critter/icescabcritter/icescabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Ice Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/jellocritter/jellocritter.monstertype.patch b/monsters/critter/jellocritter/jellocritter.monstertype.patch index 5f09fe82..c251dcba 100644 --- a/monsters/critter/jellocritter/jellocritter.monstertype.patch +++ b/monsters/critter/jellocritter/jellocritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Jello"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/jellycritter/jellycritter.monstertype.patch b/monsters/critter/jellycritter/jellycritter.monstertype.patch index 3ba04921..7124f5e7 100644 --- a/monsters/critter/jellycritter/jellycritter.monstertype.patch +++ b/monsters/critter/jellycritter/jellycritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Juvenile Jelly"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/krawlcritter/krawlcritter.monstertype.patch b/monsters/critter/krawlcritter/krawlcritter.monstertype.patch index 7160b0d9..650f00be 100644 --- a/monsters/critter/krawlcritter/krawlcritter.monstertype.patch +++ b/monsters/critter/krawlcritter/krawlcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Krawl"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/largegeodecritter/largegeodecritter.monstertype.patch b/monsters/critter/largegeodecritter/largegeodecritter.monstertype.patch index 06ba4963..11cf20c4 100644 --- a/monsters/critter/largegeodecritter/largegeodecritter.monstertype.patch +++ b/monsters/critter/largegeodecritter/largegeodecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Large Geode"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/leafscabcritter/leafscabcritter.monstertype.patch b/monsters/critter/leafscabcritter/leafscabcritter.monstertype.patch index 04ca83a1..19c23f54 100644 --- a/monsters/critter/leafscabcritter/leafscabcritter.monstertype.patch +++ b/monsters/critter/leafscabcritter/leafscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Leaf Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/loopacritter/loopacritter.monstertype.patch b/monsters/critter/loopacritter/loopacritter.monstertype.patch index 61558539..dc1217ee 100644 --- a/monsters/critter/loopacritter/loopacritter.monstertype.patch +++ b/monsters/critter/loopacritter/loopacritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Loopa"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/maggotcritter/maggotcritter.monstertype.patch b/monsters/critter/maggotcritter/maggotcritter.monstertype.patch index aff785c6..805365f7 100644 --- a/monsters/critter/maggotcritter/maggotcritter.monstertype.patch +++ b/monsters/critter/maggotcritter/maggotcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Maggot"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/magmawormcritter/magmawormcritter.monstertype.patch b/monsters/critter/magmawormcritter/magmawormcritter.monstertype.patch index c98484f7..0a5e32a7 100644 --- a/monsters/critter/magmawormcritter/magmawormcritter.monstertype.patch +++ b/monsters/critter/magmawormcritter/magmawormcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Magma Worm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/mousecritter/mousecritter.monstertype.patch b/monsters/critter/mousecritter/mousecritter.monstertype.patch index a7d0e303..9b486567 100644 --- a/monsters/critter/mousecritter/mousecritter.monstertype.patch +++ b/monsters/critter/mousecritter/mousecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Mouse"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/narfishcritter/narfishcritter.monstertype.patch b/monsters/critter/narfishcritter/narfishcritter.monstertype.patch index 0f9b0c02..51433170 100644 --- a/monsters/critter/narfishcritter/narfishcritter.monstertype.patch +++ b/monsters/critter/narfishcritter/narfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Narfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/orenibblercritter/orenibblercritter.monstertype.patch b/monsters/critter/orenibblercritter/orenibblercritter.monstertype.patch index c3a5cb22..79e16e7c 100644 --- a/monsters/critter/orenibblercritter/orenibblercritter.monstertype.patch +++ b/monsters/critter/orenibblercritter/orenibblercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Orenibbler"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/owlcritter/owlcritter.monstertype.patch b/monsters/critter/owlcritter/owlcritter.monstertype.patch index e5d03693..6603ded6 100644 --- a/monsters/critter/owlcritter/owlcritter.monstertype.patch +++ b/monsters/critter/owlcritter/owlcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Owl"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/penguinscabcritter/penguinscabcritter.monstertype.patch b/monsters/critter/penguinscabcritter/penguinscabcritter.monstertype.patch index 7d2bacc4..406c02a2 100644 --- a/monsters/critter/penguinscabcritter/penguinscabcritter.monstertype.patch +++ b/monsters/critter/penguinscabcritter/penguinscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Penguin Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/petalcritter/petalcritter.monstertype.patch b/monsters/critter/petalcritter/petalcritter.monstertype.patch index 5951c6e0..2fce019e 100644 --- a/monsters/critter/petalcritter/petalcritter.monstertype.patch +++ b/monsters/critter/petalcritter/petalcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Petal"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/poisonfishcritter/poisonfishcritter.monstertype.patch b/monsters/critter/poisonfishcritter/poisonfishcritter.monstertype.patch index 6ec1a4a8..19bd1538 100644 --- a/monsters/critter/poisonfishcritter/poisonfishcritter.monstertype.patch +++ b/monsters/critter/poisonfishcritter/poisonfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Poisonfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/poofincritter/poofincritter.monstertype.patch b/monsters/critter/poofincritter/poofincritter.monstertype.patch index 6e1c0e0d..989a5ce8 100644 --- a/monsters/critter/poofincritter/poofincritter.monstertype.patch +++ b/monsters/critter/poofincritter/poofincritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Poofin"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/prismelementalcritter/prismelementalcritter.monstertype.patch b/monsters/critter/prismelementalcritter/prismelementalcritter.monstertype.patch index bf3ecbea..d13e0fe2 100644 --- a/monsters/critter/prismelementalcritter/prismelementalcritter.monstertype.patch +++ b/monsters/critter/prismelementalcritter/prismelementalcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Prism Elemental"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/prismscabcritter/prismscabcritter.monstertype.patch b/monsters/critter/prismscabcritter/prismscabcritter.monstertype.patch index d08976b4..6c1a6137 100644 --- a/monsters/critter/prismscabcritter/prismscabcritter.monstertype.patch +++ b/monsters/critter/prismscabcritter/prismscabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Prism Scab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/pufferfishcritter/pufferfishcritter.monstertype.patch b/monsters/critter/pufferfishcritter/pufferfishcritter.monstertype.patch index 17cf2cdd..1ebfea9b 100644 --- a/monsters/critter/pufferfishcritter/pufferfishcritter.monstertype.patch +++ b/monsters/critter/pufferfishcritter/pufferfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Pufferfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/quibblecritter/quibblecritter.monstertype.patch b/monsters/critter/quibblecritter/quibblecritter.monstertype.patch index dcebe19c..72e80f0c 100644 --- a/monsters/critter/quibblecritter/quibblecritter.monstertype.patch +++ b/monsters/critter/quibblecritter/quibblecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Quibble"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/ravencritter/ravencritter.monstertype.patch b/monsters/critter/ravencritter/ravencritter.monstertype.patch index a3df2213..61cfe6d4 100644 --- a/monsters/critter/ravencritter/ravencritter.monstertype.patch +++ b/monsters/critter/ravencritter/ravencritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Raven"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/reasonablecritter/reasonablecritter.monstertype.patch b/monsters/critter/reasonablecritter/reasonablecritter.monstertype.patch index 8db95cf2..b72bd93f 100644 --- a/monsters/critter/reasonablecritter/reasonablecritter.monstertype.patch +++ b/monsters/critter/reasonablecritter/reasonablecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Reasonable"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/redbreastcritter/redbreastcritter.monstertype.patch b/monsters/critter/redbreastcritter/redbreastcritter.monstertype.patch index 09a6ec00..11feaa87 100644 --- a/monsters/critter/redbreastcritter/redbreastcritter.monstertype.patch +++ b/monsters/critter/redbreastcritter/redbreastcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Red Breast"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/rolypolycritter/rolypolycritter.monstertype.patch b/monsters/critter/rolypolycritter/rolypolycritter.monstertype.patch index 8eaf6ad9..2040e456 100644 --- a/monsters/critter/rolypolycritter/rolypolycritter.monstertype.patch +++ b/monsters/critter/rolypolycritter/rolypolycritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Roly Poly"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/sackbagcritter/sackbagcritter.monstertype.patch b/monsters/critter/sackbagcritter/sackbagcritter.monstertype.patch index 41622836..de10fbb5 100644 --- a/monsters/critter/sackbagcritter/sackbagcritter.monstertype.patch +++ b/monsters/critter/sackbagcritter/sackbagcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Sackbag"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/savybirdcritter/savybirdcritter.monstertype.patch b/monsters/critter/savybirdcritter/savybirdcritter.monstertype.patch index 33dff72a..db65cf04 100644 --- a/monsters/critter/savybirdcritter/savybirdcritter.monstertype.patch +++ b/monsters/critter/savybirdcritter/savybirdcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Savy Bird"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/sealcritter/sealcritter.monstertype.patch b/monsters/critter/sealcritter/sealcritter.monstertype.patch index c2c32f95..cf0e492e 100644 --- a/monsters/critter/sealcritter/sealcritter.monstertype.patch +++ b/monsters/critter/sealcritter/sealcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Seal"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/skellyfishcritter/skellyfishcritter.monstertype.patch b/monsters/critter/skellyfishcritter/skellyfishcritter.monstertype.patch index ae5c1435..654a622b 100644 --- a/monsters/critter/skellyfishcritter/skellyfishcritter.monstertype.patch +++ b/monsters/critter/skellyfishcritter/skellyfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Skellyfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/skywurmcritter/skywurmcritter.monstertype.patch b/monsters/critter/skywurmcritter/skywurmcritter.monstertype.patch index 52b64214..cc9d3427 100644 --- a/monsters/critter/skywurmcritter/skywurmcritter.monstertype.patch +++ b/monsters/critter/skywurmcritter/skywurmcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Sky Wurm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/slugbluecritter/slugbluecritter.monstertype.patch b/monsters/critter/slugbluecritter/slugbluecritter.monstertype.patch index 5f64a911..98052228 100644 --- a/monsters/critter/slugbluecritter/slugbluecritter.monstertype.patch +++ b/monsters/critter/slugbluecritter/slugbluecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Slug"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/slugcritter/slugcritter.monstertype.patch b/monsters/critter/slugcritter/slugcritter.monstertype.patch index 5f64a911..98052228 100644 --- a/monsters/critter/slugcritter/slugcritter.monstertype.patch +++ b/monsters/critter/slugcritter/slugcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Slug"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/sluggreencritter/sluggreencritter.monstertype.patch b/monsters/critter/sluggreencritter/sluggreencritter.monstertype.patch index 5f64a911..98052228 100644 --- a/monsters/critter/sluggreencritter/sluggreencritter.monstertype.patch +++ b/monsters/critter/sluggreencritter/sluggreencritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Slug"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/smallgeodecritter/smallgeodecritter.monstertype.patch b/monsters/critter/smallgeodecritter/smallgeodecritter.monstertype.patch index 5f9467ef..b5c153b1 100644 --- a/monsters/critter/smallgeodecritter/smallgeodecritter.monstertype.patch +++ b/monsters/critter/smallgeodecritter/smallgeodecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Geode"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snailcritter/snailcritter.monstertype.patch b/monsters/critter/snailcritter/snailcritter.monstertype.patch index f753b14b..25e525d2 100644 --- a/monsters/critter/snailcritter/snailcritter.monstertype.patch +++ b/monsters/critter/snailcritter/snailcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snail"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snakecritter/snakecritter.monstertype.patch b/monsters/critter/snakecritter/snakecritter.monstertype.patch index a86f25e1..9d401069 100644 --- a/monsters/critter/snakecritter/snakecritter.monstertype.patch +++ b/monsters/critter/snakecritter/snakecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snake"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snooglecritter/snooglecritter.monstertype.patch b/monsters/critter/snooglecritter/snooglecritter.monstertype.patch index aca17532..93fd455c 100644 --- a/monsters/critter/snooglecritter/snooglecritter.monstertype.patch +++ b/monsters/critter/snooglecritter/snooglecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snoogle"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snorecritter/snorecritter.monstertype.patch b/monsters/critter/snorecritter/snorecritter.monstertype.patch index 43371e49..db2091a8 100644 --- a/monsters/critter/snorecritter/snorecritter.monstertype.patch +++ b/monsters/critter/snorecritter/snorecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snore"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snowbcritter/snowbcritter.monstertype.patch b/monsters/critter/snowbcritter/snowbcritter.monstertype.patch index 33ac1d45..9e0a30e0 100644 --- a/monsters/critter/snowbcritter/snowbcritter.monstertype.patch +++ b/monsters/critter/snowbcritter/snowbcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snowb"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snowflakescritter/snowflakescritter.monstertype.patch b/monsters/critter/snowflakescritter/snowflakescritter.monstertype.patch index c634b9fa..c03d50d4 100644 --- a/monsters/critter/snowflakescritter/snowflakescritter.monstertype.patch +++ b/monsters/critter/snowflakescritter/snowflakescritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snowflake"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/snowymolecritter/snowymolecritter.monstertype.patch b/monsters/critter/snowymolecritter/snowymolecritter.monstertype.patch index c574cf40..9a3ddcef 100644 --- a/monsters/critter/snowymolecritter/snowymolecritter.monstertype.patch +++ b/monsters/critter/snowymolecritter/snowymolecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Snowy Mole"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/spidercritter/spidercritter.monstertype.patch b/monsters/critter/spidercritter/spidercritter.monstertype.patch index 371fee27..114a144b 100644 --- a/monsters/critter/spidercritter/spidercritter.monstertype.patch +++ b/monsters/critter/spidercritter/spidercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Spider"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/spindycritter/spindycritter.monstertype.patch b/monsters/critter/spindycritter/spindycritter.monstertype.patch index b19a3cf7..f3954be8 100644 --- a/monsters/critter/spindycritter/spindycritter.monstertype.patch +++ b/monsters/critter/spindycritter/spindycritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Spindy"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/sporelingcritter/sporelingcritter.monstertype.patch b/monsters/critter/sporelingcritter/sporelingcritter.monstertype.patch index 32b0dd3c..1e27d3d9 100644 --- a/monsters/critter/sporelingcritter/sporelingcritter.monstertype.patch +++ b/monsters/critter/sporelingcritter/sporelingcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Sporeling"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/squeekcritter/squeekcritter.monstertype.patch b/monsters/critter/squeekcritter/squeekcritter.monstertype.patch index a1319439..d78c6254 100644 --- a/monsters/critter/squeekcritter/squeekcritter.monstertype.patch +++ b/monsters/critter/squeekcritter/squeekcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Squeek"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/squidcritter/squidcritter.monstertype.patch b/monsters/critter/squidcritter/squidcritter.monstertype.patch index a87fcc8f..4b802326 100644 --- a/monsters/critter/squidcritter/squidcritter.monstertype.patch +++ b/monsters/critter/squidcritter/squidcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Squid"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/squirrelcritter/squirrelcritter.monstertype.patch b/monsters/critter/squirrelcritter/squirrelcritter.monstertype.patch index f52d584c..ef6cd212 100644 --- a/monsters/critter/squirrelcritter/squirrelcritter.monstertype.patch +++ b/monsters/critter/squirrelcritter/squirrelcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Squirrel"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/steambirdcritter/steambirdcritter.monstertype.patch b/monsters/critter/steambirdcritter/steambirdcritter.monstertype.patch index 30018bf3..87da7e95 100644 --- a/monsters/critter/steambirdcritter/steambirdcritter.monstertype.patch +++ b/monsters/critter/steambirdcritter/steambirdcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Steambird"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/steamfishcritter/steamfishcritter.monstertype.patch b/monsters/critter/steamfishcritter/steamfishcritter.monstertype.patch index bc9e662a..f3e28c6d 100644 --- a/monsters/critter/steamfishcritter/steamfishcritter.monstertype.patch +++ b/monsters/critter/steamfishcritter/steamfishcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Steamfish"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/steamspidercritter/steamspidercritter.monstertype.patch b/monsters/critter/steamspidercritter/steamspidercritter.monstertype.patch index 5dc3b76b..cdeebdd1 100644 --- a/monsters/critter/steamspidercritter/steamspidercritter.monstertype.patch +++ b/monsters/critter/steamspidercritter/steamspidercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Steamspider"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/swarmcritter/swarmcritter.monstertype.patch b/monsters/critter/swarmcritter/swarmcritter.monstertype.patch index 4d17a898..eedc1095 100644 --- a/monsters/critter/swarmcritter/swarmcritter.monstertype.patch +++ b/monsters/critter/swarmcritter/swarmcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Swarm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/swarmflyingcritter/swarmflyingcritter.monstertype.patch b/monsters/critter/swarmflyingcritter/swarmflyingcritter.monstertype.patch index 4d17a898..eedc1095 100644 --- a/monsters/critter/swarmflyingcritter/swarmflyingcritter.monstertype.patch +++ b/monsters/critter/swarmflyingcritter/swarmflyingcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Swarm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/symbiotecritter/symbiotecritter.monstertype.patch b/monsters/critter/symbiotecritter/symbiotecritter.monstertype.patch index 83754106..bfc4e3f5 100644 --- a/monsters/critter/symbiotecritter/symbiotecritter.monstertype.patch +++ b/monsters/critter/symbiotecritter/symbiotecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Symbiote"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/tinycrocodilecritter/tinycrocodilecritter.monstertype.patch b/monsters/critter/tinycrocodilecritter/tinycrocodilecritter.monstertype.patch index ba43003f..985bf200 100644 --- a/monsters/critter/tinycrocodilecritter/tinycrocodilecritter.monstertype.patch +++ b/monsters/critter/tinycrocodilecritter/tinycrocodilecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Crocodile"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/tortoisecritter/tortoisecritter.monstertype.patch b/monsters/critter/tortoisecritter/tortoisecritter.monstertype.patch index 36872a2d..c2fc4334 100644 --- a/monsters/critter/tortoisecritter/tortoisecritter.monstertype.patch +++ b/monsters/critter/tortoisecritter/tortoisecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Tortoise"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/toucritter/toucritter.monstertype.patch b/monsters/critter/toucritter/toucritter.monstertype.patch index 8d9c408b..1ca24f24 100644 --- a/monsters/critter/toucritter/toucritter.monstertype.patch +++ b/monsters/critter/toucritter/toucritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Toucan"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/toxiccrabcritter/toxiccrabcritter.monstertype.patch b/monsters/critter/toxiccrabcritter/toxiccrabcritter.monstertype.patch index e03a66c5..8959b8e0 100644 --- a/monsters/critter/toxiccrabcritter/toxiccrabcritter.monstertype.patch +++ b/monsters/critter/toxiccrabcritter/toxiccrabcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Toxic Crab"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/tritrotscritter/tritrotscritter.monstertype.patch b/monsters/critter/tritrotscritter/tritrotscritter.monstertype.patch index a92fbe42..a3eb8801 100644 --- a/monsters/critter/tritrotscritter/tritrotscritter.monstertype.patch +++ b/monsters/critter/tritrotscritter/tritrotscritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Tritrots"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/volcanicflowercritter/volcanicflowercritter.monstertype.patch b/monsters/critter/volcanicflowercritter/volcanicflowercritter.monstertype.patch index 4f1bf1c6..2511b51e 100644 --- a/monsters/critter/volcanicflowercritter/volcanicflowercritter.monstertype.patch +++ b/monsters/critter/volcanicflowercritter/volcanicflowercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Volcanic Flower"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/vulturecritter/vulturecritter.monstertype.patch b/monsters/critter/vulturecritter/vulturecritter.monstertype.patch index 219219e7..341472cb 100644 --- a/monsters/critter/vulturecritter/vulturecritter.monstertype.patch +++ b/monsters/critter/vulturecritter/vulturecritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Vulture"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/wintercritter/wintercritter.monstertype.patch b/monsters/critter/wintercritter/wintercritter.monstertype.patch index ee3b1dee..7059bd3f 100644 --- a/monsters/critter/wintercritter/wintercritter.monstertype.patch +++ b/monsters/critter/wintercritter/wintercritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Winter"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/wurmcritter/wurmcritter.monstertype.patch b/monsters/critter/wurmcritter/wurmcritter.monstertype.patch index 47a849e5..c64e12a5 100644 --- a/monsters/critter/wurmcritter/wurmcritter.monstertype.patch +++ b/monsters/critter/wurmcritter/wurmcritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Wurm"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/critter/yeticritter/yeticritter.monstertype.patch b/monsters/critter/yeticritter/yeticritter.monstertype.patch index fcf057a8..a8ed6625 100644 --- a/monsters/critter/yeticritter/yeticritter.monstertype.patch +++ b/monsters/critter/yeticritter/yeticritter.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Yeti"}], [{"op":"test","path":"/baseParameters/movementSettings/collisionPoly","value":[[-0.5,-0.5],[0.5,-0.5],[0.5,0.5],[-0.5,0.5]]}, {"op":"replace","path":"/baseParameters/movementSettings/collisionPoly","value":[[0,-0.5],[0.5,0],[0,0.5],[-0.5,0]]}]] \ No newline at end of file diff --git a/monsters/dungeon/blackcat/blackcat.monstertype.patch b/monsters/dungeon/blackcat/blackcat.monstertype.patch index edba3204..1ab755f7 100644 --- a/monsters/dungeon/blackcat/blackcat.monstertype.patch +++ b/monsters/dungeon/blackcat/blackcat.monstertype.patch @@ -1,6 +1,6 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Cat"}], [{"op":"test","path":"/description","inverse":true},{"op":"add","path":"/description","value":"A small carnivorous mammal originating from Earth. Cats are frequently kept as pets."}], -[{"op":"test","path":"/captureHealthFraction","value":0.5},{"op":"replace","path":"/captureHealthFraction","value":1}], -[{"op":"test","path":"/relocatable","inverse":true},{"op":"add","path":"/relocatable","value":true}] +[{"op":"test","path":"/baseParameters/captureHealthFraction","value":0.5},{"op":"replace","path":"/baseParameters/captureHealthFraction","value":1}], +[{"op":"test","path":"/baseParameters/relocatable","inverse":true},{"op":"add","path":"/baseParameters/relocatable","value":true}] ] \ No newline at end of file diff --git a/monsters/dungeon/floki/floki.monstertype.patch b/monsters/dungeon/floki/floki.monstertype.patch index 88b15048..5079ce9e 100644 --- a/monsters/dungeon/floki/floki.monstertype.patch +++ b/monsters/dungeon/floki/floki.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/shortdescription","inverse":true},{"op":"add","path":"/shortdescription","value":"Floki"}], [{"op":"test","path":"/description","inverse":true},{"op":"add","path":"/description","value":"A small carnivorous mammal originating from Earth. Cats are frequently kept as pets."}], [{"op":"test","path":"/captureHealthFraction","value":0.5},{"op":"replace","path":"/captureHealthFraction","value":1}], diff --git a/monsters/dungeon/pinfriend/pinfriend.monstertype.patch b/monsters/dungeon/pinfriend/pinfriend.monstertype.patch index db056348..aaa708b7 100644 --- a/monsters/dungeon/pinfriend/pinfriend.monstertype.patch +++ b/monsters/dungeon/pinfriend/pinfriend.monstertype.patch @@ -1,4 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_crittercapturable.lua"}], +[ [{"op":"test","path":"/captureHealthFraction","value":0.5},{"op":"replace","path":"/captureHealthFraction","value":1}], [{"op":"test","path":"/relocatable","inverse":true},{"op":"add","path":"/relocatable","value":true}] ] \ No newline at end of file diff --git a/monsters/dungeon/sb_chesttrapper/medievalchest.monstertype b/monsters/dungeon/sb_chesttrapper/medievalchest.monstertype index 1cf52942..b58343c4 100644 --- a/monsters/dungeon/sb_chesttrapper/medievalchest.monstertype +++ b/monsters/dungeon/sb_chesttrapper/medievalchest.monstertype @@ -1,183 +1,186 @@ { - "type" : "sb_medievalchesttrapper", - "shortdescription" : "Chest Trapper", - "description" : "todo", - - "categories" : ["sb_medievalchesttrapper"], - "parts" : ["body"], - - "animation" : "chesttrapper.animation", - - "dropPools" : [ { "default" : "gleapTreasure", "bow" : "gleapHunting" } ], - - "baseParameters" : { - "scripts" : ["/monsters/monster.lua"], - "behavior" : "monster", - - "behaviorConfig" : { - "damageOnTouch" : true, - - "targetQueryRange" : 5, - "targetOnDamage" : true, - "keepTargetInSight" : true, - "keepTargetInRange" : 50, - "targetOutOfSightTime" : 5.0, - - "foundTargetActions" : [ { "name" : "action-aggrohop" } ], - - "hostileActions" : [ - { - "name" : "action-hop", - "cooldown" : 0.1, - "parameters" : { - "verticalSpeed" : 10, - "horizontalSpeed" : 10, - "hopSequence" : 1, - "timeBetweenHops" : 0.5, - "windupTime" : 0, - "landTime" : 0, - "hopAwayFromWall" : false, - "wallVerticalSpeed" : 35 - } + "type": "sb_medievalchesttrapper", + "shortdescription": "Chest Trapper", + "description": "todo", + + "categories": ["sb_medievalchesttrapper"], + "parts": ["body"], + + "animation": "chesttrapper.animation", + + "dropPools": [{ + "default": "gleapTreasure", + "bow": "gleapHunting" + } + ], + + "baseParameters": { + "scripts": ["/monsters/monster.lua"], + "behavior": "monster", + + "behaviorConfig": { + "damageOnTouch": true, + + "targetQueryRange": 5, + "targetOnDamage": true, + "keepTargetInSight": true, + "keepTargetInRange": 50, + "targetOutOfSightTime": 5.0, + + "foundTargetActions": [{ + "name": "action-aggrohop" } ], - "periodicActions" : [], - - "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { + "hostileActions": [{ + "name": "action-hop", + "cooldown": 0.1, + "parameters": { + "verticalSpeed": 10, + "horizontalSpeed": 10, + "hopSequence": 1, + "timeBetweenHops": 0.5, + "windupTime": 0, + "landTime": 0, + "hopAwayFromWall": false, + "wallVerticalSpeed": 35 } - }, - { - "name" : "action-hop", - "cooldown" : 0.1, - "parameters" : { - "verticalSpeed" : 5, - "horizontalSpeed" : 5, - "hopSequence" : 2, - "timeBetweenHops" : 0.5, - "windupTime" : 0, - "landTime" : 0, - "hopAwayFromWall" : false, - "wallVerticalSpeed" : 35 + } + ], + + "periodicActions": [], + + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + }, { + "name": "action-hop", + "cooldown": 0.1, + "parameters": { + "verticalSpeed": 5, + "horizontalSpeed": 5, + "hopSequence": 2, + "timeBetweenHops": 0.5, + "windupTime": 0, + "landTime": 0, + "hopAwayFromWall": false, + "wallVerticalSpeed": 35 } } ] }, - "touchDamage" : { - "poly" : [ [-1.0, -1.125], [1.0, -1.125], [1.0, 1.0], [-1.0, 1.0] ], - "damage" : 22, + "touchDamage": { + "poly": [[-1.0, -1.125], [1.0, -1.125], [1.0, 1.0], [-1.0, 1.0]], + "damage": 22, - "teamType" : "enemy", - "damageSourceKind" : "bite", - "knockback" : 20, - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "bite", + "knockback": 20, + "statusEffects": [] }, - "metaBoundBox" : [-1.0, -1.125, 1.0, 1.0], - "scale" : 1.0, + "metaBoundBox": [-1.0, -1.125, 1.0, 1.0], + "scale": 1.0, - "movementSettings" : { - "collisionPoly" : [ [-1.0, -1.125], [1.0, -1.125], [1.0, 1.0], [-1.0, 1.0] ], + "movementSettings": { + "collisionPoly": [[-1.0, -1.125], [1.0, -1.125], [1.0, 1.0], [-1.0, 1.0]], - "mass" : 1.0, - "walkSpeed" : 3, - "runSpeed" : 6, - "jumpSpeed" : 5 + "mass": 1.0, + "walkSpeed": 3, + "runSpeed": 6, + "jumpSpeed": 5 }, - "bodyMaterialKind" : "organic", + "bodyMaterialKind": "organic", - "knockoutTime" : 1, - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 1, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 12 + "maxHealth": { + "baseValue": 12 }, - "protection" : { - "baseValue" : 1 + "protection": { + "baseValue": 1 }, - "healthRegen" : { - "baseValue" : 0.0 + "healthRegen": { + "baseValue": 0.0 }, - "powerMultiplier" : { - "baseValue" : 1.0 + "powerMultiplier": { + "baseValue": 1.0 }, - "physicalResistance" : { - "baseValue" : 0.0 + "physicalResistance": { + "baseValue": 0.0 }, - "fireResistance" : { - "baseValue" : 0.0 + "fireResistance": { + "baseValue": 0.0 }, - "fireStatusImmunity" : { - "baseValue" : 0.0 + "fireStatusImmunity": { + "baseValue": 0.0 }, - "iceResistance" : { - "baseValue" : 0.0 + "iceResistance": { + "baseValue": 0.0 }, - "iceStatusImmunity" : { - "baseValue" : 0.0 + "iceStatusImmunity": { + "baseValue": 0.0 }, - "electricResistance" : { - "baseValue" : 0.0 + "electricResistance": { + "baseValue": 0.0 }, - "electricStatusImmunity" : { - "baseValue" : 0.0 + "electricStatusImmunity": { + "baseValue": 0.0 }, - "poisonResistance" : { - "baseValue" : 0.0 + "poisonResistance": { + "baseValue": 0.0 }, - "poisonStatusImmunity" : { - "baseValue" : 0.0 + "poisonStatusImmunity": { + "baseValue": 0.0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : true, - "captureHealthFraction" : 0.5, - "nametagColor" : [64, 200, 255] + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": true, + "captureHealthFraction": 0.5, + "nametagColor": [64, 200, 255] } -} \ No newline at end of file +} diff --git a/monsters/dungeon/sb_chesttrapper/medievalchest.png b/monsters/dungeon/sb_chesttrapper/medievalchest.png index 46474192..9c096894 100644 Binary files a/monsters/dungeon/sb_chesttrapper/medievalchest.png and b/monsters/dungeon/sb_chesttrapper/medievalchest.png differ diff --git a/monsters/dungeon/sb_chesttrapper/royalchest.png b/monsters/dungeon/sb_chesttrapper/royalchest.png index e2d59db0..73b41b80 100644 Binary files a/monsters/dungeon/sb_chesttrapper/royalchest.png and b/monsters/dungeon/sb_chesttrapper/royalchest.png differ diff --git a/monsters/dungeon/sb_repairbot/repairbot.monstertype b/monsters/dungeon/sb_repairbot/repairbot.monstertype index bbc4ba6a..118ab2e5 100644 --- a/monsters/dungeon/sb_repairbot/repairbot.monstertype +++ b/monsters/dungeon/sb_repairbot/repairbot.monstertype @@ -1,165 +1,167 @@ { - "type" : "sb_repairbot", - "shortdescription" : "Repair Bot", - "description" : "A mass-produced welding unit commonly used by the USCM.", + "type": "sb_repairbot", + "shortdescription": "Repair Bot", + "description": "A mass-produced welding unit commonly used by the USCM.", - "categories" : ["sb_repairbot"], - "parts" : ["body"], + "categories": ["sb_repairbot"], + "parts": ["body"], - "animation" : "repairbot.animation", + "animation": "repairbot.animation", - "dropPools" : ["sb_repairbotTreasure"], + "dropPools": ["sb_repairbotTreasure"], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/scripts/sensors.lua", "/scripts/stateMachine.lua", "/scripts/util.lua", "/scripts/vec2.lua", - "/scripts/companions/sb_capturable.lua", + "/scripts/companions/capturable.lua", "/monsters/dungeon/sb_repairbot/behavior.lua" ], - "damageTeam" : 2, - "behavior" : "monster", + "damageTeam": 2, + "behavior": "monster", - "facingMode" : "transformation", + "facingMode": "transformation", - "behaviorConfig" : { -//which ones are unused? check after doing chesttrapper - "damageOnTouch" : true, - "hurtWaitForGround" : false, - "targetOnDamage" : true, - "keepTargetInSight" : true, - "keepTargetInRange" : 40, - "targetOutOfSightTime" : 5 + "behaviorConfig": { + //which ones are unused? check after doing chesttrapper + "damageOnTouch": true, + "hurtWaitForGround": false, + "targetOnDamage": true, + "keepTargetInSight": true, + "keepTargetInRange": 40, + "targetOutOfSightTime": 5 }, - "metaBoundBox" : [-1, -1.5, 1, 1], - "scale" : 1.0, + "metaBoundBox": [-1, -1.5, 1, 1], + "scale": 1.0, - "touchDamage" : { - "poly" : [[0.5125, 2.5], [1.0125, 2], [1.0125, -1], [0.5125, -1.5], [-0.5125, -1.5], [-1.0125, -1], [-1.0125, 2], [-0.5125, 2.5]], - "damage" : 12, + "touchDamage": { + "poly": [[0.5125, 2.5], [1.0125, 2], [1.0125, -1], [0.5125, -1.5], [-0.5125, -1.5], [-1.0125, -1], [-1.0125, 2], [-0.5125, 2.5]], + "damage": 12, - "teamType" : "enemy", - "damageSourceKind" : "slash", - "knockback" : 20, - "statusEffects" : [] + "teamType": "enemy", + "damageSourceKind": "slash", + "knockback": 20, + "statusEffects": [] }, - "movementSettings" : { - "collisionPoly" : [[0.5125, 2.5], [1.0125, 2], [1.0125, -1], [0.5125, -1.5], [-0.5125, -1.5], [-1.0125, -1], [-1.0125, 2], [-0.5125, 2.5]], + "movementSettings": { + "collisionPoly": [[0.5125, 2.5], [1.0125, 2], [1.0125, -1], [0.5125, -1.5], [-0.5125, -1.5], [-1.0125, -1], [-1.0125, 2], [-0.5125, 2.5]], - "mass" : 1, - "walkSpeed" : 6, - "runSpeed" : 8 + "mass": 1, + "walkSpeed": 6, + "runSpeed": 8 }, - "knockoutTime" : 0.5, - "knockoutEffect" : "blink", - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.5, + "knockoutEffect": "blink", + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", + "deathParticles": "deathPoof", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "robotic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "robotic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "sb_killCount" : { - "baseValue" : 0 + "stats": { + "sb_killCount": { + "baseValue": 0 }, - "sb_level" : { - "baseValue" : 0 + "sb_level": { + "baseValue": 0 }, - "knockbackStunTime" : { - "baseValue" : 0.25 + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 48 + "maxHealth": { + "baseValue": 48 }, - "protection" : { - "baseValue" : 0 + "protection": { + "baseValue": 0 }, - "healthRegen" : { - "baseValue" : 0 + "healthRegen": { + "baseValue": 0 }, - "powerMultiplier" : { - "baseValue" : 1 + "powerMultiplier": { + "baseValue": 1 }, - "physicalResistance" : { - "baseValue" : 0 + "physicalResistance": { + "baseValue": 0 }, - "fireResistance" : { - "baseValue" : 0 + "fireResistance": { + "baseValue": 0 }, - "fireStatusImmunity" : { - "baseValue" : 0 + "fireStatusImmunity": { + "baseValue": 0 }, - "iceResistance" : { - "baseValue" : 0 + "iceResistance": { + "baseValue": 0 }, - "iceStatusImmunity" : { - "baseValue" : 0 + "iceStatusImmunity": { + "baseValue": 0 }, - "electricResistance" : { - "baseValue" : -0.5 + "electricResistance": { + "baseValue": -0.5 }, - "electricStatusImmunity" : { - "baseValue" : 0 + "electricStatusImmunity": { + "baseValue": 0 }, - "poisonResistance" : { - "baseValue" : 0.5 + "poisonResistance": { + "baseValue": 0.5 }, - "poisonStatusImmunity" : { - "baseValue" : 1 + "poisonStatusImmunity": { + "baseValue": 1 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1, - "initialValue" : 0 + "resources": { + "stunned": { + "deltaValue": -1, + "initialValue": 0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : true, - "captureHealthFraction" : 0.5, - "captureCollectables" : {"monsters" : "sb_repairbot"}, - "nametagColor" : [64, 200, 255], - "collisionSensors" : [[1.25, 0]], - "nearGroundSensor" : [[0, -2.25]], - "midGroundSensor" : [[0, -5]], - "idleTimeRange" : [1, 3], - "moveTimeRange" : [2, 5], - "repairResponseMaxDistance" : 20, - "repairDistance" : 3, - "repairStatusEffect" : "sb_repairbotheal", - "attackTargetHoldTime" : 5, - "attackRange" : [5, 15], - "projectileOffset" : [0.25, -0.375] + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": true, + "captureHealthFraction": 0.5, + "captureCollectables": { + "monsters": "sb_repairbot" + }, + "nametagColor": [64, 200, 255], + "collisionSensors": [[1.25, 0]], + "nearGroundSensor": [[0, -2.25]], + "midGroundSensor": [[0, -5]], + "idleTimeRange": [1, 3], + "moveTimeRange": [2, 5], + "repairResponseMaxDistance": 20, + "repairDistance": 3, + "repairStatusEffect": "sb_repairbotheal", + "attackTargetHoldTime": 5, + "attackRange": [5, 15], + "projectileOffset": [0.25, -0.375] } -} \ No newline at end of file +} diff --git a/monsters/dungeon/sb_repairbot/repairbot.png b/monsters/dungeon/sb_repairbot/repairbot.png index e2c0be9c..0391f94b 100644 Binary files a/monsters/dungeon/sb_repairbot/repairbot.png and b/monsters/dungeon/sb_repairbot/repairbot.png differ diff --git a/monsters/dungeon/sb_serpentdroid/portrait.png b/monsters/dungeon/sb_serpentdroid/portrait.png index e6b348b8..7341b38f 100644 Binary files a/monsters/dungeon/sb_serpentdroid/portrait.png and b/monsters/dungeon/sb_serpentdroid/portrait.png differ diff --git a/monsters/dungeon/sb_serpentdroid/serpentdroid.monstertype b/monsters/dungeon/sb_serpentdroid/serpentdroid.monstertype index c0b2d589..bed9d12e 100644 --- a/monsters/dungeon/sb_serpentdroid/serpentdroid.monstertype +++ b/monsters/dungeon/sb_serpentdroid/serpentdroid.monstertype @@ -1,259 +1,258 @@ { - "type" : "sb_serpentdroid", - "shortdescription" : "Serpent Droid", - "description" : "A mass-produced guard robot commonly used by the USCM.", + "type": "sb_serpentdroid", + "shortdescription": "Serpent Droid", + "description": "A mass-produced guard robot commonly used by the USCM.", - "categories" : ["sb_serpentdroid"], - "parts" : ["body","arm"], - "animation" : "serpentdroid.animation", - "reversed" : false, //Yes, I know I manually flip each animation component, but this makes the arms aim properly. + "categories": ["sb_serpentdroid"], + "parts": ["body", "arm"], + "animation": "serpentdroid.animation", + "reversed": false, //Yes, I know I manually flip each animation component, but this makes the arms aim properly. - "dropPools" : ["sb_serpentdroidTreasure"], + "dropPools": ["sb_serpentdroidTreasure"], - "baseParameters" : { - "scripts" : [ - "/monsters/monster.lua", - "/scripts/companions/sb_capturable.lua" + "baseParameters": { + "scripts": [ + "/monsters/monster.lua" ], - "damageTeam" : 2, - "behavior" : "monster", + "damageTeam": 2, + "behavior": "monster", - "behaviorConfig" : { - "damageOnTouch" : true, + "behaviorConfig": { + "damageOnTouch": true, - "targetQueryRange" : 30, - "targetOnDamage" : true, - "targetEntityTypes" : ["player", "npc", "monster"], - "keepTargetInSight" : true, - "keepTargetInRange" : 50, - "targetOutOfSightTime" : 2.5, + "targetQueryRange": 30, + "targetOnDamage": true, + "targetEntityTypes": ["player", "npc", "monster"], + "keepTargetInSight": true, + "keepTargetInRange": 50, + "targetOutOfSightTime": 2.5, - "foundTargetActions" : [{"name" : "action-aggrohop"}], + "foundTargetActions": [{ + "name": "action-aggrohop" + } + ], - "fleeActions" : [], + "fleeActions": [], - "hostileActions" : [ - { - "name" : "action-invulnerable", - "cooldown" : 10, - "parameters" : { - "windupTime" : 0.5, - "windupState" : "windup", - "winddownTime" : 0.5, - "winddownState" : "winddown", + "hostileActions": [{ + "name": "action-invulnerable", + "cooldown": 10, + "parameters": { + "windupTime": 0.5, + "windupState": "windup", + "winddownTime": 0.5, + "winddownState": "winddown", - "invulnerableEffect" : "highprotection", - "invulnerableTime" : 8 + "invulnerableEffect": "highprotection", + "invulnerableTime": 8 } - }, - { - "name" : "action-fire", - "cooldown" : 2.5, - "parameters" : { - "maximumRange" : 15, - "minimumRange" : 2, - "windupState" : "", - "windupTime" : 0, + }, { + "name": "action-fire", + "cooldown": 2.5, + "parameters": { + "maximumRange": 15, + "minimumRange": 2, + "windupState": "", + "windupTime": 0, - "projectileType" : "blueplasmabullet", - "power" : 4, - "fireOffset" : [-1, -0.5], - "projectileCount" : 3, - "projectileInterval" : 0.3, - "aimAtTarget" : true, - "rotateAim" : true, - "rotatedOffset" : [2.125, 0], - "fireState" : "fire", - "fireDelay" : 0.2, - "fireSound" : "fire", + "projectileType": "blueplasmabullet", + "power": 4, + "fireOffset": [-1, -0.5], + "projectileCount": 3, + "projectileInterval": 0.3, + "aimAtTarget": true, + "rotateAim": true, + "rotatedOffset": [2.125, 0], + "fireState": "fire", + "fireDelay": 0.2, + "fireSound": "fire", - "winddownState" : "", - "winddownTime" : 0.5 + "winddownState": "", + "winddownTime": 0.5 } } ], - "invulnerableActions" : [ - { - "name" : "action-fire", - "parameters" : { - "maximumRange" : 15, - "minimumRange" : 2, - "windupState" : "", - "windupTime" : 0, + "invulnerableActions": [{ + "name": "action-fire", + "parameters": { + "maximumRange": 15, + "minimumRange": 2, + "windupState": "", + "windupTime": 0, - "projectileType" : "blueplasmabullet", - "power" : 4, - "fireOffset" : [-1, -0.5], - "projectileCount" : 3, - "projectileInterval" : 0.3, - "aimAtTarget" : true, - "rotateAim" : true, - "rotatedOffset" : [2.125, 0], - "rotationCenter" : [-1.25, -0.5], - "fireState" : "", - "fireDelay" : 0.2, - "fireSound" : "fire", + "projectileType": "blueplasmabullet", + "power": 4, + "fireOffset": [-1, -0.5], + "projectileCount": 3, + "projectileInterval": 0.3, + "aimAtTarget": true, + "rotateAim": true, + "rotatedOffset": [2.125, 0], + "rotationCenter": [-1.25, -0.5], + "fireState": "", + "fireDelay": 0.2, + "fireSound": "fire", - "winddownState" : "", - "winddownTime" : 0.5 + "winddownState": "", + "winddownTime": 0.5 } } ], - "periodicActions" : [], + "periodicActions": [], - "approachActions" : [ - { - "name" : "approach-walk", - "parameters" : { - "canJump" : false + "approachActions": [{ + "name": "approach-walk", + "parameters": { + "canJump": false } } ], - "wanderActions" : [ - { - "name" : "wander-walk", - "cooldown" : 6, - "parameters" : { - "wanderTime" : [3, 6] + "wanderActions": [{ + "name": "wander-walk", + "cooldown": 6, + "parameters": { + "wanderTime": [3, 6] } } ] }, - "metaBoundBox" : [-1.75, -1.75, 1.75, 1], - "scale" : 1, + "metaBoundBox": [-1.75, -1.75, 1.75, 1], + "scale": 1, - "movementSettings" : { - "collisionPoly" : [ [-1.75, -0.35], [0,-1.75], [1.75, -0.35], [1.75, 1], [-1.75, 1] ], - "mass" : 1, - "walkSpeed" : 6, - "runSpeed" : 6, - "jumpSpeed" : 0, - "flySpeed" : 15, - "airFriction" : 0.25, - "airForce" : 50, - "airJumpProfile" : { - "jumpControlForce" : 0, - "jumpInitialPercentage" : 0 + "movementSettings": { + "collisionPoly": [[-1.75, -0.35], [0, -1.75], [1.75, -0.35], [1.75, 1], [-1.75, 1]], + "mass": 1, + "walkSpeed": 6, + "runSpeed": 6, + "jumpSpeed": 0, + "flySpeed": 15, + "airFriction": 0.25, + "airForce": 50, + "airJumpProfile": { + "jumpControlForce": 0, + "jumpInitialPercentage": 0 } }, - "knockoutTime" : 0.1, - "knockoutEffect" : "blink", - "deathParticles" : "deathPoof", + "knockoutTime": 0.1, + "knockoutEffect": "blink", + "deathParticles": "deathPoof", - "touchDamage" : { - "poly" : [ [-1.75, -1.75], [1.75, -1.75], [1.75, 1], [-1.75, 1] ], - "damage" : 15, + "touchDamage": { + "poly": [[-1.75, -1.75], [1.75, -1.75], [1.75, 1], [-1.75, 1]], + "damage": 15, - "teamType" : "enemy", - "damageSourceKind" : "hammer", - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "hammer", + "statusEffects": [] }, - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "robotic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "robotic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "sb_killCount" : { - "baseValue" : 0 - }, - "sb_level" : { - "baseValue" : 0 - }, - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "sb_killCount": { + "baseValue": 0 + }, + "sb_level": { + "baseValue": 0 + }, + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 72 + "maxHealth": { + "baseValue": 72 }, - "maxShieldHealth" : { - "baseValue" : 0 + "maxShieldHealth": { + "baseValue": 0 }, - "protection" : { - "baseValue" : 1 + "protection": { + "baseValue": 1 }, - "healthRegen" : { - "baseValue" : 0 + "healthRegen": { + "baseValue": 0 }, - "poisonImmunity" : { - "baseValue" : 1 + "poisonImmunity": { + "baseValue": 1 }, - "shieldRegen" : { - "baseValue" : 0 + "shieldRegen": { + "baseValue": 0 }, - "powerMultiplier" : { - "baseValue" : 1 + "powerMultiplier": { + "baseValue": 1 }, - "physicalResistance" : { - "baseValue" : 0 + "physicalResistance": { + "baseValue": 0 }, - "fireResistance" : { - "baseValue" : -0.5 + "fireResistance": { + "baseValue": 0 }, - "fireStatusImmunity" : { - "baseValue" : 0 + "fireStatusImmunity": { + "baseValue": 0 }, - "iceResistance" : { - "baseValue" : 0 + "iceResistance": { + "baseValue": 0 }, - "iceStatusImmunity" : { - "baseValue" : 0 + "iceStatusImmunity": { + "baseValue": 0 }, - "electricResistance" : { - "baseValue" : 0.5 + "electricResistance": { + "baseValue": -0.5 }, - "electricStatusImmunity" : { - "baseValue" : 1 + "electricStatusImmunity": { + "baseValue": 0 }, - "poisonResistance" : { - "baseValue" : 0 + "poisonResistance": { + "baseValue": 0.5 }, - "poisonStatusImmunity" : { - "baseValue" : 0 + "poisonStatusImmunity": { + "baseValue": 1 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1, - "initialValue" : 0 + "resources": { + "stunned": { + "deltaValue": -1, + "initialValue": 0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 }, - "shieldHealth" : { - "maxStat" : "maxShield", - "deltaStat" : "shieldRegen", - "defaultPercentage" : 100 + "shieldHealth": { + "maxStat": "maxShield", + "deltaStat": "shieldRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : true, - "captureHealthFraction" : 0.5, - "nametagColor" : [64, 200, 255], - "captureCollectables" : {"monsters" : "sb_serpentdroid"} + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": true, + "captureHealthFraction": 0.5, + "nametagColor": [64, 200, 255], + "captureCollectables": { + "monsters": "sb_serpentdroid" + } } -} \ No newline at end of file +} diff --git a/monsters/dungeon/sb_serpentdroid/serpentdroid.png b/monsters/dungeon/sb_serpentdroid/serpentdroid.png index bd6d5f1c..5734c6ca 100644 Binary files a/monsters/dungeon/sb_serpentdroid/serpentdroid.png and b/monsters/dungeon/sb_serpentdroid/serpentdroid.png differ diff --git a/monsters/dungeon/sb_serpentdroid/serpentdroidfb.png b/monsters/dungeon/sb_serpentdroid/serpentdroidfb.png index e0b5b67c..0fcd85e3 100644 Binary files a/monsters/dungeon/sb_serpentdroid/serpentdroidfb.png and b/monsters/dungeon/sb_serpentdroid/serpentdroidfb.png differ diff --git a/monsters/dungeon/swarpion/swarpion.monstertype.patch b/monsters/dungeon/swarpion/swarpion.monstertype.patch index 66ecc35f..91c926ff 100644 --- a/monsters/dungeon/swarpion/swarpion.monstertype.patch +++ b/monsters/dungeon/swarpion/swarpion.monstertype.patch @@ -3,5 +3,4 @@ [{"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":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"},{"op":"add","path":"/baseParameters/statusSettings/stats/sb_killCount","value":{"baseValue":0}},{"op":"add","path":"/baseParameters/statusSettings/stats/sb_level","value":{"baseValue":0}}] ] \ No newline at end of file diff --git a/monsters/events/sb_envprobe/body.png b/monsters/events/sb_envprobe/body.png index ad344d31..d13149f4 100644 Binary files a/monsters/events/sb_envprobe/body.png and b/monsters/events/sb_envprobe/body.png differ diff --git a/monsters/events/sb_envprobe/bodyfullbright.png b/monsters/events/sb_envprobe/bodyfullbright.png index c54e5d89..6b972772 100644 Binary files a/monsters/events/sb_envprobe/bodyfullbright.png and b/monsters/events/sb_envprobe/bodyfullbright.png differ diff --git a/monsters/events/sb_envprobe/envprobe.lua b/monsters/events/sb_envprobe/envprobe.lua index 1b93f496..95702095 100644 --- a/monsters/events/sb_envprobe/envprobe.lua +++ b/monsters/events/sb_envprobe/envprobe.lua @@ -40,8 +40,6 @@ function init() self.lightning = config.getParameter("lightning") - if world.getProperty("sb_envprobe") == false then vanish() return end ---if math.random(1,5) <= 2 then status.addEphemeralEffect("monsterdespawn") end capturable.init() end @@ -188,13 +186,6 @@ function scanTarget(dt) while true do coroutine.yield() end end -function vanish() - monster.setDropPool(nil) - monster.setDeathParticleBurst(nil) - monster.setDeathSound(nil) - status.addEphemeralEffect("monsterdespawn") -end - function shouldDie() return (status.resource("health") <= 0) or capturable.justCaptured end \ No newline at end of file diff --git a/monsters/events/sb_envprobe/envprobe.monstertype b/monsters/events/sb_envprobe/envprobe.monstertype index 0788a3a9..be826f33 100644 --- a/monsters/events/sb_envprobe/envprobe.monstertype +++ b/monsters/events/sb_envprobe/envprobe.monstertype @@ -1,135 +1,137 @@ { - "type" : "sb_envprobe", - "shortdescription" : "Environmental Probe", - "description" : "A probe of unknown origin, designed to protect environments.", + "type": "sb_envprobe", + "shortdescription": "Environmental Probe", + "description": "A probe of unknown origin, designed to protect environments.", - "categories" : [ "sb_envprobe" ], - "parts" : [ "body" ], + "categories": ["sb_envprobe"], + "parts": ["body"], - "animation" : "envprobe.animation", + "animation": "envprobe.animation", - "dropPools" : ["sb_envprobeTreasure"], + "dropPools": ["sb_envprobeTreasure"], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/events/sb_envprobe/envprobe.lua" ], - "dialog" : { - "approach" : [ + "dialog": { + "approach": [ "^#0f0;NATURE PRESERVATION DIRECTIVE INITIATED" ], - "aggro" : [ + "aggro": [ "^#f00;ENVIRONMENTAL HARM DETECTED - BEGIN ZAP PROTOCOL" ] }, - - "animationScripts" : ["/items/active/effects/lightning.lua"], - "lightning" : [ - { - "partStartPosition" : ["body", "electrics"], - "color" : [230, 220, 255, 230], - "displacement" : 2.0, - "minDisplacement" : 0.0625, - "forks" : 0, - "width" : 1 + + "animationScripts": ["/items/active/effects/lightning.lua"], + "lightning": [{ + "partStartPosition": ["body", "electrics"], + "color": [230, 220, 255, 230], + "displacement": 2.0, + "minDisplacement": 0.0625, + "forks": 0, + "width": 1 } ], - "touchDamage" : { - "poly" : [ [1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875] ], - "damage" : 10, + "touchDamage": { + "poly": [[1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875]], + "damage": 10, - "teamType" : "enemy", - "damageSourceKind" : "hammer", - "knockback" : 20, - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "hammer", + "knockback": 20, + "statusEffects": [] }, - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 1.0, - "behaviorConfig" : { "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { - } - }]}, - - "movementSettings" : { - "collisionPoly" : [ [1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875] ], - - "mass" : 0.5, - "walkSpeed" : 4, - "runSpeed" : 12, - "gravityEnabled" : false, - - "airFriction" : 2, - "airForce" : 40, - "flySpeed" : 18, - "physicsEffectCategories" : ["envprobe", "monster"] + "metaBoundBox": [-4, -4, 4, 4], + "scale": 1.0, + "behaviorConfig": { + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + } + ] + }, + + "movementSettings": { + "collisionPoly": [[1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875]], + + "mass": 0.5, + "walkSpeed": 4, + "runSpeed": 12, + "gravityEnabled": false, + + "airFriction": 2, + "airForce": 40, + "flySpeed": 18, + "physicsEffectCategories": ["envprobe", "monster"] }, - "knockoutTime" : 0.3, - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.3, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "stone" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "stone" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 0 + "knockbackThreshold": { + "baseValue": 0 }, - "maxHealth" : { - "baseValue" : 30 + "maxHealth": { + "baseValue": 30 }, - "protection" : { - "baseValue" : 30.0 + "protection": { + "baseValue": 30.0 }, - "healthRegen" : { - "baseValue" : 0.0 + "healthRegen": { + "baseValue": 0.0 }, - "powerMultiplier" : { - "baseValue" : 1.0 + "powerMultiplier": { + "baseValue": 1.0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "relocatable" : true, - "capturable" : true, - "captureHealthFraction" : 1, - "capturedMonsterType" : "sb_envprobe2", - "captureCollectables" : {"monsters" : "sb_envprobe"} + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "relocatable": true, + "capturable": true, + "captureHealthFraction": 1, + "capturedMonsterType": "sb_envprobe2", + "captureCollectables": { + "monsters": "sb_envprobe" + } } -} \ No newline at end of file +} diff --git a/monsters/events/sb_envprobe/envprobe2.monstertype b/monsters/events/sb_envprobe/envprobe2.monstertype index 0eb9bd95..cb0398db 100644 --- a/monsters/events/sb_envprobe/envprobe2.monstertype +++ b/monsters/events/sb_envprobe/envprobe2.monstertype @@ -1,128 +1,127 @@ { - "type" : "sb_envprobe2", - "shortdescription" : "Environmental Probe", - "description" : "A probe of unknown origin, designed to protect environments.", + "type": "sb_envprobe2", + "shortdescription": "Environmental Probe", + "description": "A probe of unknown origin, designed to protect environments.", - "categories" : ["sb_envprobe"], - "parts" : [ "body" ], + "categories": ["sb_envprobe"], + "parts": ["body"], - "animation" : "envprobe.animation", + "animation": "envprobe.animation", - "dropPools" : [], + "dropPools": [], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/events/sb_envprobe/envprobe2.lua" ], - "dialog" : { - "approach" : [ + "dialog": { + "approach": [ "^#0f0;LIGHT ASSIST DIRECTIVE INITIATED" ] }, - - "animationScripts" : ["/items/active/effects/lightning.lua"], - "lightning" : [ - { - "partStartPosition" : ["body", "electrics"], - "color" : [230, 220, 255, 230], - "displacement" : 2.0, - "minDisplacement" : 0.0625, - "forks" : 0, - "width" : 1 + + "animationScripts": ["/items/active/effects/lightning.lua"], + "lightning": [{ + "partStartPosition": ["body", "electrics"], + "color": [230, 220, 255, 230], + "displacement": 2.0, + "minDisplacement": 0.0625, + "forks": 0, + "width": 1 } ], - "touchDamage" : { - "poly" : [ [1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875] ], - "damage" : 10, + "touchDamage": { + "poly": [[1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875]], + "damage": 10, - "teamType" : "enemy", - "damageSourceKind" : "hammer", - "knockback" : 20, - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "hammer", + "knockback": 20, + "statusEffects": [] }, - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 1.0, - - - "behaviorConfig" : { "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { - } - }]}, - "movementSettings" : { - "collisionPoly" : [ [1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875] ], - - "mass" : 0.5, - "walkSpeed" : 4, - "runSpeed" : 12, - "gravityEnabled" : false, + "metaBoundBox": [-4, -4, 4, 4], + "scale": 1.0, - "airFriction" : 2, - "airForce" : 40, - "flySpeed" : 18, - "physicsEffectCategories" : ["envprobe", "monster"] + "behaviorConfig": { + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + } + ] + }, + "movementSettings": { + "collisionPoly": [[1.25, 0.0], [0.875, 0.875], [0.0, 1.25], [-0.875, 0.875], [-1.25, 0.0], [-0.875, -0.875], [0.0, -1.25], [0.875, -0.875]], + + "mass": 0.5, + "walkSpeed": 4, + "runSpeed": 12, + "gravityEnabled": false, + + "airFriction": 2, + "airForce": 40, + "flySpeed": 18, + "physicsEffectCategories": ["envprobe", "monster"] }, - "knockoutTime" : 0.3, - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.3, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "stone" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "stone" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 0 + "knockbackThreshold": { + "baseValue": 0 }, - "maxHealth" : { - "baseValue" : 30 + "maxHealth": { + "baseValue": 30 }, - "protection" : { - "baseValue" : 30.0 + "protection": { + "baseValue": 30.0 }, - "healthRegen" : { - "baseValue" : 0.0 + "healthRegen": { + "baseValue": 0.0 }, - "powerMultiplier" : { - "baseValue" : 1.0 + "powerMultiplier": { + "baseValue": 1.0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8] + "mouthOffset": [0, 0], + "feetOffset": [0, -8] } } diff --git a/monsters/events/sb_ruinportal/portal.png b/monsters/events/sb_ruinportal/portal.png index c432b371..ca659e7b 100644 Binary files a/monsters/events/sb_ruinportal/portal.png and b/monsters/events/sb_ruinportal/portal.png differ diff --git a/monsters/events/sb_ruinportal/portalbg.png b/monsters/events/sb_ruinportal/portalbg.png index 3c653e1d..18021e45 100644 Binary files a/monsters/events/sb_ruinportal/portalbg.png and b/monsters/events/sb_ruinportal/portalbg.png differ diff --git a/monsters/events/sb_ruinportal/ruinportal.monstertype b/monsters/events/sb_ruinportal/ruinportal.monstertype index 71b78819..8a60b1ce 100644 --- a/monsters/events/sb_ruinportal/ruinportal.monstertype +++ b/monsters/events/sb_ruinportal/ruinportal.monstertype @@ -1,106 +1,105 @@ { - "type" : "sb_ruinportal", - "shortdescription" : "Ruin Portal", - "description" : "A portal created by the Ruin.", + "type": "sb_ruinportal", + "shortdescription": "Ruin Portal", + "description": "A portal created by the Ruin.", - "categories" : ["sb_ruinportal"], - "parts" : ["portal", "portalbg"], + "categories": ["sb_ruinportal"], + "parts": ["portal", "portalbg"], - "animation" : "ruinportal.animation", + "animation": "ruinportal.animation", - "dropPools" : [ ], + "dropPools": [], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/events/sb_ruinportal/ruinportal.lua", "/monsters/sb_bossmonster.lua" ], - "totalSpawns" : [4, 8], - "airSpawns" : [ + "totalSpawns": [4, 8], + "airSpawns": [ "tentacleghost", "tentaclebomb", "tentaclegnat", "tentaclegnat" ], - "groundSpawns" : [ + "groundSpawns": [ "tentacleclam", "tentaclecrawler" ], - - "damageTeamType" : "passive", - "renderLayer" : "BackgroundTile+10", //It goes over objects, but, whatever, I don't think these can even spawn near wall-mounted ones - - "touchDamage" : { - "poly" : [], - "damage" : 0, - - "teamType" : "enemy", - "damageSourceKind" : "lash", - "knockback" : 20, - "statusEffects" : [] + + "damageTeamType": "passive", + "renderLayer": "BackgroundTile+10", //It goes over objects, but, whatever, I don't think these can even spawn near wall-mounted ones + + "touchDamage": { + "poly": [], + "damage": 0, + + "teamType": "enemy", + "damageSourceKind": "lash", + "knockback": 20, + "statusEffects": [] }, - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 1.0, + "metaBoundBox": [-4, -4, 4, 4], + "scale": 1.0, - "movementSettings" : { - "collisionPoly" : [ [8.125, 0], [5.75, 5.75], [0, 8.125], [-5.75, 5.75], [-8.125, 0], [-5.75, -5.75], [0, -8.125], [5.75, -5.75] ], + "movementSettings": { + "collisionPoly": [[8.125, 0], [5.75, 5.75], [0, 8.125], [-5.75, 5.75], [-8.125, 0], [-5.75, -5.75], [0, -8.125], [5.75, -5.75]], - "mass" : 1.0, - "walkSpeed" : 1, - "runSpeed" : 4, - "gravityEnabled" : false, + "mass": 1.0, + "walkSpeed": 1, + "runSpeed": 4, + "gravityEnabled": false, - "airFriction" : 10, - "airForce" : 40, - "flySpeed" : 6 + "airFriction": 10, + "airForce": 40, + "flySpeed": 6 }, - "bodyMaterialKind" : "organic", + "bodyMaterialKind": "organic", - "knockoutTime" : 0.0, - "knockoutAnimationStates" : { - }, - "knockoutEffect" : "blink", + "knockoutTime": 0.0, + "knockoutAnimationStates": {}, + "knockoutEffect": "blink", - "statusSettings" : { - "statusProperties" : { - "bossMusic" : "/music/tentacle-battle1-loop.ogg", - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "bossMusic": "/music/tentacle-battle1-loop.ogg", + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : false, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": false, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "maxHealth" : { - "baseValue" : 5 + "stats": { + "maxHealth": { + "baseValue": 5 }, - "healthRegen" : { - "baseValue" : 0 + "healthRegen": { + "baseValue": 0 }, - "invulnerable" : { - "baseValue" : 1 + "invulnerable": { + "baseValue": 1 } }, - "resources" : { - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "resources": { + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -65] + "mouthOffset": [0, 0], + "feetOffset": [0, -65] } } diff --git a/monsters/flyers/tentaclebomb/tentaclebomb.monstertype.patch b/monsters/flyers/tentaclebomb/tentaclebomb.monstertype.patch index 112b18e1..1cabf9ff 100644 --- a/monsters/flyers/tentaclebomb/tentaclebomb.monstertype.patch +++ b/monsters/flyers/tentaclebomb/tentaclebomb.monstertype.patch @@ -1,3 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], +[ [{"op":"test","path":"/dropPools","inverse":true},{"op":"add","path":"/dropPools","value":[]}], -[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}]] \ No newline at end of file +[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}] +] \ No newline at end of file diff --git a/monsters/flyers/tentaclegnat/tentaclegnat.monstertype.patch b/monsters/flyers/tentaclegnat/tentaclegnat.monstertype.patch index 5d8896d4..8f3746c9 100644 --- a/monsters/flyers/tentaclegnat/tentaclegnat.monstertype.patch +++ b/monsters/flyers/tentaclegnat/tentaclegnat.monstertype.patch @@ -1,3 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], +[ [{"op":"test","path":"/dropPools","inverse":true},{"op":"add","path":"/dropPools","value":[]}], -[{"op":"add","path":"/dropPools/-","value":{"default":"sb_weaklingTentacleTreasure","bow":"sb_weaklingTentacleHunting"}}]] \ No newline at end of file +[{"op":"add","path":"/dropPools/-","value":{"default":"sb_weaklingTentacleTreasure","bow":"sb_weaklingTentacleHunting"}}] +] \ No newline at end of file diff --git a/monsters/flyers/tentaclespawner/tentaclespawner.monstertype.patch b/monsters/flyers/tentaclespawner/tentaclespawner.monstertype.patch index 112b18e1..1cabf9ff 100644 --- a/monsters/flyers/tentaclespawner/tentaclespawner.monstertype.patch +++ b/monsters/flyers/tentaclespawner/tentaclespawner.monstertype.patch @@ -1,3 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], +[ [{"op":"test","path":"/dropPools","inverse":true},{"op":"add","path":"/dropPools","value":[]}], -[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}]] \ No newline at end of file +[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}] +] \ No newline at end of file diff --git a/monsters/generated/ground/largebiped/largebiped.monstertype.patch b/monsters/generated/ground/largebiped/largebiped.monstertype.patch deleted file mode 100644 index 5532708f..00000000 --- a/monsters/generated/ground/largebiped/largebiped.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_killCount","value":{"baseValue":0}},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_level","value":{"baseValue":0}}] \ No newline at end of file diff --git a/monsters/generated/ground/largequadruped/largequadruped.monstertype.patch b/monsters/generated/ground/largequadruped/largequadruped.monstertype.patch deleted file mode 100644 index 5532708f..00000000 --- a/monsters/generated/ground/largequadruped/largequadruped.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_killCount","value":{"baseValue":0}},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_level","value":{"baseValue":0}}] \ No newline at end of file diff --git a/monsters/generated/ground/sb_hugebiped/barm/dragon/barm.png b/monsters/generated/ground/sb_hugebiped/barm/dragon/barm.png index e82fb507..90e123db 100644 Binary files a/monsters/generated/ground/sb_hugebiped/barm/dragon/barm.png and b/monsters/generated/ground/sb_hugebiped/barm/dragon/barm.png differ diff --git a/monsters/generated/ground/sb_hugebiped/body/dragon/body.png b/monsters/generated/ground/sb_hugebiped/body/dragon/body.png index 6e49eb9b..abfe6bfb 100644 Binary files a/monsters/generated/ground/sb_hugebiped/body/dragon/body.png and b/monsters/generated/ground/sb_hugebiped/body/dragon/body.png differ diff --git a/monsters/generated/ground/sb_hugebiped/farm/dragon/farm.png b/monsters/generated/ground/sb_hugebiped/farm/dragon/farm.png index 6290e1a7..849a3f02 100644 Binary files a/monsters/generated/ground/sb_hugebiped/farm/dragon/farm.png and b/monsters/generated/ground/sb_hugebiped/farm/dragon/farm.png differ diff --git a/monsters/generated/ground/sb_hugebiped/head/beak/head.png b/monsters/generated/ground/sb_hugebiped/head/beak/head.png index 51e89d56..b2267f1b 100644 Binary files a/monsters/generated/ground/sb_hugebiped/head/beak/head.png and b/monsters/generated/ground/sb_hugebiped/head/beak/head.png differ diff --git a/monsters/generated/ground/sb_hugebiped/head/dragon/head.png b/monsters/generated/ground/sb_hugebiped/head/dragon/head.png index 9476763d..57113cc5 100644 Binary files a/monsters/generated/ground/sb_hugebiped/head/dragon/head.png and b/monsters/generated/ground/sb_hugebiped/head/dragon/head.png differ diff --git a/monsters/generated/ground/sb_hugebiped/head/feather/head.png b/monsters/generated/ground/sb_hugebiped/head/feather/head.png index 3ea21d50..e0bc7896 100644 Binary files a/monsters/generated/ground/sb_hugebiped/head/feather/head.png and b/monsters/generated/ground/sb_hugebiped/head/feather/head.png differ diff --git a/monsters/generated/ground/sb_hugebiped/head/rhino/head.png b/monsters/generated/ground/sb_hugebiped/head/rhino/head.png index f2a1644a..ea70437c 100644 Binary files a/monsters/generated/ground/sb_hugebiped/head/rhino/head.png and b/monsters/generated/ground/sb_hugebiped/head/rhino/head.png differ diff --git a/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype b/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype index 78a89199..b5f0d24d 100644 --- a/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype +++ b/monsters/generated/ground/sb_hugebiped/hugebiped.monstertype @@ -1,179 +1,177 @@ { - "type" : "sb_hugebiped", + "type": "sb_hugebiped", - "categories" : ["sb_hugebiped"], - "parts" : ["barm", "farm", "body", "tail", "head"], - "partParameters" : "hugebiped.partparams", + "categories": ["sb_hugebiped"], + "parts": ["barm", "farm", "body", "tail", "head"], + "partParameters": "hugebiped.partparams", - "animation" : "hugebiped.animation", - "reversed" : true, + "animation": "hugebiped.animation", + "reversed": true, - "dropPools" : ["sb_minibossTreasure"], + "dropPools": ["sb_minibossTreasure"], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/monster.lua", "/monsters/sb_miniboss.lua" ], - "behavior" : "monster", - - "behaviorConfig" : { - "damageOnTouch" : true, - - "targetQueryRange" : 30, - "targetOnDamage" : true, - "keepTargetInSight" : true, - "keepTargetInRange" : 50, - "targetOutOfSightTime" : 2.5, - - "foundTargetActions" : [{"name" : "action-aggrohop"}], - - "approachActions" : [ - { - "name" : "approach-walk", - "parameters" : { - "canJump" : true, -// "maxJumps" : 6, - "jumpXVelocity" : 12, - "jumpYVelocity" : 30, - "jumpXControlForce" : 50, - "fallState" : "jump", - "moveState" : "run", - "run" : true - } + "behavior": "monster", + + "behaviorConfig": { + "damageOnTouch": true, + + "targetQueryRange": 30, + "targetOnDamage": true, + "keepTargetInSight": true, + "keepTargetInRange": 50, + "targetOutOfSightTime": 2.5, + + "foundTargetActions": [{ + "name": "action-aggrohop" } ], - "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { + "approachActions": [{ + "name": "approach-walk", + "parameters": { + "canJump": true, + // "maxJumps" : 6, + "jumpXVelocity": 12, + "jumpYVelocity": 30, + "jumpXControlForce": 50, + "fallState": "jump", + "moveState": "run", + "run": true } - }, - { - "name" : "approach-walk", - "parameters" : { - "canJump" : true, -// "maxJumps" : 6, - "jumpXVelocity" : 12, - "jumpYVelocity" : 30, - "jumpXControlForce" : 50, - "fallState" : "jump", - "moveState" : "run", - "run" : true + } + ], + + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + }, { + "name": "approach-walk", + "parameters": { + "canJump": true, + // "maxJumps" : 6, + "jumpXVelocity": 12, + "jumpYVelocity": 30, + "jumpXControlForce": 50, + "fallState": "jump", + "moveState": "run", + "run": true } } ], - "wanderActions" : [ - { - "name" : "wander-walk", - "cooldown" : 6, - "parameters" : { - "wanderTime" : [3, 9] + "wanderActions": [{ + "name": "wander-walk", + "cooldown": 6, + "parameters": { + "wanderTime": [3, 9] } } ] }, - "skillCount" : 3, - "baseSkills" : ["chargeAttack", "pounceAttack"], - "specialSkills" : ["staticDischargeAttack", "bubbleBlastAttack", "waterGunAttack", "burninghaloAttack", "gasBelchAttack", "rainbowVomitAttack", "shockingBoltAttack", "plasmaTorpedoAttack", "eyeballSprayAttack", "bloodVomitAttack", "acidicSpitAttack", "fireballAttack", "icerockShotAttack", "doubleBarbSprayAttack", "miniDragonBreathAttack", "acidSprayAttack", "beamBurstAttack", "plasmaSweepAttack", "eyeballShotAttack", "glitterAttack", "darkGravityBallAttack", "fireSwirlAttack", "rockRollAttack", "iceBlastAttack", "snotBubbleAttack", "leafyGustAttack", "mudBallAttack", "lightBallAttack", "shardSprayAttack", "blueFlameAttack", "smokeRingAttack", "putridWaveAttack", "boneRainAttack", "orbOfZotsAttack", "snotShotAttack", "fishBreathAttack", "explosivePhlegmAttack", "cellBlastAttack" ], //shockingWaveAttack + "skillCount": 3, + "baseSkills": ["chargeAttack", "pounceAttack"], + "specialSkills": ["staticDischargeAttack", "bubbleBlastAttack", "waterGunAttack", "burninghaloAttack", "gasBelchAttack", "rainbowVomitAttack", "shockingBoltAttack", "plasmaTorpedoAttack", "eyeballSprayAttack", "bloodVomitAttack", "acidicSpitAttack", "fireballAttack", "icerockShotAttack", "doubleBarbSprayAttack", "miniDragonBreathAttack", "acidSprayAttack", "beamBurstAttack", "plasmaSweepAttack", "eyeballShotAttack", "glitterAttack", "darkGravityBallAttack", "fireSwirlAttack", "rockRollAttack", "iceBlastAttack", "snotBubbleAttack", "leafyGustAttack", "mudBallAttack", "lightBallAttack", "shardSprayAttack", "blueFlameAttack", "smokeRingAttack", "putridWaveAttack", "boneRainAttack", "orbOfZotsAttack", "snotShotAttack", "fishBreathAttack", "explosivePhlegmAttack", "cellBlastAttack"], //shockingWaveAttack - "knockoutTime" : 0.1, - "knockoutEffect" : "blink", - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.1, + "knockoutEffect": "blink", + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", + "deathParticles": "deathPoof", - "colors" : "generated", + "colors": "generated", - "scale" : 1.0, + "scale": 1.0, - "movementSettings" : { - "collisionPoly" : [ [-3.8, -9], [-3.4, -9.375], [3.4, -9.375], [3.8, -9], [3.8, 2.1], [3.4, 2.5], [-3.4, 2.5], [-3.8, 2.1] ], - "mass" : 1.6, - "walkSpeed" : 5.0, - "runSpeed" : 13.0 + "movementSettings": { + "collisionPoly": [[-3.8, -9], [-3.4, -9.375], [3.4, -9.375], [3.8, -9], [3.8, 2.1], [3.4, 2.5], [-3.4, 2.5], [-3.8, 2.1]], + "mass": 1.6, + "walkSpeed": 5.0, + "runSpeed": 13.0 }, - "metaBoundBox" : [-10, -10, 10, 10], + "metaBoundBox": [-10, -10, 10, 10], - "touchDamage" : { - "poly" : [ [-3, -9.375], [3, -9.375], [3, 2], [-3, 2] ], - "damage" : 25, + "touchDamage": { + "poly": [[-3, -9.375], [3, -9.375], [3, 2], [-3, 2]], + "damage": 25, - "teamType" : "enemy", - "damageSourceKind" : "slash", - "knockback" : 30, - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "slash", + "knockback": 30, + "statusEffects": [] }, - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.05 + "stats": { + "knockbackStunTime": { + "baseValue": 0.05 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 440 + "maxHealth": { + "baseValue": 440 }, - "maxShield" : { - "baseValue" : 0 + "maxShield": { + "baseValue": 0 }, - "protection" : { - "baseValue" : 0 + "protection": { + "baseValue": 0 }, - "healthRegen" : { - "baseValue" : 0.25 + "healthRegen": { + "baseValue": 0.25 }, - "shieldRegen" : { - "baseValue" : 0 + "shieldRegen": { + "baseValue": 0 }, - "powerMultiplier" : { - "baseValue" : 1.5 + "powerMultiplier": { + "baseValue": 1.5 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 }, - "shieldHealth" : { - "maxStat" : "maxShield", - "deltaStat" : "shieldRegen", - "defaultPercentage" : 100 + "shieldHealth": { + "maxStat": "maxShield", + "deltaStat": "shieldRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0.5, 0.5], - "feetOffset" : [0, -21], - "capturable" : false, //TODO: pod uses monster collision, causing it to spawn in floor when thrown from ground. fix. Maybe feet offset? - "captureHealthFraction" : 0.5, - "nametagColor" : [64, 200, 255] + "mouthOffset": [0.5, 0.5], + "feetOffset": [0, -21], + "capturable": false, //TODO: pod uses monster collision, causing it to spawn in floor when thrown from ground. fix. Maybe feet offset? + "captureHealthFraction": 0.5, + "nametagColor": [64, 200, 255] } -} \ No newline at end of file +} diff --git a/monsters/generated/ground/sb_hugebiped/melty/body.png b/monsters/generated/ground/sb_hugebiped/melty/body.png index 669f0943..0ec6342e 100644 Binary files a/monsters/generated/ground/sb_hugebiped/melty/body.png and b/monsters/generated/ground/sb_hugebiped/melty/body.png differ diff --git a/monsters/generated/ground/sb_hugebiped/tail/dragon/tail.png b/monsters/generated/ground/sb_hugebiped/tail/dragon/tail.png index 44569a56..1388ad41 100644 Binary files a/monsters/generated/ground/sb_hugebiped/tail/dragon/tail.png and b/monsters/generated/ground/sb_hugebiped/tail/dragon/tail.png differ diff --git a/monsters/generated/ground/smallbiped/smallbiped.monstertype.patch b/monsters/generated/ground/smallbiped/smallbiped.monstertype.patch deleted file mode 100644 index 5532708f..00000000 --- a/monsters/generated/ground/smallbiped/smallbiped.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_killCount","value":{"baseValue":0}},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_level","value":{"baseValue":0}}] \ No newline at end of file diff --git a/monsters/generated/ground/smallquadruped/head/sb_aardvark/sb_aardvarkhead.monsterpart b/monsters/generated/ground/smallquadruped/head/sb_aardvark/sb_aardvarkhead.monsterpart deleted file mode 100644 index b7a202bf..00000000 --- a/monsters/generated/ground/smallquadruped/head/sb_aardvark/sb_aardvarkhead.monsterpart +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name" : "sb_aardvarkhead", - "category" : "smallquadruped", - "type" : "head", - - - "frames" : { - "head" : "sb_aardvarkhead.png" - }, - - "parameters" : - { -/* "projectileSourcePosition" : [1, -0.5], - "idleNoise" : [ "/sfx/npc/smallbiped/goathead_small_idle1.ogg", "/sfx/npc/smallbiped/goathead_small_idle2.ogg" ], - "turnHostileNoise" : [ "/sfx/npc/smallbiped/goathead_small_turnhostile.ogg" ], - "attackNoise" : [ "/sfx/npc/smallbiped/goathead_small_attack1.ogg", "/sfx/npc/smallbiped/goathead_small_attack2.ogg" ], - "painNoise" : [ "/sfx/npc/smallbiped/goathead_small_pain1.ogg", "/sfx/npc/smallbiped/goathead_small_pain2.ogg" ], - "deathNoise" : [ "/sfx/npc/smallbiped/goathead_small_death.ogg" ]*/ - } -} diff --git a/monsters/generated/ground/smallquadruped/head/sb_aardvark/sb_aardvarkhead.png b/monsters/generated/ground/smallquadruped/head/sb_aardvark/sb_aardvarkhead.png deleted file mode 100644 index f9326693..00000000 Binary files a/monsters/generated/ground/smallquadruped/head/sb_aardvark/sb_aardvarkhead.png and /dev/null differ diff --git a/monsters/generated/ground/smallquadruped/head/sb_hypnohead/sb_hypnohead.monsterpart b/monsters/generated/ground/smallquadruped/head/sb_hypnohead/sb_hypnohead.monsterpart deleted file mode 100644 index fcee6965..00000000 --- a/monsters/generated/ground/smallquadruped/head/sb_hypnohead/sb_hypnohead.monsterpart +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name" : "sb_hypnohead", - "category" : "smallquadruped", - "type" : "head", - - - "frames" : { - "head" : "sb_hypnohead.png" - }, - - "parameters" : - { -/* "projectileSourcePosition" : [1, -0.5], - "idleNoise" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_idle1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_idle2.ogg" ], - "turnHostileNoise" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_turnhostile.ogg" ], - "attackNoise" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_attack1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_attack2.ogg" ], - "painNoise" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_pain1.ogg", "/sfx/npc/smallbiped/bulbouseyehead_small_pain2.ogg" ], - "deathNoise" : [ "/sfx/npc/smallbiped/bulbouseyehead_small_death.ogg" ]*/ - } -} diff --git a/monsters/generated/ground/smallquadruped/head/sb_hypnohead/sb_hypnohead.png b/monsters/generated/ground/smallquadruped/head/sb_hypnohead/sb_hypnohead.png deleted file mode 100644 index b491ef24..00000000 Binary files a/monsters/generated/ground/smallquadruped/head/sb_hypnohead/sb_hypnohead.png and /dev/null differ diff --git a/monsters/generated/ground/smallquadruped/head/sb_simplehead/sb_simplehead.monsterpart b/monsters/generated/ground/smallquadruped/head/sb_simplehead/sb_simplehead.monsterpart deleted file mode 100644 index 58c6f1ac..00000000 --- a/monsters/generated/ground/smallquadruped/head/sb_simplehead/sb_simplehead.monsterpart +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name" : "sb_simplehead", - "category" : "smallquadruped", - "type" : "head", - - - "frames" : { - "head" : "sb_simplehead.png" - }, - - "parameters" : - { - /* "projectileSourcePosition" : [1, -0.5], - "idleNoise" : [ "/sfx/npc/smallbiped/arrowhead_small_idle1.ogg", "/sfx/npc/smallbiped/arrowhead_small_idle2.ogg" ], - "turnHostileNoise" : [ "/sfx/npc/smallbiped/arrowhead_small_turnhostile.ogg" ], - "attackNoise" : [ "/sfx/npc/smallbiped/arrowhead_small_attack1.ogg", "/sfx/npc/smallbiped/arrowhead_small_attack2.ogg" ], - "painNoise" : [ "/sfx/npc/smallbiped/arrowhead_small_pain1.ogg", "/sfx/npc/smallbiped/arrowhead_small_pain2.ogg" ], - "deathNoise" : [ "/sfx/npc/smallbiped/arrowhead_small_death.ogg" ]*/ - } -} diff --git a/monsters/generated/ground/smallquadruped/head/sb_simplehead/sb_simplehead.png b/monsters/generated/ground/smallquadruped/head/sb_simplehead/sb_simplehead.png deleted file mode 100644 index 3f08abbf..00000000 Binary files a/monsters/generated/ground/smallquadruped/head/sb_simplehead/sb_simplehead.png and /dev/null differ diff --git a/monsters/generated/ground/smallquadruped/head/sb_soullesshead/sb_soullesshead.monsterpart b/monsters/generated/ground/smallquadruped/head/sb_soullesshead/sb_soullesshead.monsterpart deleted file mode 100644 index 8ed98b13..00000000 --- a/monsters/generated/ground/smallquadruped/head/sb_soullesshead/sb_soullesshead.monsterpart +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name" : "sb_soullesshead", - "category" : "smallquadruped", - "type" : "head", - - - "frames" : { - "head" : "sb_soullesshead.png" - }, - - "parameters" : - { -/* "projectileSourcePosition" : [1, -0.5], - "idleNoise" : [ "/sfx/npc/smallbiped/teethyhead_small_idle1.ogg", "/sfx/npc/smallbiped/teethyhead_small_idle2.ogg" ], - "turnHostileNoise" : [ "/sfx/npc/smallbiped/teethyhead_small_turnhostile.ogg" ], - "attackNoise" : [ "/sfx/npc/smallbiped/teethyhead_small_attack1.ogg", "/sfx/npc/smallbiped/teethyhead_small_attack2.ogg" ], - "painNoise" : [ "/sfx/npc/smallbiped/teethyhead_small_pain1.ogg", "/sfx/npc/smallbiped/teethyhead_small_pain2.ogg" ], - "deathNoise" : [ "/sfx/npc/smallbiped/teethyhead_small_death.ogg" ]*/ - } -} diff --git a/monsters/generated/ground/smallquadruped/head/sb_soullesshead/sb_soullesshead.png b/monsters/generated/ground/smallquadruped/head/sb_soullesshead/sb_soullesshead.png deleted file mode 100644 index 8c971404..00000000 Binary files a/monsters/generated/ground/smallquadruped/head/sb_soullesshead/sb_soullesshead.png and /dev/null differ diff --git a/monsters/generated/ground/smallquadruped/head/sb_thicktuskhead/sb_thicktuskhead.monsterpart b/monsters/generated/ground/smallquadruped/head/sb_thicktuskhead/sb_thicktuskhead.monsterpart deleted file mode 100644 index 76b2615a..00000000 --- a/monsters/generated/ground/smallquadruped/head/sb_thicktuskhead/sb_thicktuskhead.monsterpart +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name" : "sb_thicktuskhead", - "category" : "smallquadruped", - "type" : "head", - - - "frames" : { - "head" : "sb_thicktuskhead.png" - }, - - "parameters" : - { - /* "projectileSourcePosition" : [1, -0.5], - "idleNoise" : [ "/sfx/npc/smallbiped/lion_small_idle1.ogg", "/sfx/npc/smallbiped/lion_small_idle2.ogg" ], - "turnHostileNoise" : [ "/sfx/npc/smallbiped/lion_small_turnhostile.ogg" ], - "attackNoise" : [ "/sfx/npc/smallbiped/lion_small_attack1.ogg", "/sfx/npc/smallbiped/lion_small_attack2.ogg" ], - "painNoise" : [ "/sfx/npc/smallbiped/lion_small_pain1.ogg", "/sfx/npc/smallbiped/lion_small_pain2.ogg" ], - "deathNoise" : [ "/sfx/npc/smallbiped/lion_small_death.ogg" ]*/ - } -} diff --git a/monsters/generated/ground/smallquadruped/head/sb_thicktuskhead/sb_thicktuskhead.png b/monsters/generated/ground/smallquadruped/head/sb_thicktuskhead/sb_thicktuskhead.png deleted file mode 100644 index 06c690d1..00000000 Binary files a/monsters/generated/ground/smallquadruped/head/sb_thicktuskhead/sb_thicktuskhead.png and /dev/null differ diff --git a/monsters/generated/ground/smallquadruped/smallquadruped.monstertype.patch b/monsters/generated/ground/smallquadruped/smallquadruped.monstertype.patch deleted file mode 100644 index 5532708f..00000000 --- a/monsters/generated/ground/smallquadruped/smallquadruped.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_killCount","value":{"baseValue":0}},{"op":"add","path": "/baseParameters/statusSettings/stats/sb_level","value":{"baseValue":0}}] \ No newline at end of file diff --git a/monsters/ghosts/tentacleghost/tentacleghost.monstertype.patch b/monsters/ghosts/tentacleghost/tentacleghost.monstertype.patch index 112b18e1..1cabf9ff 100644 --- a/monsters/ghosts/tentacleghost/tentacleghost.monstertype.patch +++ b/monsters/ghosts/tentacleghost/tentacleghost.monstertype.patch @@ -1,3 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], +[ [{"op":"test","path":"/dropPools","inverse":true},{"op":"add","path":"/dropPools","value":[]}], -[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}]] \ No newline at end of file +[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}] +] \ No newline at end of file diff --git a/monsters/sb_bossmonster.lua b/monsters/sb_bossmonster.lua index b0eb31d0..c3cdbcd6 100644 --- a/monsters/sb_bossmonster.lua +++ b/monsters/sb_bossmonster.lua @@ -15,9 +15,9 @@ function update(dt) updat(dt) for _,i in pairs(players) do if world.magnitude(entity.position(),world.entityPosition(i)) > 80 then --And if they're using a radio? --Okay so when they enter the radius remove them from messagedPlayers?? - world.sendEntityMessage(i,"stopAltMusic",1) - else - world.sendEntityMessage(i,"playAltMusic",{sb_music},1) + world.sendEntityMessage(i,"stopAltMusic",1) + else + world.sendEntityMessage(i,"playAltMusic",{sb_music},1) end end end diff --git a/monsters/walkers/adultpoptop/adultpoptop.monstertype.patch b/monsters/walkers/adultpoptop/adultpoptop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/adultpoptop/adultpoptop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/anglure/anglure.monstertype.patch b/monsters/walkers/anglure/anglure.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/anglure/anglure.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/anglure/electricanglure.monstertype.patch b/monsters/walkers/anglure/electricanglure.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/anglure/electricanglure.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/bobot/bobot.monstertype.patch b/monsters/walkers/bobot/bobot.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/bobot/bobot.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/bobot/firebobot.monstertype.patch b/monsters/walkers/bobot/firebobot.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/bobot/firebobot.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/bulbop/bulbop.monstertype.patch b/monsters/walkers/bulbop/bulbop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/bulbop/bulbop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/bulbop/poisonbulbop.monstertype.patch b/monsters/walkers/bulbop/poisonbulbop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/bulbop/poisonbulbop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/capricoat/capricoat.monstertype.patch b/monsters/walkers/capricoat/capricoat.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/capricoat/capricoat.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/capricoat/electriccapricoat.monstertype.patch b/monsters/walkers/capricoat/electriccapricoat.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/capricoat/electriccapricoat.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/crabcano/crabcano.monstertype.patch b/monsters/walkers/crabcano/crabcano.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/crabcano/crabcano.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/crabcano/icecrabcano.monstertype.patch b/monsters/walkers/crabcano/icecrabcano.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/crabcano/icecrabcano.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/crutter/crutter.monstertype.patch b/monsters/walkers/crutter/crutter.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/crutter/crutter.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/crutter/electriccrutter.monstertype.patch b/monsters/walkers/crutter/electriccrutter.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/crutter/electriccrutter.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/fennix/fennix.monstertype.patch b/monsters/walkers/fennix/fennix.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/fennix/fennix.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/fennix/icefennix.monstertype.patch b/monsters/walkers/fennix/icefennix.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/fennix/icefennix.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/gleap/firegleap.monstertype.patch b/monsters/walkers/gleap/firegleap.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/gleap/firegleap.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/gleap/gleap.monstertype.patch b/monsters/walkers/gleap/gleap.monstertype.patch deleted file mode 100644 index 0f7c2524..00000000 --- a/monsters/walkers/gleap/gleap.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"},{"op":"add","path":"/baseParameters/statusSettings/stats/sb_killCount","value":{"baseValue":0}},{"op":"add","path":"/baseParameters/statusSettings/stats/sb_level","value":{"baseValue":0}}] \ No newline at end of file diff --git a/monsters/walkers/hemogoblin/electrichemogoblin.monstertype.patch b/monsters/walkers/hemogoblin/electrichemogoblin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hemogoblin/electrichemogoblin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hemogoblin/hemogoblin.monstertype.patch b/monsters/walkers/hemogoblin/hemogoblin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hemogoblin/hemogoblin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hemogoblinbutt/electrichemogoblinbutt.monstertype.patch b/monsters/walkers/hemogoblinbutt/electrichemogoblinbutt.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hemogoblinbutt/electrichemogoblinbutt.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hemogoblinbutt/hemogoblinbutt.monstertype.patch b/monsters/walkers/hemogoblinbutt/hemogoblinbutt.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hemogoblinbutt/hemogoblinbutt.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hemogoblinhead/electrichemogoblinhead.monstertype.patch b/monsters/walkers/hemogoblinhead/electrichemogoblinhead.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hemogoblinhead/electrichemogoblinhead.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hemogoblinhead/hemogoblinhead.monstertype.patch b/monsters/walkers/hemogoblinhead/hemogoblinhead.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hemogoblinhead/hemogoblinhead.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hypnare/hypnare.monstertype.patch b/monsters/walkers/hypnare/hypnare.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hypnare/hypnare.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/hypnare/icehypnare.monstertype.patch b/monsters/walkers/hypnare/icehypnare.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/hypnare/icehypnare.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/kingnutmidgeling/kingnutmidgeling.monstertype.patch b/monsters/walkers/kingnutmidgeling/kingnutmidgeling.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/kingnutmidgeling/kingnutmidgeling.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/kingnutmidgeling/poisonkingnutmidgeling.monstertype.patch b/monsters/walkers/kingnutmidgeling/poisonkingnutmidgeling.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/kingnutmidgeling/poisonkingnutmidgeling.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/lilodon/firelilodon.monstertype.patch b/monsters/walkers/lilodon/firelilodon.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/lilodon/firelilodon.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/lilodon/lilodon.monstertype.patch b/monsters/walkers/lilodon/lilodon.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/lilodon/lilodon.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/mandraflora/mandraflora.monstertype.patch b/monsters/walkers/mandraflora/mandraflora.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/mandraflora/mandraflora.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/mandraflora/poisonmandraflora.monstertype.patch b/monsters/walkers/mandraflora/poisonmandraflora.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/mandraflora/poisonmandraflora.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/miasmop/icemiasmop.monstertype.patch b/monsters/walkers/miasmop/icemiasmop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/miasmop/icemiasmop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/miasmop/miasmop.monstertype.patch b/monsters/walkers/miasmop/miasmop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/miasmop/miasmop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/narfin/icenarfin.monstertype.patch b/monsters/walkers/narfin/icenarfin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/narfin/icenarfin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/narfin/narfin.monstertype.patch b/monsters/walkers/narfin/narfin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/narfin/narfin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/nutmidge/nutmidge.monstertype.patch b/monsters/walkers/nutmidge/nutmidge.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/nutmidge/nutmidge.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/nutmidge/poisonnutmidge.monstertype.patch b/monsters/walkers/nutmidge/poisonnutmidge.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/nutmidge/poisonnutmidge.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/nutmidgeling/nutmidgeling.monstertype.patch b/monsters/walkers/nutmidgeling/nutmidgeling.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/nutmidgeling/nutmidgeling.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/nutmidgeling/poisonnutmidgeling.monstertype.patch b/monsters/walkers/nutmidgeling/poisonnutmidgeling.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/nutmidgeling/poisonnutmidgeling.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/oogler/fireoogler.monstertype.patch b/monsters/walkers/oogler/fireoogler.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/oogler/fireoogler.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/oogler/oogler.monstertype.patch b/monsters/walkers/oogler/oogler.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/oogler/oogler.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/orbide/iceorbide.monstertype.patch b/monsters/walkers/orbide/iceorbide.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/orbide/iceorbide.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/orbide/orbide.monstertype.patch b/monsters/walkers/orbide/orbide.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/orbide/orbide.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/peblit/icepeblit.monstertype.patch b/monsters/walkers/peblit/icepeblit.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/peblit/icepeblit.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/peblit/peblit.monstertype.patch b/monsters/walkers/peblit/peblit.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/peblit/peblit.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/petricub/electricpetricub.monstertype.patch b/monsters/walkers/petricub/electricpetricub.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/petricub/electricpetricub.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/petricub/petricub.monstertype.patch b/monsters/walkers/petricub/petricub.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/petricub/petricub.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/pipkin/pipkin.monstertype.patch b/monsters/walkers/pipkin/pipkin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/pipkin/pipkin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/pipkin/poisonpipkin.monstertype.patch b/monsters/walkers/pipkin/poisonpipkin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/pipkin/poisonpipkin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/poptop/albinopoptop.monstertype.patch b/monsters/walkers/poptop/albinopoptop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/poptop/albinopoptop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/poptop/poptop.monstertype.patch b/monsters/walkers/poptop/poptop.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/poptop/poptop.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/punchy/punchy.monstertype.patch b/monsters/walkers/punchy/punchy.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/punchy/punchy.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/quagmutt/electricquagmutt.monstertype.patch b/monsters/walkers/quagmutt/electricquagmutt.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/quagmutt/electricquagmutt.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/quagmutt/quagmutt.monstertype.patch b/monsters/walkers/quagmutt/quagmutt.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/quagmutt/quagmutt.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/rex/rex.monstertype.patch b/monsters/walkers/rex/rex.monstertype.patch index 83b5f97a..b8f5eec4 100644 --- a/monsters/walkers/rex/rex.monstertype.patch +++ b/monsters/walkers/rex/rex.monstertype.patch @@ -1,2 +1 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], -[{"op":"test","path":"/relocatable","inverse":true},{"op":"add","path":"/relocatable","value":true}]] \ No newline at end of file +[[{"op":"test","path":"/relocatable","inverse":true},{"op":"add","path":"/relocatable","value":true}]] \ No newline at end of file diff --git a/monsters/walkers/ringram/iceringram.monstertype.patch b/monsters/walkers/ringram/iceringram.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/ringram/iceringram.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/ringram/ringram.monstertype.patch b/monsters/walkers/ringram/ringram.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/ringram/ringram.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/sb_heckblob/default.frames b/monsters/walkers/sb_heckblob/default.frames index 55eacd56..5294d4a5 100644 --- a/monsters/walkers/sb_heckblob/default.frames +++ b/monsters/walkers/sb_heckblob/default.frames @@ -1,19 +1,19 @@ { - "frameGrid" : { - "size" : [18, 16], - "dimensions" : [6, 1], - "names" : [ + "frameGrid": { + "size": [18, 16], + "dimensions": [6, 1], + "names": [ ["idle.1", "idle.2", "idle.3", "idle.4", "idle.6", "jump.3"] ] }, - "aliases" : { - "jump.1" : "idle.3", - "jump.2" : "idle.4", - "idle.5" : "idle.3", + "aliases": { + "jump.1": "idle.3", + "jump.2": "idle.4", + "idle.5": "idle.3", - "fall.1" : "jump.3", - "fall.2" : "idle.4", - "fall.3" : "idle.3" + "fall.1": "jump.3", + "fall.2": "idle.4", + "fall.3": "idle.3" } -} \ No newline at end of file +} diff --git a/monsters/walkers/sb_heckblob/heckblob.animation b/monsters/walkers/sb_heckblob/heckblob.animation index b7873cae..75624184 100644 --- a/monsters/walkers/sb_heckblob/heckblob.animation +++ b/monsters/walkers/sb_heckblob/heckblob.animation @@ -1,125 +1,125 @@ { - "animatedParts" : { - "stateTypes" : { - "body" : { - "priority" : 0, - "default" : "idle", - "states" : { - "idle" : { - "frames" : 6, - "cycle" : 2.5, - "mode" : "loop" + "animatedParts": { + "stateTypes": { + "body": { + "priority": 0, + "default": "idle", + "states": { + "idle": { + "frames": 6, + "cycle": 2.5, + "mode": "loop" }, - "blink" : { - "frames" : 6, - "cycle" : 0.25, - "mode" : "transition", - "transition" : "idle" + "blink": { + "frames": 6, + "cycle": 0.25, + "mode": "transition", + "transition": "idle" }, - "hop" : { - "frames" : 2, - "cycle" : 0.25, - "mode" : "transition", - "transition" : "hopfull", - "properties" : { - "immediateSoundRangeMultiplier" : 0.5 + "hop": { + "frames": 2, + "cycle": 0.25, + "mode": "transition", + "transition": "hopfull", + "properties": { + "immediateSoundRangeMultiplier": 0.5 }, - "frameProperties" : { - "immediateSound" : [ "", "/sfx/npc/monsters/gleap_hop.ogg" ] + "frameProperties": { + "immediateSound": ["", "/sfx/npc/monsters/gleap_hop.ogg"] } }, - "hopfull" : { - "frames" : 2, - "cycle" : 0.325 + "hopfull": { + "frames": 2, + "cycle": 0.325 }, - "fall" : { - "frames" : 3, - "cycle" : 0.325 + "fall": { + "frames": 3, + "cycle": 0.325 }, - "land" : { - "frames" : 6, - "cycle" : 0.25, - "mode" : "loop" + "land": { + "frames": 6, + "cycle": 0.25, + "mode": "loop" } } }, - "damage" : { - "priority" : 6, - "default" : "none", - "states" : { - "none" : { - "frames" : 1 + "damage": { + "priority": 6, + "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.375] + "parts": { + "body": { + "properties": { + "transformationGroups": ["body"], + "offset": [-0.0625, 0.375] }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : ":idle." + "partStates": { + "body": { + "idle": { + "properties": { + "image": ":idle." } }, - "blink" : { - "properties" : { - "image" : ":jump." + "blink": { + "properties": { + "image": ":jump." } }, - "hop" : { - "properties" : { - "image" : ":jump." + "hop": { + "properties": { + "image": ":jump." } }, - "hopfull" : { - "properties" : { - "image" : ":jump." + "hopfull": { + "properties": { + "image": ":jump." } }, - "fall" : { - "properties" : { - "image" : ":fall." + "fall": { + "properties": { + "image": ":fall." } }, - "land" : { - "properties" : { - "image" : ":idle." + "land": { + "properties": { + "image": ":idle." } } }, - "damage" : { - "stunned" : { - "properties" : { - "image" : ":idle." + "damage": { + "stunned": { + "properties": { + "image": ":idle." } } } @@ -128,70 +128,95 @@ } }, - "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" : { - "particles" : [ - { "particle" : "monstersplosion" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "blood" }, - { "particle" : "deathfizz1left" }, - { "particle" : "deathfizz1right" }, - { "particle" : "deathfizz2left" }, - { "particle" : "deathfizz2right" }, - { "particle" : "deathfizz3left" }, - { "particle" : "deathfizz3right" }, - { "particle" : "deathfizz4left" }, - { "particle" : "deathfizz4right" } + "particleEmitters": { + "deathPoof": { + "particles": [{ + "particle": "monstersplosion" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "blood" + }, { + "particle": "deathfizz1left" + }, { + "particle": "deathfizz1right" + }, { + "particle": "deathfizz2left" + }, { + "particle": "deathfizz2right" + }, { + "particle": "deathfizz3left" + }, { + "particle": "deathfizz3right" + }, { + "particle": "deathfizz4left" + }, { + "particle": "deathfizz4right" + } ] }, - "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" ] + "sounds": { + "aggroHop": ["/sfx/npc/monsters/monster_surprise.ogg"], + "deathPuff": ["/sfx/npc/enemydeathpuff.ogg"] } } diff --git a/monsters/walkers/sb_heckblob/heckblob.monsterpart b/monsters/walkers/sb_heckblob/heckblob.monsterpart index 91fdf339..01b4c4e3 100644 --- a/monsters/walkers/sb_heckblob/heckblob.monsterpart +++ b/monsters/walkers/sb_heckblob/heckblob.monsterpart @@ -1,9 +1,9 @@ { - "name" : "body", - "category" : "sb_heckblob", - "type" : "body", + "name": "body", + "category": "sb_heckblob", + "type": "body", - "frames" : { - "body" : "heckblob.png" + "frames": { + "body": "heckblob.png" } -} \ No newline at end of file +} diff --git a/monsters/walkers/sb_heckblob/heckblob.monstertype b/monsters/walkers/sb_heckblob/heckblob.monstertype index 9ae89c40..e4e8f7ad 100644 --- a/monsters/walkers/sb_heckblob/heckblob.monstertype +++ b/monsters/walkers/sb_heckblob/heckblob.monstertype @@ -1,206 +1,203 @@ { - "type" : "sb_heckblob", - "shortdescription" : "Heck Blob", - "description" : "A sentient blob of flesh and blood.", + "type": "sb_heckblob", + "shortdescription": "Heck Blob", + "description": "A sentient blob of flesh and blood.", - "categories" : [ "sb_heckblob" ], - "parts" : [ "body" ], + "categories": ["sb_heckblob"], + "parts": ["body"], - "animation" : "heckblob.animation", + "animation": "heckblob.animation", - "dropPools" : [ { "default" : "sb_heckblobTreasure", "bow" : "sb_heckblobHunting" } ], + "dropPools": [{ + "default": "sb_heckblobTreasure", + "bow": "sb_heckblobHunting" + } + ], - "baseParameters" : { - "scripts" : [ - "/monsters/monster.lua", - "/scripts/companions/sb_capturable.lua" + "baseParameters": { + "scripts": [ + "/monsters/monster.lua" ], - "behavior" : "monster", - - "behaviorConfig" : { - "damageOnTouch" : true, - - "targetQueryRange" : 20, - "targetOnDamage" : true, - "keepTargetInSight" : true, - "keepTargetInRange" : 50, - "targetOutOfSightTime" : 5.0, - - "foundTargetActions" : [ { "name" : "action-aggrohop" } ], - - "hostileActions" : [ - { - "name" : "action-hop", - "cooldown" : 0.0, - "parameters" : { - "verticalSpeed" : 20, - "horizontalSpeed" : 10, - "hopSequence" : 1, - "timeBetweenHops" : 0.0, - "windupTime" : 0.1, - "landTime" : 0.1, - "hopAwayFromWall" : false, - "wallVerticalSpeed" : 35 - } + "behavior": "monster", + + "behaviorConfig": { + "damageOnTouch": true, + + "targetQueryRange": 20, + "targetOnDamage": true, + "keepTargetInSight": true, + "keepTargetInRange": 50, + "targetOutOfSightTime": 5.0, + + "foundTargetActions": [{ + "name": "action-aggrohop" } ], - "periodicActions" : [ - { - "name" : "action-hop", - "cooldown" : 0.0, - "parameters" : { - "verticalSpeed" : 25, - "horizontalSpeed" : 10, - "hopSequence" : 3, - "timeBetweenHops" : 0.25, - "hopAwayFromWall" : true + "hostileActions": [{ + "name": "action-hop", + "cooldown": 0, + "parameters": { + "verticalSpeed": 20, + "horizontalSpeed": 10, + "hopSequence": 1, + "timeBetweenHops": 0, + "windupTime": 0.1, + "landTime": 0.1, + "hopAwayFromWall": false, + "wallVerticalSpeed": 35 } } ], - "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { + "periodicActions": [{ + "name": "action-hop", + "cooldown": 0, + "parameters": { + "verticalSpeed": 25, + "horizontalSpeed": 10, + "hopSequence": 3, + "timeBetweenHops": 0.25, + "hopAwayFromWall": true } - }, - { - "name" : "action-hop", - "cooldown" : 0.0, - "parameters" : { - "verticalSpeed" : 20, - "horizontalSpeed" : 10, - "hopSequence" : 1, - "timeBetweenHops" : 0.0, - "windupTime" : 0.1, - "landTime" : 0.1, - "hopAwayFromWall" : false, - "wallVerticalSpeed" : 35 + } + ], + + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + }, { + "name": "action-hop", + "cooldown": 0, + "parameters": { + "verticalSpeed": 20, + "horizontalSpeed": 10, + "hopSequence": 1, + "timeBetweenHops": 0, + "windupTime": 0.1, + "landTime": 0.1, + "hopAwayFromWall": false, + "wallVerticalSpeed": 35 } } ] }, - "touchDamage" : { - "poly" : [ [-0.6875, -0.375], [-0.4375, -0.625], [0.4375, -0.625], [0.6875, -0.375], [0.6875, 0.25], [0.4375, 0.5], [-0.4375, 0.5], [-0.6875, 0.25] ], - "damage" : 12, + "touchDamage": { + "poly": [[-0.6875, -0.375], [-0.4375, -0.625], [0.4375, -0.625], [0.6875, -0.375], [0.6875, 0.25], [0.4375, 0.5], [-0.4375, 0.5], [-0.6875, 0.25]], + "damage": 12, - "teamType" : "enemy", - "damageSourceKind" : "lash", - "knockback" : 20, - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "lash", + "knockback": 20, + "statusEffects": [] }, - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 1.0, + "metaBoundBox": [-4, -4, 4, 4], + "scale": 1.0, - "movementSettings" : { - "collisionPoly" : [ [-0.6875, -0.25], [-0.4375, -0.5], [0.4375, -0.5], [0.6875, -0.25], [0.6875, 0.25], [0.4375, 0.5], [-0.4375, 0.5], [-0.6875, 0.25] ], + "movementSettings": { + "collisionPoly": [[-0.6875, -0.25], [-0.4375, -0.5], [0.4375, -0.5], [0.6875, -0.25], [0.6875, 0.25], [0.4375, 0.5], [-0.4375, 0.5], [-0.6875, 0.25]], - "mass" : 1.0, - "walkSpeed" : 3, - "runSpeed" : 6, - "jumpSpeed" : 2 + "mass": 1.0, + "walkSpeed": 3, + "runSpeed": 6, + "jumpSpeed": 2 }, - "bodyMaterialKind" : "organic", + "bodyMaterialKind": "organic", - "knockoutTime" : 0.3, - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.3, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, - - "stats" : { - "sb_killCount" : { - "baseValue" : 0 - }, - "sb_level" : { - "baseValue" : 0 - }, - "knockbackStunTime" : { - "baseValue" : 0.25 + "primaryScriptDelta": 5, + + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 50 + "maxHealth": { + "baseValue": 50 }, - "protection" : { - "baseValue" : 0.0 + "protection": { + "baseValue": 0.0 }, - "healthRegen" : { - "baseValue" : 0.5 + "healthRegen": { + "baseValue": 0.5 }, - "powerMultiplier" : { - "baseValue" : 1.0 + "powerMultiplier": { + "baseValue": 1.0 }, - "physicalResistance" : { - "baseValue" : 0.0 + "physicalResistance": { + "baseValue": 0.0 }, - "fireResistance" : { - "baseValue" : 0.0 + "fireResistance": { + "baseValue": 0.0 }, - "fireStatusImmunity" : { - "baseValue" : 0.0 + "fireStatusImmunity": { + "baseValue": 0.0 }, - "iceResistance" : { - "baseValue" : 0.5 + "iceResistance": { + "baseValue": 0.5 }, - "iceStatusImmunity" : { - "baseValue" : 0.0 + "iceStatusImmunity": { + "baseValue": 0.0 }, - "electricResistance" : { - "baseValue" : 0.0 + "electricResistance": { + "baseValue": 0.0 }, - "electricStatusImmunity" : { - "baseValue" : 0.0 + "electricStatusImmunity": { + "baseValue": 0.0 }, - "poisonResistance" : { - "baseValue" : 0.0 + "poisonResistance": { + "baseValue": 0.0 }, - "poisonStatusImmunity" : { - "baseValue" : 0.0 + "poisonStatusImmunity": { + "baseValue": 0.0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : true, - "captureHealthFraction" : 0.5, - "nametagColor" : [64, 200, 255], - "captureCollectables" : {"monsters" : "sb_heckblob"} + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": true, + "captureHealthFraction": 0.5, + "nametagColor": [64, 200, 255], + "captureCollectables": { + "monsters": "sb_heckblob" + } } -} \ No newline at end of file +} diff --git a/monsters/walkers/sb_heckblob/heckblob.png b/monsters/walkers/sb_heckblob/heckblob.png index 055440b7..e71fcc56 100644 Binary files a/monsters/walkers/sb_heckblob/heckblob.png and b/monsters/walkers/sb_heckblob/heckblob.png differ diff --git a/monsters/walkers/sb_poptop/poptop.monstertype b/monsters/walkers/sb_poptop/poptop.monstertype index ca3e1cd1..6e801d58 100644 --- a/monsters/walkers/sb_poptop/poptop.monstertype +++ b/monsters/walkers/sb_poptop/poptop.monstertype @@ -1,233 +1,235 @@ { - "type" : "sb_poptop", - "shortdescription" : "Adolescent Poptop", - "description" : "The Poptop hums beautifully to confuse its prey. It's rather territorial at this age.", + "type": "sb_poptop", + "shortdescription": "Adolescent Poptop", + "description": "The Poptop hums beautifully to confuse its prey. It's rather territorial at this age.", - "categories" : [ "sb_poptop" ], - "parts" : [ "body" ], + "categories": ["sb_poptop"], + "parts": ["body"], - "animation" : "poptop.animation", + "animation": "poptop.animation", - "dropPools" : [ { "default" : "poptopTreasure", "bow" : "poptopHunting" } ], + "dropPools": [{ + "default": "poptopTreasure", + "bow": "poptopHunting" + } + ], - "baseParameters" : { - "scripts" : [ + "baseParameters": { + "scripts": [ "/monsters/monster.lua" ], - "behavior" : "monster", + "behavior": "monster", - "behaviorConfig" : { - "damageOnTouch" : true, + "behaviorConfig": { + "damageOnTouch": true, - "targetQueryRange" : 20, - "targetOnDamage" : true, - "keepTargetInSight" : true, - "keepTargetInRange" : 10, - "targetOutOfSightTime" : 0.5, + "targetQueryRange": 20, + "targetOnDamage": true, + "keepTargetInSight": true, + "keepTargetInRange": 10, + "targetOutOfSightTime": 0.5, - "foundTargetActions" : [ { "name" : "action-aggrohop" } ], + "foundTargetActions": [{ + "name": "action-aggrohop" + } + ], - "fleeActions" : [], + "fleeActions": [], - "hostileActions" : [ - { - "name" : "action-charge", - "cooldown" : 3, - "parameters" : { - "maximumRange" : 5, - "windupTime" : 0.4, + "hostileActions": [{ + "name": "action-charge", + "cooldown": 3, + "parameters": { + "maximumRange": 5, + "windupTime": 0.4, - "aimAtTarget" : false, - "aimDirection" : [1, 0.5], - "chargeTime" : [0.3, 0.3], - "chargeSpeed" : 35, - "chargeControlForce" : 200, - "wallCrashSound" : "", - "wallCrashEmitter" : "", + "aimAtTarget": false, + "aimDirection": [1, 0.5], + "chargeTime": [0.3, 0.3], + "chargeSpeed": 35, + "chargeControlForce": 200, + "wallCrashSound": "", + "wallCrashEmitter": "", - "winddownTime" : 0.5 + "winddownTime": 0.5 } } ], - "periodicActions" : [], - - "approachActions" : [ - { - "name" : "approach-walk", - "parameters" : { - "canJump" : true, - "maxJumps" : 8, - "moveState" : "run", - "jumpXVelocity" : 12, - "jumpYVelocity" : 30, - "jumpXControlForce" : 50, - "minXRange" : 10, - "run" : true + "periodicActions": [], + + "approachActions": [{ + "name": "approach-walk", + "parameters": { + "canJump": true, + "maxJumps": 8, + "moveState": "run", + "jumpXVelocity": 12, + "jumpYVelocity": 30, + "jumpXControlForce": 50, + "minXRange": 10, + "run": true } } ], - "followActions" : [ - { - "name" : "approach-teleport", - "parameters" : { - } - }, - { - "name" : "approach-walk", - "parameters" : { - "canJump" : true, - "maxJumps" : 8, - "moveState" : "run", - "jumpXVelocity" : 12, - "jumpYVelocity" : 30, - "jumpXControlForce" : 50, - "minXRange" : 10, - "run" : true + "followActions": [{ + "name": "approach-teleport", + "parameters": {} + }, { + "name": "approach-walk", + "parameters": { + "canJump": true, + "maxJumps": 8, + "moveState": "run", + "jumpXVelocity": 12, + "jumpYVelocity": 30, + "jumpXControlForce": 50, + "minXRange": 10, + "run": true } } ], - "wanderActions" : [ - { - "name" : "wander-walk", - "cooldown" : 3.0, - "parameters" : { - "moveState" : "stroll", - "wanderTime" : [5, 20] + "wanderActions": [{ + "name": "wander-walk", + "cooldown": 3.0, + "parameters": { + "moveState": "stroll", + "wanderTime": [5, 20] } - }, - { - "name" : "wander-walk", - "cooldown" : 6.0, - "parameters" : { - "moveState" : "walk", - "wanderTime" : [5, 5] + }, { + "name": "wander-walk", + "cooldown": 6.0, + "parameters": { + "moveState": "walk", + "wanderTime": [5, 5] } } ] }, - "touchDamage" : { - "poly" : [ [0.8125, 1.25], [1.3125, 0.75], [1.3125, -1.05], [0.8125, -1.55], [-0.8125, -1.55], [-1.3125, -1.05], [-1.3125, 0.75], [-0.8125, 1.25] ], - "damage" : 14, + "touchDamage": { + "poly": [[0.8125, 1.25], [1.3125, 0.75], [1.3125, -1.05], [0.8125, -1.55], [-0.8125, -1.55], [-1.3125, -1.05], [-1.3125, 0.75], [-0.8125, 1.25]], + "damage": 14, - "teamType" : "enemy", - "damageSourceKind" : "slash", - "knockback" : 20, - "statusEffects" : [ ] + "teamType": "enemy", + "damageSourceKind": "slash", + "knockback": 20, + "statusEffects": [] }, - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 1.0, + "metaBoundBox": [-4, -4, 4, 4], + "scale": 1.0, - "movementSettings" : { - "collisionPoly" : [ [0.8125, 1.25], [1.3125, 0.75], [1.3125, -1.05], [0.8125, -1.55], [-0.8125, -1.55], [-1.3125, -1.05], [-1.3125, 0.75], [-0.8125, 1.25] ], + "movementSettings": { + "collisionPoly": [[0.8125, 1.25], [1.3125, 0.75], [1.3125, -1.05], [0.8125, -1.55], [-0.8125, -1.55], [-1.3125, -1.05], [-1.3125, 0.75], [-0.8125, 1.25]], - "mass" : 1.0, - "walkSpeed" : 3, - "runSpeed" : 8, + "mass": 1.0, + "walkSpeed": 3, + "runSpeed": 8, - "airFriction" : 0, + "airFriction": 0, - "airJumpProfile" : { - "jumpSpeed" : 45.0, - "jumpInitialPercentage" : 1.0, - "jumpHoldTime" : 0.0 + "airJumpProfile": { + "jumpSpeed": 45.0, + "jumpInitialPercentage": 1.0, + "jumpHoldTime": 0.0 } }, - "bodyMaterialKind" : "organic", + "bodyMaterialKind": "organic", - "knockoutTime" : 0.3, - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.3, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : true, - "minimumLiquidStatusEffectPercentage" : 0.1, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": true, + "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 5, + "primaryScriptDelta": 5, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0.25 + "stats": { + "knockbackStunTime": { + "baseValue": 0.25 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 60 + "maxHealth": { + "baseValue": 60 }, - "protection" : { - "baseValue" : 0.0 + "protection": { + "baseValue": 0.0 }, - "healthRegen" : { - "baseValue" : 0.0 + "healthRegen": { + "baseValue": 0.0 }, - "powerMultiplier" : { - "baseValue" : 1.0 + "powerMultiplier": { + "baseValue": 1.0 }, - "physicalResistance" : { - "baseValue" : 0.0 + "physicalResistance": { + "baseValue": 0.0 }, - "fireResistance" : { - "baseValue" : 0.0 + "fireResistance": { + "baseValue": 0.0 }, - "fireStatusImmunity" : { - "baseValue" : 0.0 + "fireStatusImmunity": { + "baseValue": 0.0 }, - "iceResistance" : { - "baseValue" : 0.0 + "iceResistance": { + "baseValue": 0.0 }, - "iceStatusImmunity" : { - "baseValue" : 0.0 + "iceStatusImmunity": { + "baseValue": 0.0 }, - "electricResistance" : { - "baseValue" : 0.0 + "electricResistance": { + "baseValue": 0.0 }, - "electricStatusImmunity" : { - "baseValue" : 0.0 + "electricStatusImmunity": { + "baseValue": 0.0 }, - "poisonResistance" : { - "baseValue" : 0.0 + "poisonResistance": { + "baseValue": 0.0 }, - "poisonStatusImmunity" : { - "baseValue" : 0.0 + "poisonStatusImmunity": { + "baseValue": 0.0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1.0, + "initialValue": 0.0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : true, - "captureHealthFraction" : 0.5, - "nametagColor" : [64, 200, 255], - "captureCollectables" : {"monsters" : "sb_poptop"} + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": true, + "captureHealthFraction": 0.5, + "nametagColor": [64, 200, 255], + "captureCollectables": { + "monsters": "sb_poptop" + } } -} \ No newline at end of file +} diff --git a/monsters/walkers/sb_poptop/poptop.png b/monsters/walkers/sb_poptop/poptop.png index 066514c5..37e09009 100644 Binary files a/monsters/walkers/sb_poptop/poptop.png and b/monsters/walkers/sb_poptop/poptop.png differ diff --git a/monsters/walkers/sb_speech/monsterspawner.lua b/monsters/walkers/sb_speech/monsterspawner.lua index 604fbf78..2de8396b 100644 --- a/monsters/walkers/sb_speech/monsterspawner.lua +++ b/monsters/walkers/sb_speech/monsterspawner.lua @@ -1,4 +1,10 @@ function init() - local a = config.getParameter("sb_monsterspawner") - world.spawnMonster(a[math.random(#a)],entity.position(),{aggressive=config.getParameter("aggressive",true),damageTeam=entity.damageTeam().team,level=monster.level() or world.threatLevel() or 1}) + local data = config.getParameter("sb_monsterspawner") + world.spawnMonster(data[math.random(#data)], entity.position(), + { + aggressive = config.getParameter("aggressive", true), + damageTeam = entity.damageTeam().team, + level = monster.level() or world.threatLevel() or 1 + } + ) end \ No newline at end of file diff --git a/monsters/walkers/sb_speech/sb_monsterspawner.monstertype b/monsters/walkers/sb_speech/sb_monsterspawner.monstertype index 98415df6..46946dcf 100644 --- a/monsters/walkers/sb_speech/sb_monsterspawner.monstertype +++ b/monsters/walkers/sb_speech/sb_monsterspawner.monstertype @@ -1,11 +1,8 @@ { "type": "sb_monsterspawner", - "categories": ["sb_speech"], "parts": ["body"], - "animation": "sb_speech.animation", - "dropPools": [{ "default": "empty" } @@ -27,7 +24,6 @@ "touchDamage": { "poly": [[0, 0], [0, 0], [0, 0], [0, 0]], "damage": 0, - "teamType": "enemy", "damageSourceKind": "slash", "knockback": 0, @@ -39,15 +35,12 @@ "movementSettings": { "collisionPoly": [[0, 0], [0, 0], [0, 0], [0, 0]], - "mass": 0, "gravityEnabled": false, "walkSpeed": 0, "runSpeed": 0, - "physicsEffectCategories": ["boss"], "airFriction": 0, - "airJumpProfile": { "jumpSpeed": 0, "jumpInitialPercentage": 0, @@ -56,25 +49,20 @@ }, "aggressive": true, - "bodyMaterialKind": "organic", - "knockoutTime": 0.3, "knockoutAnimationStates": { "damage": "stunned" }, "deathParticles": "deathPoof", "knockoutEffect": "", - "statusSettings": { "statusProperties": { "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects": false, "appliesWeatherStatusEffects": false, "minimumLiquidStatusEffectPercentage": 0.1, - "primaryScriptSources": [ "/stats/monster_primary.lua" ], @@ -112,8 +100,8 @@ "resources": { "stunned": { - "deltaValue": -1.0, - "initialValue": 0.0 + "deltaValue": -1, + "initialValue": 0 }, "health": { "maxStat": "maxHealth", diff --git a/monsters/walkers/sb_speech/sb_speech.animation b/monsters/walkers/sb_speech/sb_speech.animation index 0a6149e8..672fffa3 100644 --- a/monsters/walkers/sb_speech/sb_speech.animation +++ b/monsters/walkers/sb_speech/sb_speech.animation @@ -1,91 +1,91 @@ { - "animatedParts" : { - "stateTypes" : { - "body" : { - "priority" : 0, - "default" : "idle", - "states" : { - "idle" : { - "frames" : 1, - "cycle" : 1.5 + "animatedParts": { + "stateTypes": { + "body": { + "priority": 0, + "default": "idle", + "states": { + "idle": { + "frames": 1, + "cycle": 1.5 }, - "walk" : { - "frames" : 1, - "cycle" : 0.5, - "mode" : "loop", - "properties" : { - "particleEmittersOff" : [ "spindust" ] + "walk": { + "frames": 1, + "cycle": 0.5, + "mode": "loop", + "properties": { + "particleEmittersOff": ["spindust"] } }, - "fall" : { - "frames" : 1, - "cycle" : 0.25, - "mode" : "loop" + "fall": { + "frames": 1, + "cycle": 0.25, + "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" : { - "transformationGroups" : [ "body" ], - "offset" : [0,0] + "parts": { + "body": { + "properties": { + "transformationGroups": ["body"], + "offset": [0, 0] }, - "partStates" : { - "body" : { - "idle" : { - "properties" : { - "image" : "" + "partStates": { + "body": { + "idle": { + "properties": { + "image": "" } }, - "walk" : { - "properties" : { - "image" : "" + "walk": { + "properties": { + "image": "" } }, - "fall" : { - "properties" : { - "image" : "" + "fall": { + "properties": { + "image": "" } } }, - "damage" : { - "stunned" : { - "properties" : { - "image" : "" + "damage": { + "stunned": { + "properties": { + "image": "" } } } @@ -94,46 +94,48 @@ } }, - "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" : { - "spindust" : { - "emissionRate" : 1, - "offsetRegion" : [0,0,0,0], - "particles" : [] + "particleEmitters": { + "spindust": { + "emissionRate": 1, + "offsetRegion": [0, 0, 0, 0], + "particles": [] }, - "deathPoof" : { - "particles" : [] + "deathPoof": { + "particles": [] }, - "captureParticles" : { - "particles" : [] + "captureParticles": { + "particles": [] }, - "releaseParticles" : { - "particles" : [] + "releaseParticles": { + "particles": [] }, - "teleportOut" : { - "particles" : [] + "teleportOut": { + "particles": [] }, - "teleportIn" : { - "particles" : [] + "teleportIn": { + "particles": [] }, - "levelUp" : { - "particles" : [] + "levelUp": { + "particles": [] } }, - "sounds" : { - "aggroHop" : [], - "deathPuff" : [] + "sounds": { + "aggroHop": [], + "deathPuff": [] } } diff --git a/monsters/walkers/sb_speech/sb_speech.monstertype b/monsters/walkers/sb_speech/sb_speech.monstertype index 1dd46d5f..1a1490d1 100644 --- a/monsters/walkers/sb_speech/sb_speech.monstertype +++ b/monsters/walkers/sb_speech/sb_speech.monstertype @@ -1,107 +1,112 @@ { - "type" : "sb_speech", - "categories" : ["sb_speech"], - "parts" : ["body"], - "animation" : "sb_speech.animation", - "dropPools" : [{"default":"empty"}], - "baseParameters" : { - "scripts" : ["/items/tools/inspectiontool/sb_talk.lua"], - "behavior" : "monster", - "text":"", - "owner":0, - "behaviorConfig" : { - "damageOnTouch" : false, - "targetOnDamage" : false + "type": "sb_speech", + "categories": ["sb_speech"], + "parts": ["body"], + "animation": "sb_speech.animation", + "dropPools": [{ + "default": "empty" + } + ], + "baseParameters": { + "scripts": ["/items/tools/inspectiontool/sb_talk.lua"], + "behavior": "monster", + "text": "", + "owner": 0, + "behaviorConfig": { + "damageOnTouch": false, + "targetOnDamage": false }, - "damageTeamType" : "assistant", - "touchDamage" : {"poly" : [[0,0],[0,0],[0,0],[0,0]]}, - "metaBoundBox" : [-4, -4, 4, 4], - "scale" : 0, - "movementSettings" : { - "collisionPoly" : [[0,0],[0,0],[0,0],[0,0]], - "mass" : 0, - "gravityEnabled" : false, - "walkSpeed" : 0, - "runSpeed" : 0, - "physicsEffectCategories" : ["boss"], - "airFriction" : 0, - "airJumpProfile" : { - "jumpSpeed" : 0, - "jumpInitialPercentage" : 0, - "jumpHoldTime" : 0 + "damageTeamType": "assistant", + "touchDamage": { + "poly": [[0, 0], [0, 0], [0, 0], [0, 0]] + }, + "metaBoundBox": [-4, -4, 4, 4], + "scale": 0, + "movementSettings": { + "collisionPoly": [[0, 0], [0, 0], [0, 0], [0, 0]], + "mass": 0, + "gravityEnabled": false, + "walkSpeed": 0, + "runSpeed": 0, + "physicsEffectCategories": ["boss"], + "airFriction": 0, + "airJumpProfile": { + "jumpSpeed": 0, + "jumpInitialPercentage": 0, + "jumpHoldTime": 0 } }, - "aggressive" : false, + "aggressive": false, - "bodyMaterialKind" : "organic", + "bodyMaterialKind": "organic", - "knockoutTime" : 0.3, - "knockoutAnimationStates" : { - "damage" : "stunned" + "knockoutTime": 0.3, + "knockoutAnimationStates": { + "damage": "stunned" }, - "deathParticles" : "deathPoof", - "knockoutEffect" : "", + "deathParticles": "deathPoof", + "knockoutEffect": "", - "statusSettings" : { - "statusProperties" : { - "targetMaterialKind" : "organic" + "statusSettings": { + "statusProperties": { + "targetMaterialKind": "organic" }, - "appliesEnvironmentStatusEffects" : false, - "appliesWeatherStatusEffects" : false, - "minimumLiquidStatusEffectPercentage" : 0, + "appliesEnvironmentStatusEffects": false, + "appliesWeatherStatusEffects": false, + "minimumLiquidStatusEffectPercentage": 0, - "primaryScriptSources" : [ + "primaryScriptSources": [ "/stats/monster_primary.lua" ], - "primaryScriptDelta" : 1, + "primaryScriptDelta": 1, - "stats" : { - "knockbackStunTime" : { - "baseValue" : 0 + "stats": { + "knockbackStunTime": { + "baseValue": 0 }, - "knockbackThreshold" : { - "baseValue" : 9 + "knockbackThreshold": { + "baseValue": 9 }, - "maxHealth" : { - "baseValue" : 30 + "maxHealth": { + "baseValue": 30 }, - "invulnerable" : { - "baseValue" : 1 + "invulnerable": { + "baseValue": 1 }, - "specialStatusImmunity" : { - "baseValue" : 1 + "specialStatusImmunity": { + "baseValue": 1 }, - "invisible" : { - "baseValue" : 1 + "invisible": { + "baseValue": 1 }, - "protection" : { - "baseValue" : 99999 + "protection": { + "baseValue": 99999 }, - "healthRegen" : { - "baseValue" : -1 + "healthRegen": { + "baseValue": -1 }, - "powerMultiplier" : { - "baseValue" : 0 + "powerMultiplier": { + "baseValue": 0 } }, - "resources" : { - "stunned" : { - "deltaValue" : -1.0, - "initialValue" : 0.0 + "resources": { + "stunned": { + "deltaValue": -1, + "initialValue": 0 }, - "health" : { - "maxStat" : "maxHealth", - "deltaStat" : "healthRegen", - "defaultPercentage" : 100 + "health": { + "maxStat": "maxHealth", + "deltaStat": "healthRegen", + "defaultPercentage": 100 } } }, - "mouthOffset" : [0, 0], - "feetOffset" : [0, -8], - "capturable" : false, - "relocatable" : false + "mouthOffset": [0, 0], + "feetOffset": [0, -8], + "capturable": false, + "relocatable": false } -} \ No newline at end of file +} diff --git a/monsters/walkers/sb_speech/sb_speech.png b/monsters/walkers/sb_speech/sb_speech.png index 4d3ddf17..d0ff2244 100644 Binary files a/monsters/walkers/sb_speech/sb_speech.png and b/monsters/walkers/sb_speech/sb_speech.png differ diff --git a/monsters/walkers/scaveran/poisonscaveran.monstertype.patch b/monsters/walkers/scaveran/poisonscaveran.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/scaveran/poisonscaveran.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/scaveran/scaveran.monstertype.patch b/monsters/walkers/scaveran/scaveran.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/scaveran/scaveran.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/smoglin/poisonsmoglin.monstertype.patch b/monsters/walkers/smoglin/poisonsmoglin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/smoglin/poisonsmoglin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/smoglin/smoglin.monstertype.patch b/monsters/walkers/smoglin/smoglin.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/smoglin/smoglin.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/snaunt/electricsnaunt.monstertype.patch b/monsters/walkers/snaunt/electricsnaunt.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/snaunt/electricsnaunt.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/snaunt/snaunt.monstertype.patch b/monsters/walkers/snaunt/snaunt.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/snaunt/snaunt.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/snuffish/poisonsnuffish.monstertype.patch b/monsters/walkers/snuffish/poisonsnuffish.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/snuffish/poisonsnuffish.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/snuffish/snuffish.monstertype.patch b/monsters/walkers/snuffish/snuffish.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/snuffish/snuffish.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/sporgus/poisonsporgus.monstertype.patch b/monsters/walkers/sporgus/poisonsporgus.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/sporgus/poisonsporgus.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/sporgus/sporgus.monstertype.patch b/monsters/walkers/sporgus/sporgus.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/sporgus/sporgus.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/tank/tank.monstertype.patch b/monsters/walkers/tank/tank.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/tank/tank.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/taroni/firetaroni.monstertype.patch b/monsters/walkers/taroni/firetaroni.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/taroni/firetaroni.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/taroni/taroni.monstertype.patch b/monsters/walkers/taroni/taroni.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/taroni/taroni.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/tentaclebarrier/tentaclebarrier.monstertype.patch b/monsters/walkers/tentaclebarrier/tentaclebarrier.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/tentaclebarrier/tentaclebarrier.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/tentacleclam/tentacleclam.monstertype.patch b/monsters/walkers/tentacleclam/tentacleclam.monstertype.patch index 112b18e1..1cabf9ff 100644 --- a/monsters/walkers/tentacleclam/tentacleclam.monstertype.patch +++ b/monsters/walkers/tentacleclam/tentacleclam.monstertype.patch @@ -1,3 +1,4 @@ -[[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}], +[ [{"op":"test","path":"/dropPools","inverse":true},{"op":"add","path":"/dropPools","value":[]}], -[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}]] \ No newline at end of file +[{"op":"add","path":"/dropPools/-","value":{"default":"sb_tentacleTreasure","bow":"sb_tentacleHunting"}}] +] \ No newline at end of file diff --git a/monsters/walkers/toumingo/firetoumingo.monstertype.patch b/monsters/walkers/toumingo/firetoumingo.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/toumingo/firetoumingo.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/toumingo/toumingo.monstertype.patch b/monsters/walkers/toumingo/toumingo.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/toumingo/toumingo.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/trictus/poisontrictus.monstertype.patch b/monsters/walkers/trictus/poisontrictus.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/trictus/poisontrictus.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/trictus/trictus.monstertype.patch b/monsters/walkers/trictus/trictus.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/trictus/trictus.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/voltip/electricvoltip.monstertype.patch b/monsters/walkers/voltip/electricvoltip.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/voltip/electricvoltip.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/voltip/voltip.monstertype.patch b/monsters/walkers/voltip/voltip.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/voltip/voltip.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/yokat/electricyokat.monstertype.patch b/monsters/walkers/yokat/electricyokat.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/yokat/electricyokat.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/monsters/walkers/yokat/yokat.monstertype.patch b/monsters/walkers/yokat/yokat.monstertype.patch deleted file mode 100644 index 3ae81f04..00000000 --- a/monsters/walkers/yokat/yokat.monstertype.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"add","path":"/baseParameters/scripts/-","value":"/scripts/companions/sb_capturable.lua"}] \ No newline at end of file diff --git a/music/sb_weep-not-my-child.ogg b/music/sb_weep-not-my-child.ogg new file mode 100644 index 00000000..7178ce0e Binary files /dev/null and b/music/sb_weep-not-my-child.ogg differ diff --git a/npcs/crew/sb_crewmemberchemistgrey.npctype b/npcs/crew/sb_crewmemberchemistgrey.npctype index 9f62eba9..3f69f276 100644 --- a/npcs/crew/sb_crewmemberchemistgrey.npctype +++ b/npcs/crew/sb_crewmemberchemistgrey.npctype @@ -1,37 +1,39 @@ { - "type" : "sb_crewmemberchemistgrey", - "baseType" : "crewmemberchemist", + "type": "sb_crewmemberchemistgrey", + "baseType": "crewmemberchemist", + "displayTitle": "G. Chemist Crew Member", - "scriptConfig" : { - "crew" : { - "role" : { - "benefits" : [ - { - // Ephemeral effects gained upon leaving the ship - "type" : "EphemeralEffect", - "effect" : "sb_greystim", - "duration" : 30 - }, - { - // Persistent effects are active while on the ship - "type" : "PersistentEffect", - "effect" : "sb_shipgreystim" + "scriptConfig": { + "crew": { + "role": { + "benefits": [{ + "type": "EphemeralEffect", + "effect": "sb_greystim", + "duration": 30 + }, { + "type": "PersistentEffect", + "effect": "sb_shipgreystim" } ] } } }, - "items" : { - "default" : [ - [0, [ - { - "chest" : [{"name" : "protectoratechest"}], - "legs" : [{"name" : "protectoratepants"}], - "primary" : ["sb_greystim"], - "sheathedprimary" : ["npcpistol", "npcshortsword"] + "items": { + "default": [ + [0, [{ + "chest": [{ + "name": "protectoratechest" + } + ], + "legs": [{ + "name": "protectoratepants" + } + ], + "primary": ["sb_greystim"], + "sheathedprimary": ["npcpistol", "npcshortsword"] } - ] ] + ]] ] } -} \ No newline at end of file +} diff --git a/npcs/dungeon/sb_humanbunker/bunkerguard.npctype b/npcs/dungeon/sb_humanbunker/bunkerguard.npctype index 94f1985c..ca8484b3 100644 --- a/npcs/dungeon/sb_humanbunker/bunkerguard.npctype +++ b/npcs/dungeon/sb_humanbunker/bunkerguard.npctype @@ -1,75 +1,93 @@ { - "type" : "sb_bunkerguard", - "baseType" : "hostile", + "type": "sb_bunkerguard", + "baseType": "hostile", + "displayTitle": "USCM Guard", + "dropPools": ["bunkerguardtreasure"], - "dropPools" : [ "bunkerguardtreasure" ], - - "scripts" : [ + "scripts": [ "/npcs/bmain.lua", "/npcs/sb_bmain.lua" ], - "scriptConfig" : { - "dialog" : { - "attack" : { - "default" : { - "default" : [ + "scriptConfig": { + "sb_crouching": true, + "dialog": { + "attack": { + "default": { + "default": [ "Intruder!" ] }, - "human" : { - "default" : [ - "Intruder!", - "We've got a hostile!", - "Take 'em down!", - "Open fire!", - "Target acquired!", - "You've trespassed for the last time!", - "I made my bullets extra explodey, just for you!", - "My aim is true! Except for just then.", - "Die faster!", - "Big fish eats little fish! Guess which one you are?", - "How many bullets can you take? Let's find out.", - "There's no escaping for you!", - "I hope you wrote a will!", - "Look behind you! It's your imminent dooooom!", - "Prepare to die, scum!", - "I am your death, stranger.", - "Your expiry date has come!", - "Hostile at twelve o'clock!" + "human": { + "default": [ + "Intruder!", + "We've got a hostile!", + "Take 'em down!", + "Open fire!", + "Target acquired!", + "You've trespassed for the last time!", + "I made my bullets extra explodey, just for you!", + "My aim is true! Except for just then.", + "Die faster!", + "Big fish eats little fish! Guess which one you are?", + "How many bullets can you take? Let's find out.", + "There's no escaping for you!", + "I hope you wrote a will!", + "Look behind you! It's your imminent dooooom!", + "Prepare to die, scum!", + "I am your death, stranger.", + "Your expiry date has come!", + "Hostile at twelve o'clock!" ] } } } }, - "items" : { - "override" : [ - [0, [ - { - "head" : [{"name":"soldierhead","parameters":{"colorIndex":7}}], - "chest" : [{"name":"soldierchest","parameters":{"colorIndex":7}}], - "legs" : [{"name":"soldierpants","parameters":{"colorIndex":7}}], - "primary" : ["sb_pulserifle"], - "sheathedprimary" : ["sb_nightstick"], - "sheathedalt" : ["riotshield"] + "items": { + "override": [ + [0, [{ + "head": [{ + "name": "soldierhead", + "parameters": { + "colorIndex": 7 + } + } + ], + "chest": [{ + "name": "soldierchest", + "parameters": { + "colorIndex": 7 + } + } + ], + "legs": [{ + "name": "soldierpants", + "parameters": { + "colorIndex": 7 + } + } + ], + "primary": ["sb_pulserifle"], + "sheathedprimary": ["sb_nightstick"], + "sheathedalt": ["riotshield"] } - ] ] + ]] ] }, - "statusControllerSettings" : { - "stats" : { - "maxHealth" : { - "baseValue" : 70 + "statusControllerSettings": { + "stats": { + "maxHealth": { + "baseValue": 70 }, - "maxEnergy" : { - "baseValue" : 60 + "maxEnergy": { + "baseValue": 60 }, - "powerMultiplier" : { - "baseValue" : 3 + "powerMultiplier": { + "baseValue": 3 }, - "protection" : { - "baseValue" : 1.0 + "protection": { + "baseValue": 1.0 } } } diff --git a/npcs/dungeon/sb_humanbunker/bunkerpyro.npctype b/npcs/dungeon/sb_humanbunker/bunkerpyro.npctype index eb46dc3b..8f0e8481 100644 --- a/npcs/dungeon/sb_humanbunker/bunkerpyro.npctype +++ b/npcs/dungeon/sb_humanbunker/bunkerpyro.npctype @@ -2,7 +2,12 @@ "type" : "sb_bunkerpyro", "baseType" : "hostile", "dropPools" : ["sb_bunkerpyroTreasure"], + "displayTitle": "USCM Pyromaniac", + "scripts": [ + "/npcs/bmain.lua", + "/npcs/sb_bmain.lua" + ], "scriptConfig" : { "dialog" : { diff --git a/npcs/events/sb_peacekeeper.npctype b/npcs/events/sb_peacekeeper.npctype index 8cb964c3..e70a1917 100644 --- a/npcs/events/sb_peacekeeper.npctype +++ b/npcs/events/sb_peacekeeper.npctype @@ -1,55 +1,60 @@ { - "type" : "sb_peacekeeper", - "baseType" : "hostile", + "type": "sb_peacekeeper", + "baseType": "hostile", + "displayTitle": "Peacekeeper", + "levelVariance": [3, 3], + "persistent": true, - "levelVariance" : [3, 3], - "persistent" : true, + "damageTeamType": "enemy", + "damageTeam": 1, - "damageTeamType" : "enemy", - "damageTeam" : 1, + "dropPools": ["guardtreasure"], - "dropPools" : [ "guardtreasure" ], + "scriptConfig": { + "behavior": "peacekeeper", - "scriptConfig" : { - "behavior" : "peacekeeper", - - "dialog" : { - "attack" : "/dialog/peacekeeper.config:attack", - "reattack" : "/dialog/peacekeeper.config:reattack", - "killedTarget" : "/dialog/peacekeeper.config:killedTarget", - "lostTarget" : "/dialog/peacekeeper.config:lostTarget", - "outOfSight" : "/dialog/peacekeeper.config:outOfSight", - "cheerOn" : "/dialog/peacekeeper.config:cheerOn", - "cantReach" : "/dialog/peacekeeper.config:cantReach" + "dialog": { + "attack": "/dialog/peacekeeper.config:attack", + "reattack": "/dialog/peacekeeper.config:reattack", + "killedTarget": "/dialog/peacekeeper.config:killedTarget", + "lostTarget": "/dialog/peacekeeper.config:lostTarget", + "outOfSight": "/dialog/peacekeeper.config:outOfSight", + "cheerOn": "/dialog/peacekeeper.config:cheerOn", + "cantReach": "/dialog/peacekeeper.config:cantReach" } }, - "items" : { - "default" : [ - [0, [ - { - "chest" : [ { "name" : "peacekeeperchest" } ], - "legs" : [ { "name" : "peacekeeperpants" } ], - "primary" : [ "npcassaultrifle" ], - "sheathedprimary" : [ "npcbroadsword" ] + "items": { + "default": [ + [0, [{ + "chest": [{ + "name": "peacekeeperchest" + } + ], + "legs": [{ + "name": "peacekeeperpants" + } + ], + "primary": ["npcassaultrifle"], + "sheathedprimary": ["npcbroadsword"] } - ] ] + ]] ] }, - "statusControllerSettings" : { - "stats" : { - "maxHealth" : { - "baseValue" : 100.0 + "statusControllerSettings": { + "stats": { + "maxHealth": { + "baseValue": 100.0 }, - "powerMultiplier" : { - "baseValue" : 0.5 + "powerMultiplier": { + "baseValue": 0.5 }, - "protection" : { - "baseValue" : 1.0 + "protection": { + "baseValue": 1.0 }, - "healthRegen" : { - "baseValue" : 0.0 + "healthRegen": { + "baseValue": 0.0 } } } diff --git a/npcs/events/sb_rivalbountyhunter.npctype b/npcs/events/sb_rivalbountyhunter.npctype index 298c5268..0e9b24d2 100644 --- a/npcs/events/sb_rivalbountyhunter.npctype +++ b/npcs/events/sb_rivalbountyhunter.npctype @@ -1,7 +1,7 @@ { "type" : "sb_rivalbountyhunter", "baseType" : "base", - + "displayTitle": "Bounty Hunter", "levelVariance" : [3, 3], "persistent" : false, diff --git a/npcs/events/sb_spacecheesemerchant.npctype b/npcs/events/sb_spacecheesemerchant.npctype index 10906d04..73c845b6 100644 --- a/npcs/events/sb_spacecheesemerchant.npctype +++ b/npcs/events/sb_spacecheesemerchant.npctype @@ -1,78 +1,81 @@ { - "type" : "sb_spacecheesemerchant", - "baseType" : "merchant", + "type": "sb_spacecheesemerchant", + "baseType": "merchant", + "displayTitle": "Astro Cheese Merchant", + "persistent": false, - "persistent" : false, - - "scriptConfig" : { - "questGenerator" : { "pools" : [], "enableParticipation" : false }, + "scriptConfig": { + "questGenerator": { + "pools": [], + "enableParticipation": false + }, - "merchant" : { - "waitTime" : 10, - "storeRadius" : -1, - "categories" : { - "override" : [ "cheesemerchant" ] + "merchant": { + "waitTime": 10, + "storeRadius": -1, + "categories": { + "override": ["cheesemerchant"] }, - "buyFactorRange" : [ 0.4, 1.8 ],//0.7,1.5 - "sellFactorRange" : [ 0.2, 0.2 ], - "numItems" : 5, - "paneLayoutOverride" : { - "windowtitle" : { - "title" : " Astro Cheese Merchant", - "subtitle" : " Sells cheese from outer space!" + "buyFactorRange": [0.4, 1.8], //0.7,1.5 + "sellFactorRange": [0.2, 0.2], + "numItems": 5, + "paneLayoutOverride": { + "windowtitle": { + "title": " Astro Cheese Merchant", + "subtitle": " Sells cheese from outer space!" } } }, - "dialog" : { - "merchant" : { - "tout" : { - "default" : { - "default" : [ + "dialog": { + "merchant": { + "tout": { + "default": { + "default": [ "I have arrived from outer space to offer you the finest selection of cheese!" ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Floran sssell cheese! From ssspace!" ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Proud. My space cheese is the best cheese." ] } }, - "start" : { - "default" : { - "default" : [ + "start": { + "default": { + "default": [ "Browse my selection of space cheese." ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Floran sssell cheese! From ssspace!" ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Proud. My cheese is the best cheese all the way from space." ] } }, - "end" : { - "default" : { - "default" : [ + "end": { + "default": { + "default": [ "Come back anytime for cheese!" ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Come back sssoon for more cheese!" ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Encouraging. Go forth and eat cheese." ] } @@ -81,21 +84,32 @@ } }, - "items" : { - "override" : [ - [0, [ - { - "back" : [ - { "name" : "foundryforemanback", "parameters" : { "colorIndex" : [2] } } + "items": { + "override": [ + [0, [{ + "back": [{ + "name": "foundryforemanback", + "parameters": { + "colorIndex": [2] + } + } ], - "chest" : [ - { "name" : "spacesuitchest", "parameters" : { "colorIndex" : [0] } } + "chest": [{ + "name": "spacesuitchest", + "parameters": { + "colorIndex": [0] + } + } ], - "legs" : [ - { "name" : "spacesuitlegs", "parameters" : { "colorIndex" : [0] } } + "legs": [{ + "name": "spacesuitlegs", + "parameters": { + "colorIndex": [0] + } + } ] } - ] ] + ]] ] } } diff --git a/npcs/merchantpools.config.patch b/npcs/merchantpools.config.patch index a375a093..70a5540c 100644 --- a/npcs/merchantpools.config.patch +++ b/npcs/merchantpools.config.patch @@ -15,7 +15,7 @@ // ================ [{"op":"add","path":"/basicmerchant/0/1/-","value":{"item":{"name":"bandage"},"rarity":0.3}}], [{"op":"add","path":"/basicmerchant/0/1/-","value":{"item":{"name":"medkit"},"rarity":0.3}}], -[{"op":"add","path":"/basicmerchant/0/1/-","value":{"item":{"name":"sb_preservatives"},"rarity":0.3,"price":150}}], +[{"op":"add","path":"/basicmerchant/0/1/-","value":{"item":{"name":"sb_preservatives"},"rarity":0.3}}], // ================ // Bartender @@ -134,7 +134,7 @@ // Themed // ================ [{"op":"add","path":"/glowmerchant/0/1/-","value":{"item":{"name":"glowbomb"},"rarity":0.5}}], -[{"op":"add","path":"/glowmerchant/0/1/-","value":{"item":{"name":"sb_tech","parameters":{"techModule":"sb_glow"}},"rarity":1}}], +[{"op":"add","path":"/glowmerchant/0/1/-","value":{"item":{"name":"sb_tech","parameters":{"techModule":"sb_glow"}},"rarity":0.2}}], [{"op":"add","path":"/geodemerchant/0/1/-","value":{"item":{"name":"biorock"},"price":15}}], [{"op":"add","path":"/geodemerchant/0/1/-","value":{"item":{"name":"rock01-recipe"},"price":30,"rarity":0.05}}], @@ -172,6 +172,7 @@ [{"op":"add","path":"/industrialmerchant/0/1/-","value":{"item":{"name":"industrialdisplay-recipe"},"rarity":0.1}}], [{"op":"add","path":"/industrialmerchant/0/1/-","value":{"item":{"name":"industrialcomputer-recipe"},"rarity":0.1}}], [{"op":"add","path":"/industrialmerchant/0/1/-","value":{"item":{"name":"industrialcanister-recipe"},"rarity":0.1}}], +[{"op":"add","path":"/industrialmerchant/0/1/-","value":{"item":{"name":"industrialbed-recipe"},"rarity":0.1}}], // ================ @@ -247,8 +248,6 @@ [{"op":"add","path":"/humaningredients/0/1/-","value":{"item":{"name":"sb_chilistew-recipe"},"rarity":0.01}}], [{"op":"add","path":"/humaningredients/0/1/-","value":{"item":{"name":"sb_hamsandwich"},"rarity":0.05}}], [{"op":"add","path":"/humaningredients/0/1/-","value":{"item":{"name":"sb_hamsandwich-recipe"},"rarity":0.01}}], -[{"op":"add","path":"/humaningredients/0/1/-","value":{"item":{"name":"sb_soup"},"rarity":0.05}}], -[{"op":"add","path":"/humaningredients/0/1/-","value":{"item":{"name":"sb_soup-recipe"},"rarity":0.01}}], [{"op":"add","path":"/humaningredients/0/1/-","value":{"item":{"name":"sb_vendingmachine"},"rarity":0.01}}], [{"op":"add","path":"/glitchingredients/0/1/-","value":{"item":{"name":"sb_meatchunks"},"rarity":0.05}}], @@ -334,7 +333,6 @@ [{"op":"add","path":"/chefmerchant/1/1/-","value":{"item":{"name":"sb_alienburger"}}}], [{"op":"add","path":"/chefmerchant/1/1/-","value":{"item":{"name":"sb_burrito"}}}], [{"op":"add","path":"/chefmerchant/1/1/-","value":{"item":{"name":"sb_hamsandwich"}}}], -[{"op":"add","path":"/chefmerchant/1/1/-","value":{"item":{"name":"sb_soup"}}}], [{"op":"add","path":"/chefmerchant/1/1/-","value":{"item":{"name":"sb_roastcacti"}}}], @@ -632,26 +630,26 @@ {"item":{"name":"sb_coolchest","parameters":{"colorIndex":9}}},{"item":{"name":"coolchest","parameters":{"colorIndex":10}}}, {"item":{"name":"sb_coolchest","parameters":{"colorIndex":11}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":1}}}, {"item":{"name":"hoodiechest","parameters":{"colorIndex":3}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":4}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":5}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":6}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":7}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":8}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":9}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":10}}},{"item":{"name":"hoodiechest","parameters":{"colorIndex":11}}},{"item":{"name":"coollegs","parameters":{"colorIndex":1}}},{"item":{"name":"coollegs","parameters":{"colorIndex":3}}},{"item":{"name":"coollegs","parameters":{"colorIndex":4}}},{"item":{"name":"coollegs","parameters":{"colorIndex":5}}},{"item":{"name":"coollegs","parameters":{"colorIndex":6}}},{"item":{"name":"coollegs","parameters":{"colorIndex":7}}},{"item":{"name":"coollegs","parameters":{"colorIndex":8}}},{"item":{"name":"coollegs","parameters":{"colorIndex":9}}},{"item":{"name":"coollegs","parameters":{"colorIndex":10}}},{"item":{"name":"coollegs","parameters":{"colorIndex":11}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":1}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":3}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":4}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":5}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":6}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":7}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":8}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":9}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":10}}},{"item":{"name":"jeans1legs","parameters":{"colorIndex":11}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":1}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":3}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":4}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":5}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":6}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":7}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":8}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":9}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":10}}},{"item":{"name":"jeans2legs","parameters":{"colorIndex":11}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":1}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":3}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":4}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":5}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":6}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":7}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":8}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":9}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":10}}},{"item":{"name":"jeans3legs","parameters":{"colorIndex":11}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":1}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":3}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":4}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":5}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":6}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":7}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":8}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":9}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":10}}}, -{"item":{"name":"sb_sweatervestchest","parameters":{"colorIndex":11}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":1}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":3}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":4}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":5}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":6}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":7}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":8}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":9}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":10}}}, -{"item":{"name":"sb_sweatervestlegs","parameters":{"colorIndex":11}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":1}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":3}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":4}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":5}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":6}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":7}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":8}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":9}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":10}}}, +{"item":{"name":"sb_workchest","parameters":{"colorIndex":11}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":1}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":3}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":4}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":5}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":6}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":7}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":8}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":9}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":10}}}, +{"item":{"name":"sb_worklegs","parameters":{"colorIndex":11}}}, {"item":{"name":"sweatervestchest","parameters":{"colorIndex":1}}}, {"item":{"name":"sweatervestchest","parameters":{"colorIndex":3}}}, {"item":{"name":"sweatervestchest","parameters":{"colorIndex":4}}}, @@ -828,7 +826,7 @@ {"item":"sb_techmasterlegs","rarity":0.1}, {"item":"adventurerobothead","rarity":0.1}, {"item":"adventurerobotchest","rarity":0.1}, - {"item":"adventurerobotlegs","rarity":0.1}, + {"item":"adventurerobotpants","rarity":0.1}, {"item":"sb_oddhead","rarity":0.1}, {"item":"sb_conehead","rarity":0.1}, {"item":"sb_braincagehead","rarity":0.1}, diff --git a/npcs/outpost/outpostfloranfan.npctype.patch b/npcs/outpost/outpostfloranfan.npctype.patch index ab6d333b..354228a7 100644 --- a/npcs/outpost/outpostfloranfan.npctype.patch +++ b/npcs/outpost/outpostfloranfan.npctype.patch @@ -1,27 +1,4 @@ [ - [{ - "op": "test", - "path": "/scripts", - "inverse": true - }, { - "op": "add", - "path": "/scripts", - "value": ["/npcs/bmain.lua"] - } - ], - [{ - "op": "add", - "path": "/scripts/-", - "value": "/npcs/sb_outpostcivilian.lua" - } - ], - [{ - "op": "add", - "path": "/scripts/-", - "value": "/npcs/sb_outpostfloranfan.lua" - } - ], - [{ "op": "add", "path": "/scriptConfig/sb_offeredQuests", diff --git a/npcs/outpost/outpostglitchmercenary.npctype.patch b/npcs/outpost/outpostglitchmercenary.npctype.patch new file mode 100644 index 00000000..a73155b6 --- /dev/null +++ b/npcs/outpost/outpostglitchmercenary.npctype.patch @@ -0,0 +1,22 @@ +[ + [{ + "op": "test", + "path": "/scriptConfig/dialog/converse/glitch/default/0", + "value": "Apologetic. Please do not be offended if my comrade in black will not speak to you. He's not much of a talker." + }, + { + "op": "replace", + "path": "/scriptConfig/dialog/converse/glitch/default/0", + "value": "Apologetic. Please do not be offended if my comrade in black will not speak to you. They're not much of a talker." + }], + [{ + "op": "test", + "path": "/scriptConfig/dialog/converse/default/default/0", + "value": "Apologetic. Please do not be offended if my comrade in black will not speak to you. He's not much of a talker." + }, + { + "op": "replace", + "path": "/scriptConfig/dialog/converse/default/default/0", + "value": "Apologetic. Please do not be offended if my comrade in black will not speak to you. They're not much of a talker." + }] +] \ No newline at end of file diff --git a/npcs/outpost/sb_outpostfloranscholar.npctype b/npcs/outpost/sb_outpostfloranscholar.npctype index d0aafc23..d55da98c 100644 --- a/npcs/outpost/sb_outpostfloranscholar.npctype +++ b/npcs/outpost/sb_outpostfloranscholar.npctype @@ -1,11 +1,7 @@ { "type": "sb_outpostfloranscholar", "baseType": "outpostcivilian", - - "scripts": [ - "/npcs/bmain.lua", - "/npcs/sb_outpostcivilian.lua" - ], + "displayTitle": "Floran Scholar", "scriptConfig": { "sb_offeredQuests": ["sb_hylotlperformerE2part2.gearup"], diff --git a/npcs/outpost/sb_outposthylotlfloranhater.npctype b/npcs/outpost/sb_outposthylotlfloranhater.npctype index 0a6d8472..783e62fa 100644 --- a/npcs/outpost/sb_outposthylotlfloranhater.npctype +++ b/npcs/outpost/sb_outposthylotlfloranhater.npctype @@ -1,11 +1,7 @@ { "type": "sb_outposthylotlfloranhater", "baseType": "outpostcivilian", - - "scripts": [ - "/npcs/bmain.lua", - "/npcs/sb_outpostcivilian.lua" - ], + "displayTitle": "Hylotl Floran Hater", "scriptConfig": { "sb_offeredQuests": ["sb_kelpquest.gearup"], diff --git a/npcs/sb_bmain.lua b/npcs/sb_bmain.lua index f3cb064d..9c46067b 100644 --- a/npcs/sb_bmain.lua +++ b/npcs/sb_bmain.lua @@ -1,7 +1,19 @@ +local ini = init or function() end local updat = update or function() end +function init() ini() + sb_crouching = config.getParameter("sb_crouching") + --Book of Spirits check prevents us from merging the scripts we have + local booth = root.itemConfig("protectorateinfobooth").config + if booth.npcName and booth.displayTitle then + require("/npcs/bookofspirits_interact.lua") + end +end + function update(dt) updat(dt) + if sb_crouching then if self.primary and root.itemHasTag(self.primary.name, "ranged") then mcontroller.controlCrouch() end + end end \ No newline at end of file diff --git a/npcs/sb_clothesmerchant.npctype b/npcs/sb_clothesmerchant.npctype index 374e81f6..c2a14bcf 100644 --- a/npcs/sb_clothesmerchant.npctype +++ b/npcs/sb_clothesmerchant.npctype @@ -1,38 +1,37 @@ { - "type" : "sb_clothesmerchant", - "baseType" : "merchant", - - "persistent" : true, - "damageTeamType" : "friendly", + "type": "sb_clothesmerchant", + "baseType": "merchant", + "displayTitle": "Clothing Merchant", + "persistent": true, + "damageTeamType": "friendly", - "dropPools" : [ "basicTreasure" ], + "dropPools": ["basicTreasure"], - "initialScriptDelta" : 5, - "scriptConfig" : { - "questGenerator" : { - "pools" : ["common", "merchant"] + "initialScriptDelta": 5, + "scriptConfig": { + "questGenerator": { + "pools": ["common", "merchant"] }, - - "merchant" : { - "categories" : { - "default" : ["apexclothes", "avianclothes", "floranclothes", "glitchclothes", "sb_humanclothes", "hylotlclothes", "novakidclothes","sb_costumes"], - "apex" : ["apexclothes","sb_costumes"], - "avian" : ["avianclothes","sb_costumes"], - "floran" : ["floranclothes","sb_costumes"], - "glitch" : ["glitchclothes","sb_costumes"], - "human" : ["sb_humanclothes","sb_costumes"], - "hylotl" : ["hylotlclothes","sb_costumes"], - "novakid" : ["novakidclothes","sb_costumes"] + "merchant": { + "categories": { + "default": ["apexclothes", "avianclothes", "floranclothes", "glitchclothes", "sb_humanclothes", "hylotlclothes", "novakidclothes", "sb_costumes"], + "apex": ["apexclothes", "sb_costumes"], + "avian": ["avianclothes", "sb_costumes"], + "floran": ["floranclothes", "sb_costumes"], + "glitch": ["glitchclothes", "sb_costumes"], + "human": ["sb_humanclothes", "sb_costumes"], + "hylotl": ["hylotlclothes", "sb_costumes"], + "novakid": ["novakidclothes", "sb_costumes"] }, - "buyFactorRange" : [ 0.9, 1.2 ], - "sellFactorRange" : [ 0.2, 0.2 ], - "numItems" : 20, - "storeRadius" : -1, - "paneLayoutOverride" : { - "windowtitle" : { - "title" : " Clothing Merchant", - "subtitle" : " Sells cultural clothing" + "buyFactorRange": [0.9, 1.2], + "sellFactorRange": [0.2, 0.2], + "numItems": 20, + "storeRadius": -1, + "paneLayoutOverride": { + "windowtitle": { + "title": " Clothing Merchant", + "subtitle": " Sells cultural clothing" } } } diff --git a/npcs/sb_cultist.npctype b/npcs/sb_cultist.npctype index 77b290cd..88834ccc 100644 --- a/npcs/sb_cultist.npctype +++ b/npcs/sb_cultist.npctype @@ -1,7 +1,7 @@ { "type" : "sb_cultist", "baseType" : "hostile", - + "displayTitle": "Mysterious Cultist", "persistent" : true, "dropPools" : [ "sb_cultistTreasure" ], @@ -28,7 +28,7 @@ "headCosmetic" : [ { "name" : "sb_cultisthead","parameters":{"colorIndex":1} } ], "chestCosmetic" : [ { "name" : "cultistchest","parameters":{"colorIndex":1} } ], "legsCosmetic" : [ { "name" : "cultistlegs","parameters":{"colorIndex":1} } ], - "alt" : [ "redflashlight","copperore" ], + "alt" : [ "redflashlight","lead" ], "sheathedprimary" : [ "sb_uncommondagger", "sb_uncommonbroadsword" ] } ] diff --git a/npcs/sb_doctormerchant.npctype b/npcs/sb_doctormerchant.npctype index 523484f4..825c3052 100644 --- a/npcs/sb_doctormerchant.npctype +++ b/npcs/sb_doctormerchant.npctype @@ -1,7 +1,7 @@ { "type" : "sb_doctormerchant", "baseType" : "merchant", - + "displayTitle": "Doctor", "dropPools" : [ "healingItem" ], "scriptConfig" : { diff --git a/npcs/sb_merchantpools.config b/npcs/sb_merchantpools.config index ea12f154..c90858ff 100644 --- a/npcs/sb_merchantpools.config +++ b/npcs/sb_merchantpools.config @@ -32,6 +32,7 @@ {"item" : {"name" : "sb_parachutepack"}, "rarity" : 0.3}, {"item" : {"name" : "parachutepackback"}, "rarity" : 0.3}, {"item" : {"name" : "flashlight"}, "rarity" : 0.3}, + {"item" : {"name" : "broom"}, "rarity" : 0.3}, {"item" : {"name" : "sb_stoneaxe"}, "rarity" : 0.3}, {"item" : {"name" : "sb_stonehoe"}, "rarity" : 0.3} ]], @@ -54,6 +55,7 @@ {"item" : {"name" : "sb_parachutepack"}, "rarity" : 0.3}, {"item" : {"name" : "parachutepackback"}, "rarity" : 0.3}, {"item" : {"name" : "flashlight"}, "rarity" : 0.3}, + {"item" : {"name" : "broom"}, "rarity" : 0.3}, {"item" : {"name" : "sb_ironaxe"}, "rarity" : 0.3}, {"item" : {"name" : "hoe"}, "rarity" : 0.3} ]], @@ -76,6 +78,7 @@ {"item" : {"name" : "sb_parachutepack"}, "rarity" : 0.3}, {"item" : {"name" : "parachutepackback"}, "rarity" : 0.3}, {"item" : {"name" : "flashlight"}, "rarity" : 0.3}, + {"item" : {"name" : "broom"}, "rarity" : 0.3}, {"item" : {"name" : "sb_chainsaw"}, "rarity" : 0.3}, {"item" : {"name" : "hoe"}, "rarity" : 0.3} ]] diff --git a/npcs/sb_outpostcivilian.lua b/npcs/sb_outpostcivilian.lua index 2e156cb8..e7b7c906 100644 --- a/npcs/sb_outpostcivilian.lua +++ b/npcs/sb_outpostcivilian.lua @@ -1,8 +1,21 @@ local ini = init or function() end +local updat = update or function() end --We need this since NPC's with quests just stop moving for some reason --TODO: We should find the reason why (didn't we find the exact file before?) and fix it. Setting quests like this will undo other mod's quests function init() ini() + sb_npcType = npc.npcType() local quests = {config.getParameter("sb_offeredQuests"),config.getParameter("sb_turnInQuests")} if quests[1] then npc.setOfferedQuests(quests[1]) end - if quests[2] then npc.setTurnInQuests(quests[2]) end --though it'd be cool to just use [1] if [2] if a number, that'd screw over people trying to add quests + if quests[2] then npc.setTurnInQuests(quests[2]) end --though it'd be cool to just use [1] if [2] is a number, that'd screw over people trying to add quests since it wouldn't add ours +end + +function update(...) updat(...) + if sb_npcType == "outpostfloranfan" then + if world.universeFlagSet("sb_floranfan1") then + local base = npc.getItemSlot("chest") + params = base and base.parameters or {} + npc.setItemSlot("chestCosmetic",{"coolchest",1,params}) + sb_npcType = 0 + end + end end \ No newline at end of file diff --git a/npcs/sb_outpostfloranfan.lua b/npcs/sb_outpostfloranfan.lua deleted file mode 100644 index 67b75933..00000000 --- a/npcs/sb_outpostfloranfan.lua +++ /dev/null @@ -1,9 +0,0 @@ -local updat = update or function() end - -function update(...) updat(...) - if world.universeFlagSet("sb_floranfan1") then - local base = npc.getItemSlot("chest") - params = base and base.parameters or {} - npc.setItemSlot("chestCosmetic",{"coolchest",1,params}) - end -end \ No newline at end of file diff --git a/npcs/sb_stimmerchant.npctype b/npcs/sb_stimmerchant.npctype index 9f9149aa..6d36f910 100644 --- a/npcs/sb_stimmerchant.npctype +++ b/npcs/sb_stimmerchant.npctype @@ -1,41 +1,41 @@ { - "type" : "sb_stimmerchant", - "baseType" : "merchant", + "type": "sb_stimmerchant", + "baseType": "merchant", + "displayTitle": "Stim Pack Merchant", + "dropPools": ["wizardtreasure"], //this, too. see doc spawner as to why don't worry about exploits - "dropPools" : [ "wizardtreasure" ], //this, too. see doc spawner as to why don't worry about exploits - - "scriptConfig" : { - "questGenerator" : { - "pools" : ["common"] + "scriptConfig": { + "questGenerator": { + "pools": ["common"] }, - "merchant" : { - "poolsFile" : "/npcs/sb_merchantpools.config", - "categories" : { - "override": [ "sb_stimmerchant" ] + "merchant": { + "poolsFile": "/npcs/sb_merchantpools.config", + "categories": { + "override": ["sb_stimmerchant"] }, - "buyFactorRange" : [ 1.0, 1.0 ], - "sellFactorRange" : [ 0.2, 0.2 ], - "numItems" : 5, - "storeRadius" : -1, - "paneLayoutOverride" : { - "windowtitle" : { - "title" : " Stim Merchant", - "subtitle" : " Sells powerful medicine" + "buyFactorRange": [1.0, 1.0], + "sellFactorRange": [0.2, 0.2], + "numItems": 5, + "storeRadius": -1, + "paneLayoutOverride": { + "windowtitle": { + "title": " Stim Merchant", + "subtitle": " Sells powerful medicine" } } }, - "dialog" : { - "merchant" : { - "start" : { - "default" : { - "default" : [ + "dialog": { + "merchant": { + "start": { + "default": { + "default": [ "Need a little pick-me-up?" ] }, - "apex" : { - "default" : [ + "apex": { + "default": [ "Stay on top of things with my patented stims!", "Never fall to the Miniknog again with these handy stims!", "I've sold stims to Big Ape himself.", @@ -43,8 +43,8 @@ "Be strong like an ape!" ] }, - "avian" : { - "default" : [ + "avian": { + "default": [ "Need a little pick-me-up?", "Fly without wings, with my helpful stims!", "Become as one with Kluex with my handy stims.", @@ -52,8 +52,8 @@ "One hundred percent legal stims... I left the paperwork on my ship." ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Floran sssell ssstabby medicine!", "Greenfinger say Floran ssstims volatile. Volatile mean sssafe.", "Floran ssstims best ssstims! Make feel ssstabby!", @@ -61,8 +61,8 @@ "Hope person like Floran ssstims. Floran like Floran ssstims." ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Statement. Stims for sale.", "Twitchy. Stims, lots of stims, buy the stims, quickly.", "Elusive. Mysterious stims, I have them.", @@ -70,8 +70,8 @@ "Ecstatic. Buy my stims, join me in joy!" ] }, - "human" : { - "default" : [ + "human": { + "default": [ "Good evening. Some stims, perhaps?", "Perchance you will test out some of my more experimental stims one day.", "Soon, my shipment of snake oil will arrive. For now, I have stims.", @@ -79,8 +79,8 @@ "Stims! For your every need." ] }, - "hylotl" : { - "default" : [ + "hylotl": { + "default": [ "Hylotl stims are unrivalled. Buy some.", "Improve yourself the Hylotl way. With stims!", "If you need a buff, I've got just the thing.", @@ -89,49 +89,49 @@ ] } }, - "end" : { - "default" : { - "default" : [ + "end": { + "default": { + "default": [ "Just to be clear; I'm not responsible for any side-effects!" ] }, - "apex" : { - "default" : [ + "apex": { + "default": [ "No refunds!", "Sorry in advance!", "Don't take too many!" ] }, - "avian" : { - "default" : [ + "avian": { + "default": [ "Kluex save you.", "Kluex has no faith in medicine.", "Fly long, fly free!" ] }, - "floran" : { - "default" : [ + "floran": { + "default": [ "Floran hope you not die too much!", "Floran sssee you sssoon. Real sssoon.", "Floran hope you want more ssstims!" ] }, - "glitch" : { - "default" : [ + "glitch": { + "default": [ "Statement. Stims are not proven to be addictive.", "Evasive. Of course there are no side effects.", "Concern. Remember to talk to a doctor regularly." ] }, - "human" : { - "default" : [ + "human": { + "default": [ "Side effects? All part of the fun!", "They're perfectly safe, I've been taking them for years.", "Come back soon! You can never have too many stims! Don't hold me to that!" ] }, - "hylotl" : { - "default" : [ + "hylotl": { + "default": [ "Hylotl stims have no reported side effects.", "Return to me soon.", "May calm wash over you like an ocean." @@ -142,19 +142,18 @@ } }, - "items" : { - "override" : [ - [0, [ - { - "chest" : [ "scientistchest" ], - "legs" : [ "scientistlegs" ], - "head" : [ "sunglasses1head" ], - "back" : [ "medicback" ], - "sheathedprimary" : [ + "items": { + "override": [ + [0, [{ + "chest": ["scientistchest"], + "legs": ["scientistlegs"], + "head": ["sunglasses1head"], + "back": ["medicback"], + "sheathedprimary": [ "sb_uncommonplasmashotgun" ] } - ] ] + ]] ] } } diff --git a/npcs/sb_toolmerchant.npctype b/npcs/sb_toolmerchant.npctype index 34a4f9de..8743eb00 100644 --- a/npcs/sb_toolmerchant.npctype +++ b/npcs/sb_toolmerchant.npctype @@ -1,7 +1,7 @@ { "type" : "sb_toolmerchant", "baseType" : "merchant", - + "displayTitle": "Tool Merchant", "dropPools" : ["diggingTool"], "scriptConfig" : { diff --git a/npcs/tenants/sb_friendlyminer.npctype b/npcs/tenants/sb_friendlyminer.npctype index 8378f15d..062f889c 100644 --- a/npcs/tenants/sb_friendlyminer.npctype +++ b/npcs/tenants/sb_friendlyminer.npctype @@ -1,89 +1,124 @@ { - "type" : "sb_friendlyminer", - "baseType" : "generictenant", - + "type": "sb_friendlyminer", + "baseType": "generictenant", + "displayTitle": "Miner", - "scriptConfig" : { - "dialog" : { - "tenant" : { - "arrivedHome" : { - "rent" : "/dialog/sb_friendlyminer.config:rent" + "scriptConfig": { + "dialog": { + "tenant": { + "arrivedHome": { + "rent": "/dialog/sb_friendlyminer.config:rent" } }, - "converse" : "/dialog/sb_friendlyminer.config:converse" + "converse": "/dialog/sb_friendlyminer.config:converse" } }, - "items" : { - "human" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["humantier1chest",1,{"colorIndex":5}]], - "legs" : [["humantier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "items": { + "human": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["humantier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["humantier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ], - "apex" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["apextier1chest",1,{"colorIndex":5}]], - "legs" : [["apextier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "apex": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["apextier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["apextier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ], - "avian" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["aviantier1chest",1,{"colorIndex":5}]], - "legs" : [["aviantier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "avian": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["aviantier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["aviantier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ], - "floran" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["florantier1chest",1,{"colorIndex":5}]], - "legs" : [["florantier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "floran": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["florantier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["florantier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ], - "hylotl" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["hylotltier1chest",1,{"colorIndex":5}]], - "legs" : [["hylotltier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "hylotl": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["hylotltier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["hylotltier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ], - "glitch" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["glitchtier1chest",1,{"colorIndex":5}]], - "legs" : [["glitchtier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "glitch": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["glitchtier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["glitchtier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ], - "novakid" : [ - [0, [ - { - "head" : ["devhead","mininghathead"], - "chest" : [["novatier1chest",1,{"colorIndex":5}]], - "legs" : [["novatier1pants",1,{"colorIndex":5}]], - "primary" : ["sb_stonepickaxe","pickaxe","copperpickaxe"] + "novakid": [ + [0, [{ + "head": ["devhead", "mininghathead"], + "chest": [["novatier1chest", 1, { + "colorIndex": 5 + } + ]], + "legs": [["novatier1pants", 1, { + "colorIndex": 5 + } + ]], + "primary": ["sb_stonepickaxe", "pickaxe", "copperpickaxe"] } - ] ] + ]] ] } -} \ No newline at end of file +} diff --git a/objects/actionfigure/sb_chesttrapper/medievalchestAF.object b/objects/actionfigure/sb_chesttrapper/medievalchestAF.object index feb847f6..46daaea4 100644 --- a/objects/actionfigure/sb_chesttrapper/medievalchestAF.object +++ b/objects/actionfigure/sb_chesttrapper/medievalchestAF.object @@ -1,22 +1,21 @@ { - "objectName" : "sb_medievalchesttrapperaf", - "colonyTags" : ["pretty"], - "rarity" : "Legendary", - "tooltipKind" : "sb_object", - "category" : "actionFigure", -// "collectablesOnPickup" : { "actionfigures" : "sb_serpentdroidaf" }, - "price" : 5000, - "printable" : false, - "description" : "todo", - "shortdescription" : "Chest Trapper Figurine", + "objectName": "sb_medievalchesttrapperaf", + "colonyTags": ["pretty"], + "rarity": "Legendary", + "tooltipKind": "sb_object", + "category": "actionFigure", + // "collectablesOnPickup" : { "actionfigures" : "sb_serpentdroidaf" }, + "price": 5000, + "printable": false, + "description": "todo", + "shortdescription": "Chest Trapper Figurine", - "inventoryIcon" : "medievalchestAF.png", - "orientations" : [ - { - "dualImage" : "medievalchestAF.png", - "imagePosition" : [-2, 0], - "spaces" : [[0,0],[0,0],[0,0],[0,0]], - "anchors" : ["bottom"] + "inventoryIcon": "medievalchestAF.png", + "orientations": [{ + "dualImage": "medievalchestAF.png", + "imagePosition": [-2, 0], + "spaces": [[0, 0], [0, 0], [0, 0], [0, 0]], + "anchors": ["bottom"] } ] -} \ No newline at end of file +} diff --git a/objects/actionfigure/sb_chesttrapper/medievalchestAF.png b/objects/actionfigure/sb_chesttrapper/medievalchestAF.png index 48b0aa35..38dcf0a7 100644 Binary files a/objects/actionfigure/sb_chesttrapper/medievalchestAF.png and b/objects/actionfigure/sb_chesttrapper/medievalchestAF.png differ diff --git a/objects/actionfigure/sb_chesttrapper/royalchestAF.png b/objects/actionfigure/sb_chesttrapper/royalchestAF.png index 47ed70a4..c47cc6e0 100644 Binary files a/objects/actionfigure/sb_chesttrapper/royalchestAF.png and b/objects/actionfigure/sb_chesttrapper/royalchestAF.png differ diff --git a/objects/actionfigure/sb_envprobe/envprobeAF.png b/objects/actionfigure/sb_envprobe/envprobeAF.png index 84d6ecba..371cf3be 100644 Binary files a/objects/actionfigure/sb_envprobe/envprobeAF.png and b/objects/actionfigure/sb_envprobe/envprobeAF.png differ diff --git a/objects/actionfigure/sb_fatalcircuit/fatalcircuitAF.png b/objects/actionfigure/sb_fatalcircuit/fatalcircuitAF.png index 11788874..e25ebc30 100644 Binary files a/objects/actionfigure/sb_fatalcircuit/fatalcircuitAF.png and b/objects/actionfigure/sb_fatalcircuit/fatalcircuitAF.png differ diff --git a/objects/actionfigure/sb_heckblob/heckblobAF.png b/objects/actionfigure/sb_heckblob/heckblobAF.png index 8a3740f5..3767a783 100644 Binary files a/objects/actionfigure/sb_heckblob/heckblobAF.png and b/objects/actionfigure/sb_heckblob/heckblobAF.png differ diff --git a/objects/actionfigure/sb_jelly/jellyAF.png b/objects/actionfigure/sb_jelly/jellyAF.png index 044e28f2..5d05ae63 100644 Binary files a/objects/actionfigure/sb_jelly/jellyAF.png and b/objects/actionfigure/sb_jelly/jellyAF.png differ diff --git a/objects/actionfigure/sb_repairbot/repairbotAF.png b/objects/actionfigure/sb_repairbot/repairbotAF.png index 03d09ce2..434db1e5 100644 Binary files a/objects/actionfigure/sb_repairbot/repairbotAF.png and b/objects/actionfigure/sb_repairbot/repairbotAF.png differ diff --git a/objects/actionfigure/sb_serpentdroid/serpentdroidAF.png b/objects/actionfigure/sb_serpentdroid/serpentdroidAF.png index 49655b4d..2b9f4148 100644 Binary files a/objects/actionfigure/sb_serpentdroid/serpentdroidAF.png and b/objects/actionfigure/sb_serpentdroid/serpentdroidAF.png differ diff --git a/objects/ancient/ancientconsole/sb_ancientconsole.lua b/objects/ancient/ancientconsole/sb_ancientconsole.lua index 11134112..96223342 100644 --- a/objects/ancient/ancientconsole/sb_ancientconsole.lua +++ b/objects/ancient/ancientconsole/sb_ancientconsole.lua @@ -5,17 +5,17 @@ local updat = update or function() end function init() ini() sb_knownPlayers = {} + sb_radioMessage = config.getParameter("sb_radioMessage") end function update(dt) updat(dt) if not self.isOutpostGate then local players = world.players() - local radioMessage = config.getParameter("sb_radioMessage") if #players > 0 then for i = 1, #players do - if not sb_knownPlayers[players[i]] then - world.sendEntityMessage(players[i],"queueRadioMessage",radioMessage) - sb_knownPlayers[players[i]] = true + if not sb_knownPlayers[players[i]] then + world.sendEntityMessage(players[i], "queueRadioMessage", sb_radioMessage) + sb_knownPlayers[players[i]] = true end end end diff --git a/objects/ancient/ancientsmallconsole/ancientsmallconsole.object.patch b/objects/ancient/ancientsmallconsole/ancientsmallconsole.object.patch deleted file mode 100644 index 909915d5..00000000 --- a/objects/ancient/ancientsmallconsole/ancientsmallconsole.object.patch +++ /dev/null @@ -1,4 +0,0 @@ -[ -[{"op":"test","path":"/humanDescription","value":"A console made to stand the test of time"}, -{"op":"replace","path":"/humanDescription","value":"A console made to stand the test of time."}] -] \ No newline at end of file diff --git a/objects/ancient/essencechest/sb_ancientbigchest.object b/objects/ancient/essencechest/sb_ancientbigchest.object index 41ad592b..720938a7 100644 --- a/objects/ancient/essencechest/sb_ancientbigchest.object +++ b/objects/ancient/essencechest/sb_ancientbigchest.object @@ -1,56 +1,68 @@ { - "objectName" : "sb_ancientbigchest", - "colonyTags" : ["ancient","storage"], - "printable" : false, - "rarity" : "legendary", - "objectType" : "container", - "tooltipKind" : "sb_container", - "builder" : "/items/buildscripts/starbound/buildcontainer.lua", - "scripts" : ["/scripts/sb_container.lua"], - "category" : "storage", - "price" : 70, - "description" : "A fearsome ancient chest ornamented with a lidless eye.", - "shortdescription" : "Big Ancient Chest", - "race" : "ancient", - "health" : 1.5, - - "apexDescription" : "This chest looks very old and creepy.", - "avianDescription" : "This chest looks very old and creepy.", - "floranDescription" : "Ssscary chessst makes Floran nervousss.", - "glitchDescription" : "Unsettled. The eye adorning this chest seems to be judging me.", - "humanDescription" : "A creepy old chest. Dare I open it?", - "hylotlDescription" : "I was taught to be wary of mysterious chests.", - "novakidDescription" : "I don't care much for the way this chest is lookin' at me.", - - "inventoryIcon" : "icon.png", - - "orientations" : [ - { - "imageLayers" : [ { "image" : "essencechest.png:.", "fullbright" : true }, { "image" : "essencechestlit.png:." } ], - "imagePosition" : [-16, 0], - - "direction" : "left", - "flipImages" : true, - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - }, - { - "imageLayers" : [ { "image" : "essencechest.png:.", "fullbright" : true }, { "image" : "essencechestlit.png:." } ], - "imagePosition" : [-16, 0], - - "direction" : "right", - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + "objectName": "sb_ancientbigchest", + "colonyTags": ["ancient", "storage"], + "printable": false, + "rarity": "legendary", + "objectType": "container", + "tooltipKind": "sb_container", + "builder": "/items/buildscripts/starbound/buildcontainer.lua", + "scripts": ["/scripts/sb_container.lua"], + "category": "storage", + "price": 70, + "description": "A fearsome ancient chest ornamented with a lidless eye.", + "shortdescription": "Big Ancient Chest", + "race": "ancient", + "health": 1.5, + + "apexDescription": "This chest looks very old and creepy.", + "avianDescription": "This chest looks very old and creepy.", + "floranDescription": "Ssscary chessst makes Floran nervousss.", + "glitchDescription": "Unsettled. The eye adorning this chest seems to be judging me.", + "humanDescription": "A creepy old chest. Dare I open it?", + "hylotlDescription": "I was taught to be wary of mysterious chests.", + "novakidDescription": "I don't care much for the way this chest is lookin' at me.", + + "inventoryIcon": "icon.png", + + "orientations": [{ + "imageLayers": [{ + "image": "essencechest.png:.", + "fullbright": true + }, { + "image": "essencechestlit.png:." + } + ], + "imagePosition": [-16, 0], + + "direction": "left", + "flipImages": true, + + "spaceScan": 0.1, + "anchors": ["bottom"] + }, { + "imageLayers": [{ + "image": "essencechest.png:.", + "fullbright": true + }, { + "image": "essencechestlit.png:." + } + ], + "imagePosition": [-16, 0], + + "direction": "right", + + "spaceScan": 0.1, + "anchors": ["bottom"] } ], - "openSounds" : [ "/sfx/objects/chest_small_open.ogg" ], - "closeSounds" : [ "/sfx/objects/chest_small_close.ogg" ], - "slotCount" : 24, - "tooltipFields":{"slotCountLabel":"Holds 24 Items"}, - "uiConfig" : "/interface/sb_chests/chest.config", - "frameCooldown" : 5, - "autoCloseCooldown" : 3600 -} \ No newline at end of file + "openSounds": ["/sfx/objects/chest_small_open.ogg"], + "closeSounds": ["/sfx/objects/chest_small_close.ogg"], + "slotCount": 24, + "tooltipFields": { + "slotCountLabel": "Holds 24 Items" + }, + "uiConfig": "/interface/sb_chests/chest.config", + "frameCooldown": 5, + "autoCloseCooldown": 3600 +} diff --git a/objects/ancientvault/largefloorspike/largefloorspike.object.patch b/objects/ancientvault/largefloorspike/largefloorspike.object.patch deleted file mode 100644 index 3044900e..00000000 --- a/objects/ancientvault/largefloorspike/largefloorspike.object.patch +++ /dev/null @@ -1,6 +0,0 @@ -[ -[{"op":"test","path":"/description","value":"It's a spike"}, -{"op":"replace","path":"/description","value":"It's a spike."}], -[{"op":"test","path":"/glitchDescription","inverse":true}, -{"op":"add","path":"/glitchDescription","value":"Statement. A spike."}] -] \ No newline at end of file diff --git a/objects/ancientvault/smallfloorspike/smallfloorspike.object.patch b/objects/ancientvault/smallfloorspike/smallfloorspike.object.patch deleted file mode 100644 index 3044900e..00000000 --- a/objects/ancientvault/smallfloorspike/smallfloorspike.object.patch +++ /dev/null @@ -1,6 +0,0 @@ -[ -[{"op":"test","path":"/description","value":"It's a spike"}, -{"op":"replace","path":"/description","value":"It's a spike."}], -[{"op":"test","path":"/glitchDescription","inverse":true}, -{"op":"add","path":"/glitchDescription","value":"Statement. A spike."}] -] \ No newline at end of file diff --git a/objects/ancientvault/weaponupgradeanvil/weaponupgradeanvil.object.patch b/objects/ancientvault/weaponupgradeanvil/weaponupgradeanvil.object.patch deleted file mode 100644 index da1adb04..00000000 --- a/objects/ancientvault/weaponupgradeanvil/weaponupgradeanvil.object.patch +++ /dev/null @@ -1,4 +0,0 @@ -[ -[{"op":"test","path":"/humanDescription","value":"A anvil made to stand the test of time"}, -{"op":"replace","path":"/humanDescription","value":"An anvil made to stand the test of time."}] -] \ No newline at end of file diff --git a/objects/apex/apexcooldoor/sb_apexcooldoor.frames b/objects/apex/apexcooldoor/sb_apexcooldoor.frames index 65be4454..72096b23 100644 --- a/objects/apex/apexcooldoor/sb_apexcooldoor.frames +++ b/objects/apex/apexcooldoor/sb_apexcooldoor.frames @@ -1,22 +1,22 @@ { - "frameGrid" : { - "size" : [40, 16], - "dimensions" : [3, 1], - "names" : [ - [ "closed", "halfLeft", "left" ] + "frameGrid": { + "size": [40, 16], + "dimensions": [3, 1], + "names": [ + ["closed", "halfLeft", "left"] ] }, - "aliases" : { - "default" : "closed", - "closeLeft.1" : "halfLeft", - "closeLeft.2" : "closed", - "closeRight.1" : "halfLeft", - "closeRight.2" : "closed", - "openLeft.1" : "halfLeft", - "openLeft.2" : "left", - "openRight.1" : "halfLeft", - "openRight.2" : "left" + "aliases": { + "default": "closed", + "closeLeft.1": "halfLeft", + "closeLeft.2": "closed", + "closeRight.1": "halfLeft", + "closeRight.2": "closed", + "openLeft.1": "halfLeft", + "openLeft.2": "left", + "openRight.1": "halfLeft", + "openRight.2": "left" } } diff --git a/objects/apex/apexcooldoor/sb_apexcooldoor.png b/objects/apex/apexcooldoor/sb_apexcooldoor.png index 074c24bb..62a15460 100644 Binary files a/objects/apex/apexcooldoor/sb_apexcooldoor.png and b/objects/apex/apexcooldoor/sb_apexcooldoor.png differ diff --git a/objects/apex/apexcooldoor/sb_apexcooldooricon.png b/objects/apex/apexcooldoor/sb_apexcooldooricon.png index baf6cf25..dfb24876 100644 Binary files a/objects/apex/apexcooldoor/sb_apexcooldooricon.png and b/objects/apex/apexcooldoor/sb_apexcooldooricon.png differ diff --git a/objects/apex/apexcooldoor/sb_apexcoolverticaldoor.object b/objects/apex/apexcooldoor/sb_apexcoolverticaldoor.object index 35c96146..00d9ba63 100644 --- a/objects/apex/apexcooldoor/sb_apexcoolverticaldoor.object +++ b/objects/apex/apexcooldoor/sb_apexcoolverticaldoor.object @@ -1,72 +1,70 @@ { - "objectName" : "sb_apexcoolverticaldoor", - "colonyTags" : ["apex","apexresearchlab","door"], - "rarity" : "Common", - "tooltipKind" : "sb_object", - "category" : "door", - "price" : 125, - "description" : "This hatch is made of some sort of bulletproof material.", - "shortdescription" : "Security Hatch", - "race" : "apex", + "objectName": "sb_apexcoolverticaldoor", + "colonyTags": ["apex", "apexresearchlab", "door"], + "rarity": "Common", + "tooltipKind": "sb_object", + "category": "door", + "price": 125, + "description": "This hatch is made of some sort of bulletproof material.", + "shortdescription": "Security Hatch", + "race": "apex", - "apexDescription" : "This door looks strong enough to keep anything out... or everyone in.", - "avianDescription" : "A strong hatch. Not even the breeze could slip through.", - "floranDescription" : "Door of great ssstrength.", - "glitchDescription" : "Jealous. Such strong materials.", - "humanDescription" : "A huge, heavy security hatch.", - "hylotlDescription" : "This looks strong enough to hold back the ocean.", - "novakidDescription" : "A very thick hatch.", + "apexDescription": "This door looks strong enough to keep anything out... or everyone in.", + "avianDescription": "A strong hatch. Not even the breeze could slip through.", + "floranDescription": "Door of great ssstrength.", + "glitchDescription": "Jealous. Such strong materials.", + "humanDescription": "A huge, heavy security hatch.", + "hylotlDescription": "This looks strong enough to hold back the ocean.", + "novakidDescription": "A very thick hatch.", - "inventoryIcon" : "sb_apexcooldooricon.png", - "orientations" : [ - { - "image" : "sb_apexcooldoor.png:default", - "imagePosition" : [-16, -8], - "renderLayer" : "Object+5", - "spaceScan" : 0.1, - "spaces" : [ - [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], - [-2, -1], [-1, -1], [0, -1], [1, -1], [2, -1] + "inventoryIcon": "sb_apexcooldooricon.png", + "orientations": [{ + "image": "sb_apexcooldoor.png:default", + "imagePosition": [-16, -8], + "renderLayer": "Object+5", + "spaceScan": 0.1, + "spaces": [ + [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], + [-2, -1], [-1, -1], [0, -1], [1, -1], [2, -1] ], - "anchors" : [ "left", "right" ], - "direction" : "left" - }, - { - "image" : "sb_apexcooldoor.png:default", - "flipImages" : true, - "imagePosition" : [-16, -8], - "renderLayer" : "Object+5", - "spaceScan" : 0.1, - "spaces" : [ - [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], - [-2, -1], [-1, -1], [0, -1], [1, -1], [2, -1] + "anchors": ["left", "right"], + "direction": "left" + }, { + "image": "sb_apexcooldoor.png:default", + "flipImages": true, + "imagePosition": [-16, -8], + "renderLayer": "Object+5", + "spaceScan": 0.1, + "spaces": [ + [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], + [-2, -1], [-1, -1], [0, -1], [1, -1], [2, -1] ], - "anchors" : [ "left", "right" ], - "direction" : "right" + "anchors": ["left", "right"], + "direction": "right" } ], - "scripts" : [ "/objects/wired/door/door.lua" ], - "scriptDelta" : 5, + "scripts": ["/objects/wired/door/door.lua"], + "scriptDelta": 5, - "animation" : "/objects/wired/door/door.animation", - "animationCustom" : { - "sounds" : { - "open" : { - "pool" : [ "/sfx/objects/apexcooldoor_open.ogg" ], - "rangeMultiplier" : 0.5 + "animation": "/objects/wired/door/door.animation", + "animationCustom": { + "sounds": { + "open": { + "pool": ["/sfx/objects/apexcooldoor_open.ogg"], + "rangeMultiplier": 0.5 }, - "close" : { - "pool" : [ "/sfx/objects/apexcooldoor_close.ogg" ], - "rangeMultiplier" : 0.5 + "close": { + "pool": ["/sfx/objects/apexcooldoor_close.ogg"], + "rangeMultiplier": 0.5 } } }, - "animationParts" : { - "door" : "sb_apexcooldoor.png" + "animationParts": { + "door": "sb_apexcooldoor.png" }, - "animationPosition" : [-16, -8], + "animationPosition": [-16, -8], - "inputNodes" : [ [-2, 0] ], - "outputNodes" : [ [2, -1] ] + "inputNodes": [[-2, 0]], + "outputNodes": [[2, -1]] } diff --git a/objects/apex/apexoven/apexovenicon.png b/objects/apex/apexoven/apexovenicon.png new file mode 100644 index 00000000..cc34ca38 Binary files /dev/null and b/objects/apex/apexoven/apexovenicon.png differ diff --git a/objects/apex/apexpainting3/apexpainting3icon.png b/objects/apex/apexpainting3/apexpainting3icon.png index c72400ea..98481e10 100644 Binary files a/objects/apex/apexpainting3/apexpainting3icon.png and b/objects/apex/apexpainting3/apexpainting3icon.png differ diff --git a/objects/apex/classicapestatuenohead/classicapestatuenohead.object.patch b/objects/apex/classicapestatuenohead/classicapestatuenohead.object.patch deleted file mode 100644 index a80b5c9c..00000000 --- a/objects/apex/classicapestatuenohead/classicapestatuenohead.object.patch +++ /dev/null @@ -1,4 +0,0 @@ -[ -[{"op":"test","path":"/description","value":"Big ape statue with no head."}, -{"op":"replace","path":"/description","value":"A Big Ape statue with no head."}] -] \ No newline at end of file diff --git a/objects/apex/sb_apexcoolcounter/apexcoolcounter.png b/objects/apex/sb_apexcoolcounter/apexcoolcounter.png index 6fd5ed5f..37049c6a 100644 Binary files a/objects/apex/sb_apexcoolcounter/apexcoolcounter.png and b/objects/apex/sb_apexcoolcounter/apexcoolcounter.png differ diff --git a/objects/apex/sb_apexcoolcounter/icon.png b/objects/apex/sb_apexcoolcounter/icon.png index 0ad9911c..00084eb2 100644 Binary files a/objects/apex/sb_apexcoolcounter/icon.png and b/objects/apex/sb_apexcoolcounter/icon.png differ diff --git a/objects/apex/sb_apexsecuritylamp/apexsecuritylamp.png b/objects/apex/sb_apexsecuritylamp/apexsecuritylamp.png index 6f92265c..75ab78d4 100644 Binary files a/objects/apex/sb_apexsecuritylamp/apexsecuritylamp.png and b/objects/apex/sb_apexsecuritylamp/apexsecuritylamp.png differ diff --git a/objects/apex/sb_apexsecuritylamp/apexsecuritylamplit.png b/objects/apex/sb_apexsecuritylamp/apexsecuritylamplit.png index 2f9bd941..9d145a54 100644 Binary files a/objects/apex/sb_apexsecuritylamp/apexsecuritylamplit.png and b/objects/apex/sb_apexsecuritylamp/apexsecuritylamplit.png differ diff --git a/objects/apex/sb_apexstandingtv/apexstandingtv.png b/objects/apex/sb_apexstandingtv/apexstandingtv.png index d57af153..921bb51b 100644 Binary files a/objects/apex/sb_apexstandingtv/apexstandingtv.png and b/objects/apex/sb_apexstandingtv/apexstandingtv.png differ diff --git a/objects/apex/sb_apexstandingtv/apexstandingtvlit.png b/objects/apex/sb_apexstandingtv/apexstandingtvlit.png index 29ade161..beb8169b 100644 Binary files a/objects/apex/sb_apexstandingtv/apexstandingtvlit.png and b/objects/apex/sb_apexstandingtv/apexstandingtvlit.png differ diff --git a/objects/apex/sb_apexstreetlamp/apexstreetlamplit.png b/objects/apex/sb_apexstreetlamp/apexstreetlamplit.png index 3275cb9a..d440c9da 100644 Binary files a/objects/apex/sb_apexstreetlamp/apexstreetlamplit.png and b/objects/apex/sb_apexstreetlamp/apexstreetlamplit.png differ diff --git a/objects/apex/sb_pipes/pipe1icon.png b/objects/apex/sb_pipes/pipe1icon.png index 8308b63c..d60ddf0b 100644 Binary files a/objects/apex/sb_pipes/pipe1icon.png and b/objects/apex/sb_pipes/pipe1icon.png differ diff --git a/objects/apex/sb_pipes/pipe2icon.png b/objects/apex/sb_pipes/pipe2icon.png index b4025929..4a656706 100644 Binary files a/objects/apex/sb_pipes/pipe2icon.png and b/objects/apex/sb_pipes/pipe2icon.png differ diff --git a/objects/apex/sb_pipes/pipe3icon.png b/objects/apex/sb_pipes/pipe3icon.png index ec5445c9..5f94d3e9 100644 Binary files a/objects/apex/sb_pipes/pipe3icon.png and b/objects/apex/sb_pipes/pipe3icon.png differ diff --git a/objects/apex/sb_pipes/pipe4icon.png b/objects/apex/sb_pipes/pipe4icon.png index f096d536..7e05a714 100644 Binary files a/objects/apex/sb_pipes/pipe4icon.png and b/objects/apex/sb_pipes/pipe4icon.png differ diff --git a/objects/apex/sb_pipes/pipe5icon.png b/objects/apex/sb_pipes/pipe5icon.png index 6c58bfba..608038af 100644 Binary files a/objects/apex/sb_pipes/pipe5icon.png and b/objects/apex/sb_pipes/pipe5icon.png differ diff --git a/objects/apex/sb_pipes/pipes1.png b/objects/apex/sb_pipes/pipes1.png index 17c4f165..421e900d 100644 Binary files a/objects/apex/sb_pipes/pipes1.png and b/objects/apex/sb_pipes/pipes1.png differ diff --git a/objects/apex/sb_pipes/pipes2.png b/objects/apex/sb_pipes/pipes2.png index da5e7c48..e6b62a66 100644 Binary files a/objects/apex/sb_pipes/pipes2.png and b/objects/apex/sb_pipes/pipes2.png differ diff --git a/objects/apex/sb_pipes/pipes3.png b/objects/apex/sb_pipes/pipes3.png index 9d7010f8..c767c10d 100644 Binary files a/objects/apex/sb_pipes/pipes3.png and b/objects/apex/sb_pipes/pipes3.png differ diff --git a/objects/apex/sb_pipes/pipes4.png b/objects/apex/sb_pipes/pipes4.png index 0d01858f..035ac34e 100644 Binary files a/objects/apex/sb_pipes/pipes4.png and b/objects/apex/sb_pipes/pipes4.png differ diff --git a/objects/apex/sb_pipes/pipes5.png b/objects/apex/sb_pipes/pipes5.png index 3953b010..749a8870 100644 Binary files a/objects/apex/sb_pipes/pipes5.png and b/objects/apex/sb_pipes/pipes5.png differ diff --git a/objects/arttrophies/sb_paintingesther/icon.png b/objects/arttrophies/sb_paintingesther/icon.png deleted file mode 100644 index ebee48bf..00000000 Binary files a/objects/arttrophies/sb_paintingesther/icon.png and /dev/null differ diff --git a/objects/arttrophies/sb_paintingesther/paintingesther.animation b/objects/arttrophies/sb_paintingesther/paintingesther.animation deleted file mode 100644 index 30fb5b52..00000000 --- a/objects/arttrophies/sb_paintingesther/paintingesther.animation +++ /dev/null @@ -1,49 +0,0 @@ -{ - "animatedParts": { - "stateTypes": { - "painting": { - "default": "off", - "states": { - "blink": { - "frames": 2, - "cycle": 1 - }, - "off": { - "frames": 1 - }, - "on": { - "frames": 2, - "cycle": 0.15, - "mode": "loop" - } - } - } - }, - "parts": { - "painting": { - "properties": { - "centered": false - }, - "partStates": { - "painting": { - "blink": { - "properties": { - "image": "/interface/chatbubbles/sb_esther.png:sb_estherBlink." - } - }, - "off": { - "properties": { - "image": "/interface/chatbubbles/sb_esther.png:idle" - } - }, - "on": { - "properties": { - "image": "/interface/chatbubbles/sb_esther.png:sb_estherTalk." - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/objects/arttrophies/sb_paintingesther/paintingesther.lua b/objects/arttrophies/sb_paintingesther/paintingesther.lua deleted file mode 100644 index 72cc94db..00000000 --- a/objects/arttrophies/sb_paintingesther/paintingesther.lua +++ /dev/null @@ -1,22 +0,0 @@ -function init() - updateActive() - canBlink = true --not object.getInputNodeLevel(0) or true - taunts = config.getParameter("chatOptions",{""}) -end - -function onInputNodeChange() updateActive() end -function onNodeConnectionChange() updateActive() end - -function updateActive() - local active = object.getInputNodeLevel(0) - animator.setAnimationState("painting", active and "on" or "off") - canBlink = not active --- script.setUpdateDelta(active and 0 or 60) -end - -function update(dt) - if not canBlink then object.say(taunts[math.random(#taunts)]) end - if canBlink and (math.random(666) > 66) and (math.random(666) < 66) then - animator.setAnimationState("painting","blink") - end -end \ No newline at end of file diff --git a/objects/arttrophies/sb_paintingesther/paintingesther.object b/objects/arttrophies/sb_paintingesther/paintingesther.object deleted file mode 100644 index 6b33a964..00000000 --- a/objects/arttrophies/sb_paintingesther/paintingesther.object +++ /dev/null @@ -1,53 +0,0 @@ -{ - "objectName" : "sb_paintingesther", - "colonyTags" : ["human","wired","horror","valuable"], - "rarity" : "Rare", - "tooltipKind" : "sb_object", - "description" : "An old portrait of Esther Bright, former Grand Protector.", - "shortdescription" : "Esther Painting", - "race" : "human", - "category" : "decorative", - "price" : 700, - "printable" : false, - - "chatOptions" : [ - "I'm always watching you, dear.", - "I'm here whenever you need me, dear. Especially if you'd like a mint humbug.", - "Hmmm, how curious... I need to cross-reference this.", - "Interesting. This will certainly have a bearing on my research.", - "Keep it up dear, this is all very helpful!", - "A clue of small implication, but relevant nonetheless!", - "This is excellent, everything you find contributes to the formation of a theory.", - "Hm, I wonder...", - "This confirms something that I had speculated upon!", - "How peculiar! But surprising information can be even more valuable than expected information...", - "Even the smallest piece of evidence can help to uncover the grandest secrets of the universe.", - "This clue hints at hidden information.", - "Another piece of this twisted puzzle falls into place." - ], - - "apexDescription" : "Creepy...", - "avianDescription" : "A human woman.", - "floranDescription" : "Creepy human...", - "glitchDescription" : "Terrified. My desire to leave this area has increased.", - "humanDescription" : "This painting is giving me some real bad vibes.", - "hylotlDescription" : "I do not wish to discover the story behind this torture instrument.", - "novakidDescription" : "Yep, that's creepy alright.", - "inputNodes" : [[0, 0]], - "animation" : "paintingesther.animation", - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "image" : "/interface/chatbubbles/sb_esther.png:sb_estherIdle.", - "frames" : 2, - "animationCycle" : 0.1, - - "spaceScan" : 0.1, - "anchors" : [ "background" ] - - } - ], - - "scripts" : ["/objects/arttrophies/sb_paintingesther/paintingesther.lua"], - "scriptDelta" : 60 -} diff --git a/objects/avian/marketstall2/marketstallicon1.png b/objects/avian/marketstall2/marketstallicon1.png new file mode 100644 index 00000000..ffdf6230 Binary files /dev/null and b/objects/avian/marketstall2/marketstallicon1.png differ diff --git a/objects/avian/marketstall3/marketstallicon1.png b/objects/avian/marketstall3/marketstallicon1.png new file mode 100644 index 00000000..287fd590 Binary files /dev/null and b/objects/avian/marketstall3/marketstallicon1.png differ diff --git a/objects/avian/sb_mask7/mask7.png b/objects/avian/sb_mask7/mask7.png index f294c3ad..105b6bf1 100644 Binary files a/objects/avian/sb_mask7/mask7.png and b/objects/avian/sb_mask7/mask7.png differ diff --git a/objects/avian/sb_mask7/mask7fullbright.png b/objects/avian/sb_mask7/mask7fullbright.png index b425eb26..08472c4f 100644 Binary files a/objects/avian/sb_mask7/mask7fullbright.png and b/objects/avian/sb_mask7/mask7fullbright.png differ diff --git a/objects/avian/sb_mask7/mask7icon.png b/objects/avian/sb_mask7/mask7icon.png index 5ee210a0..539306ca 100644 Binary files a/objects/avian/sb_mask7/mask7icon.png and b/objects/avian/sb_mask7/mask7icon.png differ diff --git a/objects/avian/sb_tribaloven2/icon.png b/objects/avian/sb_tribaloven2/icon.png index 5415d6c6..b4c225d3 100644 Binary files a/objects/avian/sb_tribaloven2/icon.png and b/objects/avian/sb_tribaloven2/icon.png differ diff --git a/objects/avian/sb_tribaloven2/lit.png b/objects/avian/sb_tribaloven2/lit.png index 5d0b24d4..0bee51f3 100644 Binary files a/objects/avian/sb_tribaloven2/lit.png and b/objects/avian/sb_tribaloven2/lit.png differ diff --git a/objects/avian/sb_tribaloven2/tribaloven2.object b/objects/avian/sb_tribaloven2/tribaloven2.object index 075537c7..17368ccd 100644 --- a/objects/avian/sb_tribaloven2/tribaloven2.object +++ b/objects/avian/sb_tribaloven2/tribaloven2.object @@ -1,64 +1,89 @@ { - "objectName" : "sb_tribaloven2", - "colonyTags" : ["cooking","avian"], - "rarity" : "Uncommon", - "description" : "Crackling quietly, the smell of hickory smoke wafts from its grate.", - "shortdescription" : "^orange;Stout Oven^reset;", - "category" : "Wood-fired cooking", - "race" : "avian", - "tooltipKind" : "sb_object", - "tooltipFields" : {"subtitle":"Crafting Station"}, - "price" : 100, - "objectType" : "container", - - "maximumLiquidLevel" : 0.2, + "objectName": "sb_tribaloven2", + "colonyTags": ["cooking", "light", "avian"], + "rarity": "Uncommon", + "description": "Crackling quietly, the smell of hickory smoke wafts from its grate.", + "shortdescription": "^orange;Stout Oven^reset;", + "category": "crafting", + "race": "avian", + "tooltipKind": "sb_object", + "price": 100, + "interactAction": "OpenCraftingInterface", + "interactData": { + "config": "/interface/windowconfig/craftingcampfire.config", + "paneLayoutOverride": { + "windowtitle": { + "title": " Stout Oven", + "subtitle": " Wood-fired cooking" + } + }, + "filter": ["campfire"] + }, + "maximumLiquidLevel": 0.2, - "apexDescription" : "It appears to be an oven.", - "avianDescription" : "The grounded are wonderful cooks.", - "floranDescription" : "Floran would like to cook meat.", - "glitchDescription" : "Annoyed. Cooks unevenly.", - "humanDescription" : "This oven smells of home-cooked meals.", - "hylotlDescription" : "The Hylotl cook their food with microwaves.", - "novakidDescription" : "Well, if that ain't the cutest little oven I ever saw!", + "apexDescription": "It appears to be an oven.", + "avianDescription": "The grounded are wonderful cooks.", + "floranDescription": "Floran would like to cook meat.", + "glitchDescription": "Annoyed. Cooks unevenly.", + "humanDescription": "This oven smells of home-cooked meals.", + "hylotlDescription": "The Hylotl cook their food with microwaves.", + "novakidDescription": "Well, if that ain't the cutest little oven I ever saw!", - "lightColor" : [179, 149, 107], + "lightColor": [179, 149, 107], - "flickerPeriod" : 0.3, - "flickerMinIntensity" : 0.65, - "flickerMaxIntensity" : 0.7, - "flickerPeriodVariance" : 0.075, - "flickerIntensityVariance" : 0.025, + "flickerPeriod": 0.3, + "flickerMinIntensity": 0.65, + "flickerMaxIntensity": 0.7, + "flickerPeriodVariance": 0.075, + "flickerIntensityVariance": 0.025, - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "unlit.png:." }, { "image" : "lit.png:.", "fullbright" : true } ], - "direction" : "left", + "inventoryIcon": "icon.png", + "orientations": [{ + "imageLayers": [{ + "image": "unlit.png:." + }, { + "image": "lit.png:.", + "fullbright": true + } + ], + "direction": "left", - "imagePosition" : [-6.5, 0], - "frames" : 4, - "animationCycle" : 0.6, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - }, - { - "imageLayers" : [ { "image" : "unlit.png:." }, { "image" : "lit.png:.", "fullbright" : true } ], - "direction" : "right", - "flipImages" : true, + "imagePosition": [-6.5, 0], + "frames": 4, + "animationCycle": 0.6, + "spaceScan": 0.1, + "anchors": ["bottom"] + }, { + "imageLayers": [{ + "image": "unlit.png:." + }, { + "image": "lit.png:.", + "fullbright": true + } + ], + "direction": "right", + "flipImages": true, - "imagePosition" : [-6.5, 0], - "frames" : 4, - "animationCycle" : 0.6, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + "imagePosition": [-6.5, 0], + "frames": 4, + "animationCycle": 0.6, + "spaceScan": 0.1, + "anchors": ["bottom"] } ], - - "soundEffect" : "/sfx/objects/campfire.ogg", - "recipeGroup" : "campfire", - "openSounds" : ["/sfx/objects/campfire_use.ogg"], - "slotCount" : 2, - "uiConfig" : "/interface/sb_objectcrafting/campfire.config", - "frameCooldown" : 5, - "autoCloseCooldown" : 3600 -} \ No newline at end of file + "soundEffect": "/sfx/objects/campfire.ogg", + "soundEffectRangeMultiplier": 0.5, + "scripts": ["/scripts/npcToyObject.lua"], + "npcToy": { + "influence": ["campfire","campfire"], + "defaultReactions": { + "campfire": [ + [1, "warmhands"], + [1, "crouchwarm"] + ] + }, + "preciseStandPositionLeft": [-2.5, 0], + "preciseStandPositionRight": [2.5, 0], + "maxNpcs": 1 + } +} diff --git a/objects/avian/sb_tribaloven2/unlit.png b/objects/avian/sb_tribaloven2/unlit.png index 3737afb1..399ca180 100644 Binary files a/objects/avian/sb_tribaloven2/unlit.png and b/objects/avian/sb_tribaloven2/unlit.png differ diff --git a/objects/avian/tombstone10/tombstone10.object.patch b/objects/avian/tombstone10/tombstone10.object.patch deleted file mode 100644 index 7e1968fe..00000000 --- a/objects/avian/tombstone10/tombstone10.object.patch +++ /dev/null @@ -1,4 +0,0 @@ -[ -[{"op":"test","path":"/description","value":"This tombstone is engraved with an eye symbol"}, -{"op":"replace","path":"/description","value":"This tombstone is engraved with an eye symbol."}] -] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowbush/glowbush1.object.patch b/objects/biome/bioluminescence/glowbush/glowbush1.object.patch deleted file mode 100644 index 60e70222..00000000 --- a/objects/biome/bioluminescence/glowbush/glowbush1.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreorange",3,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowbush/glowbush2.object.patch b/objects/biome/bioluminescence/glowbush/glowbush2.object.patch deleted file mode 100644 index 60e70222..00000000 --- a/objects/biome/bioluminescence/glowbush/glowbush2.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreorange",3,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowbush/glowbush3.object.patch b/objects/biome/bioluminescence/glowbush/glowbush3.object.patch deleted file mode 100644 index 60e70222..00000000 --- a/objects/biome/bioluminescence/glowbush/glowbush3.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreorange",3,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowbush/glowbush4.object.patch b/objects/biome/bioluminescence/glowbush/glowbush4.object.patch deleted file mode 100644 index 60e70222..00000000 --- a/objects/biome/bioluminescence/glowbush/glowbush4.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreorange",3,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowbush/glowbush5.object.patch b/objects/biome/bioluminescence/glowbush/glowbush5.object.patch deleted file mode 100644 index 60e70222..00000000 --- a/objects/biome/bioluminescence/glowbush/glowbush5.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreorange",3,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowflower/glowflower1.object.patch b/objects/biome/bioluminescence/glowflower/glowflower1.object.patch deleted file mode 100644 index b7a5e862..00000000 --- a/objects/biome/bioluminescence/glowflower/glowflower1.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreyellow",2,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowflower/glowflower2.object.patch b/objects/biome/bioluminescence/glowflower/glowflower2.object.patch deleted file mode 100644 index b7a5e862..00000000 --- a/objects/biome/bioluminescence/glowflower/glowflower2.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreyellow",2,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowflower/glowflower3.object.patch b/objects/biome/bioluminescence/glowflower/glowflower3.object.patch deleted file mode 100644 index b7a5e862..00000000 --- a/objects/biome/bioluminescence/glowflower/glowflower3.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreyellow",2,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowflower/glowflower4.object.patch b/objects/biome/bioluminescence/glowflower/glowflower4.object.patch deleted file mode 100644 index b7a5e862..00000000 --- a/objects/biome/bioluminescence/glowflower/glowflower4.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreyellow",2,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowflower/glowflower5.object.patch b/objects/biome/bioluminescence/glowflower/glowflower5.object.patch deleted file mode 100644 index b7a5e862..00000000 --- a/objects/biome/bioluminescence/glowflower/glowflower5.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreyellow",2,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowvine/glowvine1.object.patch b/objects/biome/bioluminescence/glowvine/glowvine1.object.patch deleted file mode 100644 index bedf9fdb..00000000 --- a/objects/biome/bioluminescence/glowvine/glowvine1.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreblue",6,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowvine/glowvine2.object.patch b/objects/biome/bioluminescence/glowvine/glowvine2.object.patch deleted file mode 100644 index bedf9fdb..00000000 --- a/objects/biome/bioluminescence/glowvine/glowvine2.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreblue",6,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowvine/glowvine3.object.patch b/objects/biome/bioluminescence/glowvine/glowvine3.object.patch deleted file mode 100644 index bedf9fdb..00000000 --- a/objects/biome/bioluminescence/glowvine/glowvine3.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreblue",6,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowvine/glowvine4.object.patch b/objects/biome/bioluminescence/glowvine/glowvine4.object.patch deleted file mode 100644 index bedf9fdb..00000000 --- a/objects/biome/bioluminescence/glowvine/glowvine4.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreblue",6,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/glowvine/glowvine5.object.patch b/objects/biome/bioluminescence/glowvine/glowvine5.object.patch deleted file mode 100644 index bedf9fdb..00000000 --- a/objects/biome/bioluminescence/glowvine/glowvine5.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/smashDropOptions","inverse":true},{"op":"add","path":"/smashDropOptions","value":[]}], -[{"op":"add","path":"/smashDropOptions/-","value":[["sb_glowfibreblue",6,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescence/sb_glowchest/glowchest.png b/objects/biome/bioluminescence/sb_glowchest/glowchest.png index e6548c20..545e1d30 100644 Binary files a/objects/biome/bioluminescence/sb_glowchest/glowchest.png and b/objects/biome/bioluminescence/sb_glowchest/glowchest.png differ diff --git a/objects/biome/bioluminescence/sb_glowchest/glowchesticon.png b/objects/biome/bioluminescence/sb_glowchest/glowchesticon.png index 2aa0d982..bec560d1 100644 Binary files a/objects/biome/bioluminescence/sb_glowchest/glowchesticon.png and b/objects/biome/bioluminescence/sb_glowchest/glowchesticon.png differ diff --git a/objects/biome/bioluminescentcave/bioshroom/bioshroom1.object.patch b/objects/biome/bioluminescentcave/bioshroom/bioshroom1.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/bioshroom/bioshroom1.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/bioshroom/bioshroom2.object.patch b/objects/biome/bioluminescentcave/bioshroom/bioshroom2.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/bioshroom/bioshroom2.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/bioshroom/bioshroom3.object.patch b/objects/biome/bioluminescentcave/bioshroom/bioshroom3.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/bioshroom/bioshroom3.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/bioshroom/bioshroom4.object.patch b/objects/biome/bioluminescentcave/bioshroom/bioshroom4.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/bioshroom/bioshroom4.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/bioshroom/bioshroom5.object.patch b/objects/biome/bioluminescentcave/bioshroom/bioshroom5.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/bioshroom/bioshroom5.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/biovine/biovine1.object.patch b/objects/biome/bioluminescentcave/biovine/biovine1.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/biovine/biovine1.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/biovine/biovine2.object.patch b/objects/biome/bioluminescentcave/biovine/biovine2.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/biovine/biovine2.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/biovine/biovine3.object.patch b/objects/biome/bioluminescentcave/biovine/biovine3.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/biovine/biovine3.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/biovine/biovine4.object.patch b/objects/biome/bioluminescentcave/biovine/biovine4.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/biovine/biovine4.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/bioluminescentcave/biovine/biovine5.object.patch b/objects/biome/bioluminescentcave/biovine/biovine5.object.patch deleted file mode 100644 index 6652dcce..00000000 --- a/objects/biome/bioluminescentcave/biovine/biovine5.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], -[{"op":"add","path":"/breakDropOptions/-","value":[["sb_glowfibregreen",1,{}]]}]] \ No newline at end of file diff --git a/objects/biome/crystalline/crystalbed/crystalbed.object.patch b/objects/biome/crystalline/crystalbed/crystalbed.object.patch index 737682df..899506c8 100644 --- a/objects/biome/crystalline/crystalbed/crystalbed.object.patch +++ b/objects/biome/crystalline/crystalbed/crystalbed.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/crystalline/crystalchair/crystalchair.object.patch b/objects/biome/crystalline/crystalchair/crystalchair.object.patch index 737682df..899506c8 100644 --- a/objects/biome/crystalline/crystalchair/crystalchair.object.patch +++ b/objects/biome/crystalline/crystalchair/crystalchair.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/crystalline/crystallamp/crystallamp.object.patch b/objects/biome/crystalline/crystallamp/crystallamp.object.patch index 737682df..899506c8 100644 --- a/objects/biome/crystalline/crystallamp/crystallamp.object.patch +++ b/objects/biome/crystalline/crystallamp/crystallamp.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/crystalline/crystaltable/crystaltable.object.patch b/objects/biome/crystalline/crystaltable/crystaltable.object.patch index 737682df..899506c8 100644 --- a/objects/biome/crystalline/crystaltable/crystaltable.object.patch +++ b/objects/biome/crystalline/crystaltable/crystaltable.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/geologicalsample/diamondsample/diamondsample.object.patch b/objects/biome/geologicalsample/diamondsample/diamondsample.object.patch index 737682df..899506c8 100644 --- a/objects/biome/geologicalsample/diamondsample/diamondsample.object.patch +++ b/objects/biome/geologicalsample/diamondsample/diamondsample.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/geologicalsample/platinumsample/platinumsample.object.patch b/objects/biome/geologicalsample/platinumsample/platinumsample.object.patch index 737682df..899506c8 100644 --- a/objects/biome/geologicalsample/platinumsample/platinumsample.object.patch +++ b/objects/biome/geologicalsample/platinumsample/platinumsample.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/geologicalsample/plutoniumsample/plutoniumsample.object.patch b/objects/biome/geologicalsample/plutoniumsample/plutoniumsample.object.patch index 737682df..899506c8 100644 --- a/objects/biome/geologicalsample/plutoniumsample/plutoniumsample.object.patch +++ b/objects/biome/geologicalsample/plutoniumsample/plutoniumsample.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/geologicalsample/sb_ceruliumsample/ceruliumsample.object b/objects/biome/geologicalsample/sb_ceruliumsample/ceruliumsample.object index 918a6194..9397448b 100644 --- a/objects/biome/geologicalsample/sb_ceruliumsample/ceruliumsample.object +++ b/objects/biome/geologicalsample/sb_ceruliumsample/ceruliumsample.object @@ -1,33 +1,20 @@ { - "objectName" : "sb_ceruliumsample", - "colonyTags" : ["pretty"], - "rarity" : "Legendary", - "category" : "decorative", - "price" : 5000, - "printable" : false, - "tooltipKind" : "sb_object", - "description" : "\"A perfect sample of a cerulium ore.\"", - "shortdescription" : "Cerulium Sample", + "objectName": "sb_ceruliumsample", + "colonyTags": ["pretty"], + "rarity": "Legendary", + "category": "decorative", + "price": 5000, + "printable": false, + "tooltipKind": "sb_object", + "description": "\"A perfect sample of a cerulium ore.\"", + "shortdescription": "Cerulium Sample", - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "image" : "ceruliumsample.png:", - "imagePosition" : [-2, 0], - "direction" : "left", - "flipImages" : true, - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] - }, - { - "image" : "ceruliumsample.png:", - "imagePosition" : [-2, 0], - "direction" : "right", - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "ceruliumsample.png:", + "imagePosition": [-2, 0], + "spaces": [[0, 0], [0, 1]], + "anchors": ["bottom"] } ] } diff --git a/objects/biome/geologicalsample/sb_leadsample/icon.png b/objects/biome/geologicalsample/sb_leadsample/icon.png index 69fea277..db8de625 100644 Binary files a/objects/biome/geologicalsample/sb_leadsample/icon.png and b/objects/biome/geologicalsample/sb_leadsample/icon.png differ diff --git a/objects/biome/geologicalsample/sb_leadsample/leadsample.object b/objects/biome/geologicalsample/sb_leadsample/leadsample.object index 86ecd0f6..ac1c16bb 100644 --- a/objects/biome/geologicalsample/sb_leadsample/leadsample.object +++ b/objects/biome/geologicalsample/sb_leadsample/leadsample.object @@ -1,33 +1,20 @@ { - "objectName" : "sb_leadsample", - "colonyTags" : ["pretty"], - "rarity" : "Legendary", - "category" : "decorative", - "price" : 5000, - "printable" : false, - "tooltipKind" : "sb_object", - "description" : "\"A perfect sample of lead.\"", - "shortdescription" : "Lead Sample", + "objectName": "sb_leadsample", + "colonyTags": ["pretty"], + "rarity": "Legendary", + "category": "decorative", + "price": 5000, + "printable": false, + "tooltipKind": "sb_object", + "description": "\"A perfect sample of lead.\"", + "shortdescription": "Lead Sample", - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "image" : "leadsample.png:", - "imagePosition" : [-2, 0], - "direction" : "left", - "flipImages" : true, - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] - }, - { - "image" : "leadsample.png:", - "imagePosition" : [-2, 0], - "direction" : "right", - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "leadsample.png:", + "imagePosition": [-2, 0], + "spaces": [[0, 0], [0, 1]], + "anchors": ["bottom"] } ] } diff --git a/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.object b/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.object index 4f07550b..47b9fb0c 100644 --- a/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.object +++ b/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.object @@ -1,33 +1,20 @@ { - "objectName" : "sb_moonstonesample", - "colonyTags" : ["pretty"], - "rarity" : "Legendary", - "category" : "decorative", - "price" : 5000, - "printable" : false, - "tooltipKind" : "sb_object", - "description" : "\"A perfect sample of a moonstone ore.\"", - "shortdescription" : "Moonstone Sample", + "objectName": "sb_moonstonesample", + "colonyTags": ["pretty"], + "rarity": "Legendary", + "category": "decorative", + "price": 5000, + "printable": false, + "tooltipKind": "sb_object", + "description": "\"A perfect sample of a moonstone ore.\"", + "shortdescription": "Moonstone Sample", - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "image" : "moonstonesample.png:", - "imagePosition" : [-2, 0], - "direction" : "left", - "flipImages" : true, - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] - }, - { - "image" : "moonstonesample.png:", - "imagePosition" : [-2, 0], - "direction" : "right", - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "moonstonesample.png:", + "imagePosition": [-2, 0], + "spaces": [[0, 0], [0, 1]], + "anchors": ["bottom"] } ] } diff --git a/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.png b/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.png index f3a29cd7..0b7bbf3d 100644 Binary files a/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.png and b/objects/biome/geologicalsample/sb_moonstonesample/moonstonesample.png differ diff --git a/objects/biome/geologicalsample/sb_rubiumsample/rubiumsample.object b/objects/biome/geologicalsample/sb_rubiumsample/rubiumsample.object index 47d9a4b9..1398f4a2 100644 --- a/objects/biome/geologicalsample/sb_rubiumsample/rubiumsample.object +++ b/objects/biome/geologicalsample/sb_rubiumsample/rubiumsample.object @@ -1,33 +1,20 @@ { - "objectName" : "sb_rubiumsample", - "colonyTags" : ["pretty"], - "rarity" : "Legendary", - "category" : "decorative", - "price" : 5000, - "printable" : false, - "tooltipKind" : "sb_object", - "description" : "\"A perfect sample of a rubium ore.\"", - "shortdescription" : "Rubium Sample", + "objectName": "sb_rubiumsample", + "colonyTags": ["pretty"], + "rarity": "Legendary", + "category": "decorative", + "price": 5000, + "printable": false, + "tooltipKind": "sb_object", + "description": "\"A perfect sample of a rubium ore.\"", + "shortdescription": "Rubium Sample", - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "image" : "rubiumsample.png:", - "imagePosition" : [-2, 0], - "direction" : "left", - "flipImages" : true, - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] - }, - { - "image" : "rubiumsample.png:", - "imagePosition" : [-2, 0], - "direction" : "right", - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "rubiumsample.png:", + "imagePosition": [-2, 0], + "spaces": [[0, 0], [0, 1]], + "anchors": ["bottom"] } ] } diff --git a/objects/biome/geologicalsample/sb_sulphursample/sulphursample.object b/objects/biome/geologicalsample/sb_sulphursample/sulphursample.object index 7974c200..5b4fe871 100644 --- a/objects/biome/geologicalsample/sb_sulphursample/sulphursample.object +++ b/objects/biome/geologicalsample/sb_sulphursample/sulphursample.object @@ -1,33 +1,20 @@ { - "objectName" : "sb_sulphursample", - "colonyTags" : ["pretty"], - "rarity" : "Legendary", - "category" : "decorative", - "price" : 5000, - "printable" : false, - "tooltipKind" : "sb_object", - "description" : "\"A perfect sample of sulphur.\"", - "shortdescription" : "Sulphur Sample", + "objectName": "sb_sulphursample", + "colonyTags": ["pretty"], + "rarity": "Legendary", + "category": "decorative", + "price": 5000, + "printable": false, + "tooltipKind": "sb_object", + "description": "\"A perfect sample of sulphur.\"", + "shortdescription": "Sulphur Sample", - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "image" : "sulphursample.png:", - "imagePosition" : [-2, 0], - "direction" : "left", - "flipImages" : true, - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] - }, - { - "image" : "sulphursample.png:", - "imagePosition" : [-2, 0], - "direction" : "right", - - "spaces" : [ [0, 0], [0, 1] ], - "anchors" : [ "bottom" ] + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "sulphursample.png:", + "imagePosition": [-2, 0], + "spaces": [[0, 0], [0, 1]], + "anchors": ["bottom"] } ] -} \ No newline at end of file +} diff --git a/objects/biome/geologicalsample/uraniumsample/uraniumsample.object.patch b/objects/biome/geologicalsample/uraniumsample/uraniumsample.object.patch index 737682df..899506c8 100644 --- a/objects/biome/geologicalsample/uraniumsample/uraniumsample.object.patch +++ b/objects/biome/geologicalsample/uraniumsample/uraniumsample.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/gnome/smallchurch/smallchurch.object.patch b/objects/biome/gnome/smallchurch/smallchurch.object.patch index 1706a230..530ea943 100644 --- a/objects/biome/gnome/smallchurch/smallchurch.object.patch +++ b/objects/biome/gnome/smallchurch/smallchurch.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallchurch.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallclocktower/smallclocktower.object.patch b/objects/biome/gnome/smallclocktower/smallclocktower.object.patch index be665c2b..4f742600 100644 --- a/objects/biome/gnome/smallclocktower/smallclocktower.object.patch +++ b/objects/biome/gnome/smallclocktower/smallclocktower.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallclocktower.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse1/smallhouse1.object.patch b/objects/biome/gnome/smallhouse1/smallhouse1.object.patch index a2255583..bbc62220 100644 --- a/objects/biome/gnome/smallhouse1/smallhouse1.object.patch +++ b/objects/biome/gnome/smallhouse1/smallhouse1.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse1.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse10/smallhouse10.object.patch b/objects/biome/gnome/smallhouse10/smallhouse10.object.patch index b0ee1728..8739c595 100644 --- a/objects/biome/gnome/smallhouse10/smallhouse10.object.patch +++ b/objects/biome/gnome/smallhouse10/smallhouse10.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse10.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse11/smallhouse11.object.patch b/objects/biome/gnome/smallhouse11/smallhouse11.object.patch index 0365f840..b3f93124 100644 --- a/objects/biome/gnome/smallhouse11/smallhouse11.object.patch +++ b/objects/biome/gnome/smallhouse11/smallhouse11.object.patch @@ -2,6 +2,5 @@ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse11.png?border=1;000"}], [{"op":"test","path":"/description","value":"A miniature house. Don't knock too hard!"},{"op":"replace","path":"/description","value":"A miniature shop. Don't knock too hard!"}], [{"op":"test","path":"/shortdescription","value":"Tiny House"},{"op":"replace","path":"/shortdescription","value":"Tiny Shop"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse2/smallhouse2.object.patch b/objects/biome/gnome/smallhouse2/smallhouse2.object.patch index 34ac51a5..2b2858a4 100644 --- a/objects/biome/gnome/smallhouse2/smallhouse2.object.patch +++ b/objects/biome/gnome/smallhouse2/smallhouse2.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse2.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse3/smallhouse3.object.patch b/objects/biome/gnome/smallhouse3/smallhouse3.object.patch index 79418182..a4d04ff5 100644 --- a/objects/biome/gnome/smallhouse3/smallhouse3.object.patch +++ b/objects/biome/gnome/smallhouse3/smallhouse3.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse3.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse4/smallhouse4.object.patch b/objects/biome/gnome/smallhouse4/smallhouse4.object.patch index bdb9596b..442d4a3a 100644 --- a/objects/biome/gnome/smallhouse4/smallhouse4.object.patch +++ b/objects/biome/gnome/smallhouse4/smallhouse4.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse4.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse5/smallhouse5.object.patch b/objects/biome/gnome/smallhouse5/smallhouse5.object.patch index 624b39a3..b5bcdd4c 100644 --- a/objects/biome/gnome/smallhouse5/smallhouse5.object.patch +++ b/objects/biome/gnome/smallhouse5/smallhouse5.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse5.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse6/smallhouse6.object.patch b/objects/biome/gnome/smallhouse6/smallhouse6.object.patch index 43438bca..819098c7 100644 --- a/objects/biome/gnome/smallhouse6/smallhouse6.object.patch +++ b/objects/biome/gnome/smallhouse6/smallhouse6.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse6.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse7/smallhouse7.object.patch b/objects/biome/gnome/smallhouse7/smallhouse7.object.patch index d0648946..03ea031a 100644 --- a/objects/biome/gnome/smallhouse7/smallhouse7.object.patch +++ b/objects/biome/gnome/smallhouse7/smallhouse7.object.patch @@ -2,6 +2,5 @@ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse7.png?border=1;000"}], [{"op":"test","path":"/description","value":"A miniature house. Don't knock too hard!"},{"op":"replace","path":"/description","value":"A miniature factory. Don't knock too hard!"}], [{"op":"test","path":"/shortdescription","value":"Tiny House"},{"op":"replace","path":"/shortdescription","value":"Tiny Factory"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse8/smallhouse8.object.patch b/objects/biome/gnome/smallhouse8/smallhouse8.object.patch index 111369e8..6c9c3157 100644 --- a/objects/biome/gnome/smallhouse8/smallhouse8.object.patch +++ b/objects/biome/gnome/smallhouse8/smallhouse8.object.patch @@ -2,6 +2,5 @@ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse8.png?border=1;000"}], [{"op":"test","path":"/description","value":"Little house on the prairie. Or wherever you are."},{"op":"replace","path":"/description","value":"A miniature shop. Don't knock too hard!"}], [{"op":"test","path":"/shortdescription","value":"Tiny House"},{"op":"replace","path":"/shortdescription","value":"Tiny Shop"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallhouse9/smallhouse9.object.patch b/objects/biome/gnome/smallhouse9/smallhouse9.object.patch index 3f4ab180..5e03b847 100644 --- a/objects/biome/gnome/smallhouse9/smallhouse9.object.patch +++ b/objects/biome/gnome/smallhouse9/smallhouse9.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallhouse9.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallinn/smallinn.object.patch b/objects/biome/gnome/smallinn/smallinn.object.patch index 7c2814b0..3c0bedf2 100644 --- a/objects/biome/gnome/smallinn/smallinn.object.patch +++ b/objects/biome/gnome/smallinn/smallinn.object.patch @@ -2,6 +2,5 @@ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallinn.png?border=1;000"}], [{"op":"test","path":"/description","value":"Little house on the prairie. Or wherever you are."},{"op":"replace","path":"/description","value":"A miniature inn. Don't knock too hard!"}], [{"op":"test","path":"/shortdescription","value":"Tiny House"},{"op":"replace","path":"/shortdescription","value":"Tiny Inn"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smalllamppost/smalllamppost.object.patch b/objects/biome/gnome/smalllamppost/smalllamppost.object.patch index d9fa2291..c76cf896 100644 --- a/objects/biome/gnome/smalllamppost/smalllamppost.object.patch +++ b/objects/biome/gnome/smalllamppost/smalllamppost.object.patch @@ -1,5 +1,4 @@ [ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smalllamppost.png?border=1;000"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/gnome/smallwindmill/smallwindmill.object.patch b/objects/biome/gnome/smallwindmill/smallwindmill.object.patch index f387b9f4..4fdefbde 100644 --- a/objects/biome/gnome/smallwindmill/smallwindmill.object.patch +++ b/objects/biome/gnome/smallwindmill/smallwindmill.object.patch @@ -2,6 +2,5 @@ [{"op":"test","path":"/inventoryIcon","value":"capsulebigicon.png"},{"op":"replace","path":"/inventoryIcon","value":"smallwindmill.png?border=1;000"}], [{"op":"test","path":"/description","value":"A miniature house. Don't knock too hard!"},{"op":"replace","path":"/description","value":"A miniature windmill. Don't knock too hard!"}], [{"op":"test","path":"/shortdescription","value":"Tiny House"},{"op":"replace","path":"/shortdescription","value":"Tiny Windmill"}], -[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_object"}] +[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}] ] \ No newline at end of file diff --git a/objects/biome/ice/icechest/icechest.object.patch b/objects/biome/ice/icechest/icechest.object.patch index dd3a56f5..321fbc72 100644 --- a/objects/biome/ice/icechest/icechest.object.patch +++ b/objects/biome/ice/icechest/icechest.object.patch @@ -1,4 +1,3 @@ -//Maybe it's intentional that it doesn't preserve food. [ [{"op":"test","path":"/category","value":"storage"},{"op":"replace","path":"/category","value":"fridgeStorage"}], [{"op":"test","path":"/itemAgeMultiplier","inverse":true},{"op":"add","path":"/itemAgeMultiplier","value":0}] diff --git a/objects/biome/jungle/beanstalk/beanstalk.object.patch b/objects/biome/jungle/beanstalk/beanstalk.object.patch deleted file mode 100644 index 014de203..00000000 --- a/objects/biome/jungle/beanstalk/beanstalk.object.patch +++ /dev/null @@ -1,2 +0,0 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":""}], -[{"op":"replace","path":"/tooltipKind","value":"sb_tall"}]] \ No newline at end of file diff --git a/objects/biome/mushroom/sb_shroomlamp/shroomlamp.frames b/objects/biome/mushroom/sb_shroomlamp/shroomlamp.frames deleted file mode 100644 index 90dd0d38..00000000 --- a/objects/biome/mushroom/sb_shroomlamp/shroomlamp.frames +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [2, 1], - "names" : [ - [ "default.0", "default.off" ] - ] - }, - - "aliases" : { - "default.default" : "default.off" - } -} diff --git a/objects/biome/mushroom/sb_shroomlamp/shroomlamp.object.disabled b/objects/biome/mushroom/sb_shroomlamp/shroomlamp.object.disabled deleted file mode 100644 index 581251b2..00000000 --- a/objects/biome/mushroom/sb_shroomlamp/shroomlamp.object.disabled +++ /dev/null @@ -1,58 +0,0 @@ -//im not sure what the hell this is. is it hanging? is it standing?? i think it's standing -{ - "objectName" : "sb_shroomlamp", - "colonyTags" : ["mushroompatch","nature","light"], - "printable" : false, - "rarity" : "Common", - "category" : "light", - "price" : 50, - - "description" : "A glow-in-the-dark mushroom. Handy AND cute.", - "shortdescription" : "Shroom Lamp", - "race" : "generic", - - "apexDescription" : "A cute glowing mushroom. Great for a night-light.", - "avianDescription" : "This mushroom's glow lights up any room.", - "floranDescription" : "Floran like glowy ssshroom.", - "glitchDescription" : "Analysis. The glow is produced by spores which seem to display parasitic behaviour.", - "humanDescription" : "A lamp you could cuddle.", - "hylotlDescription" : "This mushroom lamp is practical and useful.", - - "statusEffects" : [ - { - "kind" : "Warmth", - "amount" : 10, - "range" : 2 - } ], - - "lightColor" : [252, 197, 67], - "flickerDistance" : 0.5, - "flickerStrength" : 0.1, - - "inventoryIcon" : "shroomlampicon.png", - "orientations" : [ - - { - "image" : "shroomlamp.png:.", - "imagePosition" : [0, 0], - "frames" : 1, - "animationCycle" : 0.5, - - "spaces" : [ [0, 0], [0, 1] ], - "fgAnchors" : [ [0, -1] ] - }, - - { - "image" : "shroomlamp.png:.", - "imagePosition" : [0, 0], - "frames" : 1, - "animationCycle" : 0.5, - - "spaces" : [ [0, 0], [0, 1] ], - "fgAnchors" : [ [0, 2] ] - } - ], - - "soundEffect" : "/sfx/objects/oillantern.ogg" - -} diff --git a/objects/biome/mushroom/sb_shroomlamp/shroomlamp.png b/objects/biome/mushroom/sb_shroomlamp/shroomlamp.png deleted file mode 100644 index f78d330f..00000000 Binary files a/objects/biome/mushroom/sb_shroomlamp/shroomlamp.png and /dev/null differ diff --git a/objects/biome/mushroom/sb_shroomlamp/shroomlampicon.png b/objects/biome/mushroom/sb_shroomlamp/shroomlampicon.png deleted file mode 100644 index 991418d3..00000000 Binary files a/objects/biome/mushroom/sb_shroomlamp/shroomlampicon.png and /dev/null differ diff --git a/objects/biome/rust/rustbed/rustbed.object.patch b/objects/biome/rust/rustbed/rustbed.object.patch index 737682df..899506c8 100644 --- a/objects/biome/rust/rustbed/rustbed.object.patch +++ b/objects/biome/rust/rustbed/rustbed.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/rust/rusttable/rusttable.object.patch b/objects/biome/rust/rusttable/rusttable.object.patch index 737682df..899506c8 100644 --- a/objects/biome/rust/rusttable/rusttable.object.patch +++ b/objects/biome/rust/rusttable/rusttable.object.patch @@ -1 +1 @@ -[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}],[{"op":"replace","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file +[[{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/biome/sb_eyepatch/bedcover.png b/objects/biome/sb_eyepatch/bedcover.png index 31227719..7dd7b683 100644 Binary files a/objects/biome/sb_eyepatch/bedcover.png and b/objects/biome/sb_eyepatch/bedcover.png differ diff --git a/objects/biome/sb_eyepatch/eyebed.png b/objects/biome/sb_eyepatch/eyebed.png index 0174b06d..151146dc 100644 Binary files a/objects/biome/sb_eyepatch/eyebed.png and b/objects/biome/sb_eyepatch/eyebed.png differ diff --git a/objects/biome/sb_eyepatch/eyebedicon.png b/objects/biome/sb_eyepatch/eyebedicon.png index 50b14ef6..2fcbe05c 100644 Binary files a/objects/biome/sb_eyepatch/eyebedicon.png and b/objects/biome/sb_eyepatch/eyebedicon.png differ diff --git a/objects/biome/sb_eyepatch/eyechair.png b/objects/biome/sb_eyepatch/eyechair.png index 3efe382d..d56eda9b 100644 Binary files a/objects/biome/sb_eyepatch/eyechair.png and b/objects/biome/sb_eyepatch/eyechair.png differ diff --git a/objects/biome/sb_eyepatch/eyechesticon.png b/objects/biome/sb_eyepatch/eyechesticon.png index 313f0418..c1f1ec1a 100644 Binary files a/objects/biome/sb_eyepatch/eyechesticon.png and b/objects/biome/sb_eyepatch/eyechesticon.png differ diff --git a/objects/biome/sb_eyepatch/eyedoor.png b/objects/biome/sb_eyepatch/eyedoor.png index 20f9f60b..4458d140 100644 Binary files a/objects/biome/sb_eyepatch/eyedoor.png and b/objects/biome/sb_eyepatch/eyedoor.png differ diff --git a/objects/biome/sb_eyepatch/eyedooricon.png b/objects/biome/sb_eyepatch/eyedooricon.png index 6f681acd..80d34c45 100644 Binary files a/objects/biome/sb_eyepatch/eyedooricon.png and b/objects/biome/sb_eyepatch/eyedooricon.png differ diff --git a/objects/biome/sb_eyepatch/eyetable.png b/objects/biome/sb_eyepatch/eyetable.png index 35c89519..06cab92b 100644 Binary files a/objects/biome/sb_eyepatch/eyetable.png and b/objects/biome/sb_eyepatch/eyetable.png differ diff --git a/objects/biome/sb_geometric/bushes/16x16/3.png b/objects/biome/sb_geometric/bushes/16x16/3.png index 56699306..27c742e3 100644 Binary files a/objects/biome/sb_geometric/bushes/16x16/3.png and b/objects/biome/sb_geometric/bushes/16x16/3.png differ diff --git a/objects/biome/sb_geometric/bushes/16x16/4.png b/objects/biome/sb_geometric/bushes/16x16/4.png index 4b3a7e5e..ac63fdc7 100644 Binary files a/objects/biome/sb_geometric/bushes/16x16/4.png and b/objects/biome/sb_geometric/bushes/16x16/4.png differ diff --git a/objects/biome/sb_geometric/bushes/24x16/1.png b/objects/biome/sb_geometric/bushes/24x16/1.png index fa5081f3..b7c2470b 100644 Binary files a/objects/biome/sb_geometric/bushes/24x16/1.png and b/objects/biome/sb_geometric/bushes/24x16/1.png differ diff --git a/objects/biome/sb_geometric/bushes/24x16/2.png b/objects/biome/sb_geometric/bushes/24x16/2.png index 283fdbc4..3d547c4e 100644 Binary files a/objects/biome/sb_geometric/bushes/24x16/2.png and b/objects/biome/sb_geometric/bushes/24x16/2.png differ diff --git a/objects/biome/sb_geometric/geometricbed.png b/objects/biome/sb_geometric/geometricbed.png index 2c827edc..ae24e96e 100644 Binary files a/objects/biome/sb_geometric/geometricbed.png and b/objects/biome/sb_geometric/geometricbed.png differ diff --git a/objects/biome/sb_geometric/geometricbedcover.png b/objects/biome/sb_geometric/geometricbedcover.png index dca2ccc7..af9ab66a 100644 Binary files a/objects/biome/sb_geometric/geometricbedcover.png and b/objects/biome/sb_geometric/geometricbedcover.png differ diff --git a/objects/biome/sb_geometric/geometricbedicon.png b/objects/biome/sb_geometric/geometricbedicon.png index 1712e4a6..72ffd4e5 100644 Binary files a/objects/biome/sb_geometric/geometricbedicon.png and b/objects/biome/sb_geometric/geometricbedicon.png differ diff --git a/objects/biome/sb_geometric/geometricchair.png b/objects/biome/sb_geometric/geometricchair.png index 563e20fb..40380512 100644 Binary files a/objects/biome/sb_geometric/geometricchair.png and b/objects/biome/sb_geometric/geometricchair.png differ diff --git a/objects/biome/sb_geometric/geometricchairicon.png b/objects/biome/sb_geometric/geometricchairicon.png index ce2b56a2..385d9e50 100644 Binary files a/objects/biome/sb_geometric/geometricchairicon.png and b/objects/biome/sb_geometric/geometricchairicon.png differ diff --git a/objects/biome/sb_geometric/geometricchest.png b/objects/biome/sb_geometric/geometricchest.png index 42de5d66..5809031f 100644 Binary files a/objects/biome/sb_geometric/geometricchest.png and b/objects/biome/sb_geometric/geometricchest.png differ diff --git a/objects/biome/sb_geometric/geometricchesticon.png b/objects/biome/sb_geometric/geometricchesticon.png index 43d108b5..7c181292 100644 Binary files a/objects/biome/sb_geometric/geometricchesticon.png and b/objects/biome/sb_geometric/geometricchesticon.png differ diff --git a/objects/biome/sb_geometric/geometricscreen.png b/objects/biome/sb_geometric/geometricscreen.png index 8e235cac..0fcdc715 100644 Binary files a/objects/biome/sb_geometric/geometricscreen.png and b/objects/biome/sb_geometric/geometricscreen.png differ diff --git a/objects/biome/sb_geometric/geometricscreenicon.png b/objects/biome/sb_geometric/geometricscreenicon.png index 96642470..7cfe3c5a 100644 Binary files a/objects/biome/sb_geometric/geometricscreenicon.png and b/objects/biome/sb_geometric/geometricscreenicon.png differ diff --git a/objects/biome/sb_geometric/geometricscreenlit.png b/objects/biome/sb_geometric/geometricscreenlit.png index 775b436d..900c3dbf 100644 Binary files a/objects/biome/sb_geometric/geometricscreenlit.png and b/objects/biome/sb_geometric/geometricscreenlit.png differ diff --git a/objects/biome/sb_geometric/geometrictable.png b/objects/biome/sb_geometric/geometrictable.png index c02d0ff9..23eb4e2d 100644 Binary files a/objects/biome/sb_geometric/geometrictable.png and b/objects/biome/sb_geometric/geometrictable.png differ diff --git a/objects/biome/sb_geometric/geometrictableicon.png b/objects/biome/sb_geometric/geometrictableicon.png index 9df58cda..36f2cb6b 100644 Binary files a/objects/biome/sb_geometric/geometrictableicon.png and b/objects/biome/sb_geometric/geometrictableicon.png differ diff --git a/objects/biome/sb_heck/heckaltar/heckaltar.png b/objects/biome/sb_heck/heckaltar/heckaltar.png index f6858030..fd35c4a9 100644 Binary files a/objects/biome/sb_heck/heckaltar/heckaltar.png and b/objects/biome/sb_heck/heckaltar/heckaltar.png differ diff --git a/objects/biome/sb_heck/heckaltar/heckaltaricon.png b/objects/biome/sb_heck/heckaltar/heckaltaricon.png index ff608906..1276492d 100644 Binary files a/objects/biome/sb_heck/heckaltar/heckaltaricon.png and b/objects/biome/sb_heck/heckaltar/heckaltaricon.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush1.png b/objects/biome/sb_heck/heckbush/heckbush1.png index 8eaee101..4d57f49c 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush1.png and b/objects/biome/sb_heck/heckbush/heckbush1.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush2.png b/objects/biome/sb_heck/heckbush/heckbush2.png index e018fd3c..57119574 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush2.png and b/objects/biome/sb_heck/heckbush/heckbush2.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush3.png b/objects/biome/sb_heck/heckbush/heckbush3.png index 724128af..2fd98d84 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush3.png and b/objects/biome/sb_heck/heckbush/heckbush3.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush5.png b/objects/biome/sb_heck/heckbush/heckbush5.png index 6f965d1d..b48cbc1b 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush5.png and b/objects/biome/sb_heck/heckbush/heckbush5.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush6.png b/objects/biome/sb_heck/heckbush/heckbush6.png index b7ebe769..f0a71452 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush6.png and b/objects/biome/sb_heck/heckbush/heckbush6.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush7.png b/objects/biome/sb_heck/heckbush/heckbush7.png index d9f44646..8e8229f8 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush7.png and b/objects/biome/sb_heck/heckbush/heckbush7.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush8.png b/objects/biome/sb_heck/heckbush/heckbush8.png index 3ca859bd..4d439c3c 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush8.png and b/objects/biome/sb_heck/heckbush/heckbush8.png differ diff --git a/objects/biome/sb_heck/heckbush/heckbush9.png b/objects/biome/sb_heck/heckbush/heckbush9.png index 1962bbe0..db5f9708 100644 Binary files a/objects/biome/sb_heck/heckbush/heckbush9.png and b/objects/biome/sb_heck/heckbush/heckbush9.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1.png b/objects/biome/sb_heck/hecklight1/hecklight1.png index 1546c7fd..6d9ca31e 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1.png and b/objects/biome/sb_heck/hecklight1/hecklight1.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1icon.png b/objects/biome/sb_heck/hecklight1/hecklight1icon.png index 849c97e0..da892253 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1icon.png and b/objects/biome/sb_heck/hecklight1/hecklight1icon.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1left.png b/objects/biome/sb_heck/hecklight1/hecklight1left.png index dd48855f..473df086 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1left.png and b/objects/biome/sb_heck/hecklight1/hecklight1left.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1lit.png b/objects/biome/sb_heck/hecklight1/hecklight1lit.png index 02e98d11..cea51966 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1lit.png and b/objects/biome/sb_heck/hecklight1/hecklight1lit.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1right.png b/objects/biome/sb_heck/hecklight1/hecklight1right.png index 4b47b4ab..5776662b 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1right.png and b/objects/biome/sb_heck/hecklight1/hecklight1right.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1rightlit.png b/objects/biome/sb_heck/hecklight1/hecklight1rightlit.png index 42817ee3..40595214 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1rightlit.png and b/objects/biome/sb_heck/hecklight1/hecklight1rightlit.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1top.png b/objects/biome/sb_heck/hecklight1/hecklight1top.png index 1267637e..c217d808 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1top.png and b/objects/biome/sb_heck/hecklight1/hecklight1top.png differ diff --git a/objects/biome/sb_heck/hecklight1/hecklight1toplit.png b/objects/biome/sb_heck/hecklight1/hecklight1toplit.png index eac9cddf..25fe2887 100644 Binary files a/objects/biome/sb_heck/hecklight1/hecklight1toplit.png and b/objects/biome/sb_heck/hecklight1/hecklight1toplit.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2back.png b/objects/biome/sb_heck/hecklight2/hecklight2back.png index 3691021b..b6215688 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2back.png and b/objects/biome/sb_heck/hecklight2/hecklight2back.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2backlit.png b/objects/biome/sb_heck/hecklight2/hecklight2backlit.png index 66c97f3d..5e00264a 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2backlit.png and b/objects/biome/sb_heck/hecklight2/hecklight2backlit.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2icon.png b/objects/biome/sb_heck/hecklight2/hecklight2icon.png index 8e191ae5..af42c08d 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2icon.png and b/objects/biome/sb_heck/hecklight2/hecklight2icon.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2leftlit.png b/objects/biome/sb_heck/hecklight2/hecklight2leftlit.png index 93c51e2e..47e1aff9 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2leftlit.png and b/objects/biome/sb_heck/hecklight2/hecklight2leftlit.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2lit.png b/objects/biome/sb_heck/hecklight2/hecklight2lit.png index 2da1c3c2..6ac4eeeb 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2lit.png and b/objects/biome/sb_heck/hecklight2/hecklight2lit.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2rightlit.png b/objects/biome/sb_heck/hecklight2/hecklight2rightlit.png index 2300487f..ff4f2165 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2rightlit.png and b/objects/biome/sb_heck/hecklight2/hecklight2rightlit.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2top.png b/objects/biome/sb_heck/hecklight2/hecklight2top.png index 64de1a61..3f4907c4 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2top.png and b/objects/biome/sb_heck/hecklight2/hecklight2top.png differ diff --git a/objects/biome/sb_heck/hecklight2/hecklight2toplit.png b/objects/biome/sb_heck/hecklight2/hecklight2toplit.png index c3961b02..60d70892 100644 Binary files a/objects/biome/sb_heck/hecklight2/hecklight2toplit.png and b/objects/biome/sb_heck/hecklight2/hecklight2toplit.png differ diff --git a/objects/biome/sb_heck/heckpillar1/heckpillar1.png b/objects/biome/sb_heck/heckpillar1/heckpillar1.png index 14e8c554..ae5532ca 100644 Binary files a/objects/biome/sb_heck/heckpillar1/heckpillar1.png and b/objects/biome/sb_heck/heckpillar1/heckpillar1.png differ diff --git a/objects/biome/sb_heck/heckpillar1/heckpillar1icon.png b/objects/biome/sb_heck/heckpillar1/heckpillar1icon.png index fd0e1029..18010c6f 100644 Binary files a/objects/biome/sb_heck/heckpillar1/heckpillar1icon.png and b/objects/biome/sb_heck/heckpillar1/heckpillar1icon.png differ diff --git a/objects/biome/sb_heck/heckpillar2/heckpillar2.png b/objects/biome/sb_heck/heckpillar2/heckpillar2.png index 7d897b6e..1f18823e 100644 Binary files a/objects/biome/sb_heck/heckpillar2/heckpillar2.png and b/objects/biome/sb_heck/heckpillar2/heckpillar2.png differ diff --git a/objects/biome/sb_heck/heckpillar2/heckpillar2icon.png b/objects/biome/sb_heck/heckpillar2/heckpillar2icon.png index 7a448644..63dc1051 100644 Binary files a/objects/biome/sb_heck/heckpillar2/heckpillar2icon.png and b/objects/biome/sb_heck/heckpillar2/heckpillar2icon.png differ diff --git a/objects/biome/sb_heck/hecksign/hecksign.png b/objects/biome/sb_heck/hecksign/hecksign.png index cd19857e..38d28dc0 100644 Binary files a/objects/biome/sb_heck/hecksign/hecksign.png and b/objects/biome/sb_heck/hecksign/hecksign.png differ diff --git a/objects/biome/sb_heck/hecksign/hecksignicon.png b/objects/biome/sb_heck/hecksign/hecksignicon.png index d2302abe..278d7956 100644 Binary files a/objects/biome/sb_heck/hecksign/hecksignicon.png and b/objects/biome/sb_heck/hecksign/hecksignicon.png differ diff --git a/objects/biome/tentacle/organictorch/organictorchright.png b/objects/biome/tentacle/organictorch/organictorchright.png index 8960eb22..4a2c0696 100644 Binary files a/objects/biome/tentacle/organictorch/organictorchright.png and b/objects/biome/tentacle/organictorch/organictorchright.png differ diff --git a/objects/bonus/tallchair/icon.png b/objects/bonus/tallchair/icon.png index 95ec8019..3cd12607 100644 Binary files a/objects/bonus/tallchair/icon.png and b/objects/bonus/tallchair/icon.png differ diff --git a/objects/bonus/tallchair/tallchair.object.patch b/objects/bonus/tallchair/tallchair.object.patch index c1dbe7b1..2dd3ba52 100644 --- a/objects/bonus/tallchair/tallchair.object.patch +++ b/objects/bonus/tallchair/tallchair.object.patch @@ -1,6 +1,6 @@ [ [{"op":"test","path":"/tooltipKind","inverse":true},{"op":"add","path":"/tooltipKind","value":0}], -[{"op":"replace","path":"/tooltipKind","value":"sb_tall"}], +[{"op":"replace","path":"/tooltipKind","value":"sb_object"}], [{"op":"test","path":"/breakDropOptions","inverse":true},{"op":"add","path":"/breakDropOptions","value":[]}], [{"op":"add","path":"/breakDropOptions/-","value":[["woodenchair",32,{}]]}], diff --git a/objects/boss/sb_decoyprincess.object b/objects/boss/sb_decoyprincess.object index cf6db1af..ddeb582a 100644 --- a/objects/boss/sb_decoyprincess.object +++ b/objects/boss/sb_decoyprincess.object @@ -1,46 +1,52 @@ { - "objectName" : "sb_decoyprincess", - "rarity" : "essential", - "description" : "A decoy princess. The perfect bait. ^gray;It could help obtain a ^#CEA867;dragon bone^gray;...^reset;", - "shortdescription" : "^#f00;Decoy Princess^reset;", - "race" : "generic", - "category" : "other", - "printable" : false, - "tooltipKind" : "sb_object", - "tooltipFields" : {"rarityLabel":"Critical"}, + "objectName": "sb_decoyprincess", + "rarity": "essential", + "description": "A decoy princess. The perfect bait. ^gray;It could help obtain a ^#CEA867;dragon bone^gray;...^reset;", + "shortdescription": "^#f00;Decoy Princess^reset;", + "race": "generic", + "category": "other", + "printable": false, + "tooltipKind": "sb_object", + "tooltipFields": { + "rarityLabel": "Critical" + }, - "price" : 500, - "apexDescription" : "This fake princess will serve as bait.", - "avianDescription" : "A cunning bait and switch.", - "floranDescription" : "Floran ssstab any beast that take princess!", - "glitchDescription" : "Proud. A cunning plan, this decoy.", - "humanDescription" : "This decoy will help me lure out a terrifying beast.", - "hylotlDescription" : "Perhaps luring a creature to me is ill-advised, but here goes.", - "novakidDescription" : "Ain't yer suppose ta tie 'er to a train track?", + "price": 500, + "apexDescription": "This fake princess will serve as bait.", + "avianDescription": "A cunning bait and switch.", + "floranDescription": "Floran ssstab any beast that take princess!", + "glitchDescription": "Proud. A cunning plan, this decoy.", + "humanDescription": "This decoy will help me lure out a terrifying beast.", + "hylotlDescription": "Perhaps luring a creature to me is ill-advised, but here goes.", + "novakidDescription": "Ain't yer suppose ta tie 'er to a train track?", -// "inventoryIcon" : "sb_decoyprincessicon.png", - "inventoryIcon" : [{"image":"sb_decoyprincessicon.png"},{"image":"/interface/sb_inventory/x.png"}], - "orientations" : [ - { - "dualImage" : "sb_decoyprincess.png", - "imagePosition" : [-16, 0], - "frames" : 1, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + // "inventoryIcon" : "sb_decoyprincessicon.png", + "inventoryIcon": [{ + "image": "sb_decoyprincessicon.png" + }, { + "image": "/interface/x.png" + } + ], + "orientations": [{ + "dualImage": "sb_decoyprincess.png", + "imagePosition": [-16, 0], + "frames": 1, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["bottom"] } ], - "animation" : "sb_ironbeacon2.animation", - "animationParts" : { - "beacon" : "sb_decoyprincess.png" + "animation": "sb_ironbeacon2.animation", + "animationParts": { + "beacon": "sb_decoyprincess.png" }, - "animationPosition" : [-16, 0], + "animationPosition": [-16, 0], - "scripts" : [ "sb_ironbeacon.lua" ], - "scriptDelta" : 5, - "hasAnimation" : true, - "badReception" : [0,"I should take it to the planet surface and see what it attracts."], - "bossType" : [["gleap",[0,30]]], //sb_dragonboss - "bossLevel" : 4 -} \ No newline at end of file + "scripts": ["sb_ironbeacon.lua"], + "scriptDelta": 5, + "hasAnimation": true, + "badReception": [0, "I should take it to the planet surface and see what it attracts."], + "bossType": [["gleap", [0, 30]]], //sb_dragonboss + "bossLevel": 4 +} diff --git a/objects/boss/sb_decoyprincess.png b/objects/boss/sb_decoyprincess.png index d1b05b79..05ea2d4a 100644 Binary files a/objects/boss/sb_decoyprincess.png and b/objects/boss/sb_decoyprincess.png differ diff --git a/objects/boss/sb_ironbeacon.png b/objects/boss/sb_ironbeacon.png index ad9f2fc7..f826b9dd 100644 Binary files a/objects/boss/sb_ironbeacon.png and b/objects/boss/sb_ironbeacon.png differ diff --git a/objects/boss/sb_ironbeaconicon.png b/objects/boss/sb_ironbeaconicon.png index 9a0c0ddf..22356332 100644 Binary files a/objects/boss/sb_ironbeaconicon.png and b/objects/boss/sb_ironbeaconicon.png differ diff --git a/objects/boss/sb_peanutbuttericon.png b/objects/boss/sb_peanutbuttericon.png index 4d04ae91..7349b052 100644 Binary files a/objects/boss/sb_peanutbuttericon.png and b/objects/boss/sb_peanutbuttericon.png differ diff --git a/objects/boss/sb_robothead.png b/objects/boss/sb_robothead.png index 2dd32b92..98413496 100644 Binary files a/objects/boss/sb_robothead.png and b/objects/boss/sb_robothead.png differ diff --git a/objects/bugs/sb_moondancer/moondancer.png b/objects/bugs/sb_moondancer/moondancer.png index 3463e249..bc531297 100644 Binary files a/objects/bugs/sb_moondancer/moondancer.png and b/objects/bugs/sb_moondancer/moondancer.png differ diff --git a/objects/bugs/sb_moondancer/moondancerlit.png b/objects/bugs/sb_moondancer/moondancerlit.png index b8161ed0..3c75f73c 100644 Binary files a/objects/bugs/sb_moondancer/moondancerlit.png and b/objects/bugs/sb_moondancer/moondancerlit.png differ diff --git a/objects/clues/glitch/glitchscribe/glitchscribe.object.patch b/objects/clues/glitch/glitchscribe/glitchscribe.object.patch new file mode 100644 index 00000000..62184d3b --- /dev/null +++ b/objects/clues/glitch/glitchscribe/glitchscribe.object.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/slotCount","value":16}, +{"op":"replace","path":"/slotCount","value":24}] +] \ No newline at end of file diff --git a/objects/crafting/railcraftingtable/railcraftingtable.object.patch b/objects/crafting/railcraftingtable/railcraftingtable.object.patch new file mode 100644 index 00000000..ed6d97ba --- /dev/null +++ b/objects/crafting/railcraftingtable/railcraftingtable.object.patch @@ -0,0 +1,4 @@ +[ + {"op":"replace","path":"/interactData/config","value":"/interface/windowconfig/sb_railcrafting.config"}, + {"op":"add","path":"/interactData/filter/-","value":"sb_skyrailtable"} +] \ No newline at end of file diff --git a/objects/crafting/sb_acceleratortable/acceleratortable.png b/objects/crafting/sb_acceleratortable/acceleratortable.png deleted file mode 100644 index 93e05753..00000000 Binary files a/objects/crafting/sb_acceleratortable/acceleratortable.png and /dev/null differ diff --git a/objects/crafting/sb_acceleratortable/acceleratortableicon.png b/objects/crafting/sb_acceleratortable/acceleratortableicon.png deleted file mode 100644 index 45d851bf..00000000 Binary files a/objects/crafting/sb_acceleratortable/acceleratortableicon.png and /dev/null differ diff --git a/objects/crafting/sb_acceleratortable/acceleratortablelit.png b/objects/crafting/sb_acceleratortable/acceleratortablelit.png deleted file mode 100644 index 50af494b..00000000 Binary files a/objects/crafting/sb_acceleratortable/acceleratortablelit.png and /dev/null differ diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnace.png b/objects/crafting/sb_alloyfurnace/alloyfurnace.png deleted file mode 100644 index 19add8ca..00000000 Binary files a/objects/crafting/sb_alloyfurnace/alloyfurnace.png and /dev/null differ diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnaceicon.png b/objects/crafting/sb_alloyfurnace/alloyfurnaceicon.png deleted file mode 100644 index a271c4ef..00000000 Binary files a/objects/crafting/sb_alloyfurnace/alloyfurnaceicon.png and /dev/null differ diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnacelit.png b/objects/crafting/sb_alloyfurnace/alloyfurnacelit.png deleted file mode 100644 index 68495071..00000000 Binary files a/objects/crafting/sb_alloyfurnace/alloyfurnacelit.png and /dev/null differ diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnacelit2.png b/objects/crafting/sb_alloyfurnace/alloyfurnacelit2.png deleted file mode 100644 index 68495071..00000000 Binary files a/objects/crafting/sb_alloyfurnace/alloyfurnacelit2.png and /dev/null differ diff --git a/objects/crafting/sb_capturestation/capturestation.object b/objects/crafting/sb_capturestation/capturestation.object deleted file mode 100644 index f66c496f..00000000 --- a/objects/crafting/sb_capturestation/capturestation.object +++ /dev/null @@ -1,43 +0,0 @@ -{ - "objectName" : "sb_capturestation", - "rarity" : "legendary", - "tooltipKind" : "sb_object", - "printable" : false, - "objectType" : "container", - "description" : "Power up your monsters here!", - "shortdescription" : "^orange;Monster Lab^reset;", - "race" : "generic", - "category" : "crafting", - "price" : 2000, - "openSounds" : [ "/assetmissing.wav" ], - "slotCount" : 1, - "frameCooldown" : 5, - "uiConfig" : "/interface/scripted/sb_petstation/petstation.config", - "autoCloseCooldown" : 3600, - - - "apexDescription" : "I can craft capture pods here.", - "avianDescription" : "This will allow me to craft capture pods.", - "floranDescription" : "Floran capture creatures sssometimes!", - "glitchDescription" : "Statement. With this, I can craft capture pods.", - "humanDescription" : "Cool, maybe I can capture an army of angry bees.", - "hylotlDescription" : "Capturing creatures is wrong, and yet needs must.", - "novakidDescription" : "Tamin' wild beasts will be child's play with capture pods.", - -// "inventoryIcon" : "capturestationicon.png", - "inventoryIcon" : [{"image":"capturestationicon.png"},{"image":"/interface/sb_inventory/x.png"}], - - "orientations" : [ - { - "dualImage" : "capturestation.png:.", - - "imagePosition" : [-8, -8], - "frames" : 8, - "animationCycle" : 1.0, - - "spaceScan" : 0.1, - "anchors" : [ "background" ] - - } - ] -} diff --git a/objects/crafting/sb_capturestation/capturestation.png b/objects/crafting/sb_capturestation/capturestation.png deleted file mode 100644 index 7f2ae3be..00000000 Binary files a/objects/crafting/sb_capturestation/capturestation.png and /dev/null differ diff --git a/objects/crafting/sb_capturestation/capturestationicon.png b/objects/crafting/sb_capturestation/capturestationicon.png deleted file mode 100644 index e9aa985e..00000000 Binary files a/objects/crafting/sb_capturestation/capturestationicon.png and /dev/null differ diff --git a/objects/crafting/sb_coffeemachine/coffeemachine.frames b/objects/crafting/sb_coffeemachine/coffeemachine.frames deleted file mode 100644 index 0212438f..00000000 --- a/objects/crafting/sb_coffeemachine/coffeemachine.frames +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [1, 1], - "names" : [ - [ "default" ] - ] - - } -} diff --git a/objects/crafting/sb_coffeemachine/coffeemachine.object b/objects/crafting/sb_coffeemachine/coffeemachine.object deleted file mode 100644 index eb4fa2a3..00000000 --- a/objects/crafting/sb_coffeemachine/coffeemachine.object +++ /dev/null @@ -1,45 +0,0 @@ -{ - "objectName" : "sb_coffeemachine", - "colonyTags" : ["outpost","cooking"], - "rarity" : "Uncommon", - "description" : "A coffee machine, for the perfect pick-me-up.", - "shortdescription" : "^orange;Coffee Machine^reset;", - "category" : "A cup of the good stuff", - "race" : "generic", - "tooltipKind" : "sb_object", - "price" : 65, - "tooltipFields" : {"subtitle":"Crafting Station"}, - "learnBlueprintsOnPickup" : ["sb_liquidcoffee"], - "objectType" : "container", - - "apexDescription" : "This machine produces a black, bitter liquid.", - "avianDescription" : "I like the smell of this.", - "floranDescription" : "Floran told this is called coffin!", - "glitchDescription" : "Statement. A coffee machine.", - "humanDescription" : "Damn fine coffee.", - "hylotlDescription" : "A bitter, unpleasant drink.", - "novakidDescription" : "Black, no milk, no sugar. Don't mind if I do!", - - "recipeGroup" : "sb_coffee", - "openSounds" : [ "/sfx/objects/chest_medium_open.ogg" ], - "slotCount" : 2, - "uiConfig" : "/interface/sb_objectcrafting/coffeemachine.config", - "frameCooldown" : 5, - "autoCloseCooldown" : 3600, - - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "dualImage" : "coffeemachine.png:", - - "imagePosition" : [-8, 0], - "frames" : 1, - "animationCycle" : 1.0, - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - - } - ] -} diff --git a/objects/crafting/sb_coffeemachine/coffeemachine.png b/objects/crafting/sb_coffeemachine/coffeemachine.png deleted file mode 100644 index 291ff5f5..00000000 Binary files a/objects/crafting/sb_coffeemachine/coffeemachine.png and /dev/null differ diff --git a/objects/crafting/sb_coffeemachine/icon.png b/objects/crafting/sb_coffeemachine/icon.png deleted file mode 100644 index 0aa26e48..00000000 Binary files a/objects/crafting/sb_coffeemachine/icon.png and /dev/null differ diff --git a/objects/crafting/sb_cookingstation/cookingstation.object b/objects/crafting/sb_cookingstation/cookingstation.object index 6448ee47..77a13551 100644 --- a/objects/crafting/sb_cookingstation/cookingstation.object +++ b/objects/crafting/sb_cookingstation/cookingstation.object @@ -1,42 +1,41 @@ { - "objectName" : "sb_cookingstation", - "colonyTags" : ["crafting","cooking"], - "printable" : false, - "price" : 1300, - "rarity" : "rare", - "interactAction" : "OpenCraftingInterface", - "interactData" : { - "config" : "/interface/windowconfig/sb_craftingfood2.config", - "filter" : ["sb_kitchen", "craftingfood", "campfire", "sb_coffee"] + "objectName": "sb_cookingstation", + "colonyTags": ["crafting", "cooking"], + "printable": false, + "price": 1300, + "rarity": "rare", + "interactAction": "OpenCraftingInterface", + "interactData": { + "config": "/interface/windowconfig/sb_craftingfood.config", + "filter": ["sb_kitchen", "craftingfood", "campfire", "sb_coffee"] }, - "description" : "The best place to cook. It allows you to filter food effects.", - "shortdescription" : "^orange;Cooking Station^reset;", - "race" : "generic", - "category" : "crafting", - "tooltipKind" : "sb_object", + "description": "The best place to cook. It allows you to filter food effects.", + "shortdescription": "^orange;Cooking Station^reset;", + "race": "generic", + "category": "crafting", + "tooltipKind": "sb_object", - "apexDescription" : "This station contains everything one could need to create almost any dish.", - "avianDescription" : "Almost any Avian dish could be prepared here. And many non-Avian dishes too, for that matter!", - "floranDescription" : "Floran prepare food with bare handsss. But ssstation ussseful.", - "glitchDescription" : "Inspired. Let's create food!", - "humanDescription" : "A chef's station. A whole bunch of different implements for making food...", - "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.", + "apexDescription": "This station contains everything one could need to create almost any dish.", + "avianDescription": "Almost any Avian dish could be prepared here. And many non-Avian dishes too, for that matter!", + "floranDescription": "Floran prepare food with bare handsss. But ssstation ussseful.", + "glitchDescription": "Inspired. Let's create food!", + "humanDescription": "A chef's station. A whole bunch of different implements for making food...", + "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", - "orientations" : [ - { - "dualImage" : "cookingstation.png:", + "inventoryIcon": "cookingstationicon.png", + "orientations": [{ + "dualImage": "cookingstation.png:", - "imagePosition" : [-16, 0], - "frames" : 1, - "animationCycle" : 1.0, + "imagePosition": [-16, 0], + "frames": 1, + "animationCycle": 1.0, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + "spaceScan": 0.1, + "anchors": ["bottom"] } ], - "npcToy" : {} + "npcToy": {} } diff --git a/objects/crafting/sb_cookingstation/cookingstation.png b/objects/crafting/sb_cookingstation/cookingstation.png index 04d45404..97c25db6 100644 Binary files a/objects/crafting/sb_cookingstation/cookingstation.png and b/objects/crafting/sb_cookingstation/cookingstation.png differ diff --git a/objects/crafting/sb_cookingstation/cookingstationicon.png b/objects/crafting/sb_cookingstation/cookingstationicon.png index cd61e9b7..d30a7ab3 100644 Binary files a/objects/crafting/sb_cookingstation/cookingstationicon.png and b/objects/crafting/sb_cookingstation/cookingstationicon.png differ diff --git a/objects/crafting/sb_ironanvil/ironanvil.png b/objects/crafting/sb_ironanvil/ironanvil.png deleted file mode 100644 index 4300a379..00000000 Binary files a/objects/crafting/sb_ironanvil/ironanvil.png and /dev/null differ diff --git a/objects/crafting/sb_ironanvil/ironanvilicon.png b/objects/crafting/sb_ironanvil/ironanvilicon.png deleted file mode 100644 index 39a31082..00000000 Binary files a/objects/crafting/sb_ironanvil/ironanvilicon.png and /dev/null differ diff --git a/objects/crafting/sb_ironcraftingtable/ironcraftingtable.png b/objects/crafting/sb_ironcraftingtable/ironcraftingtable.png index 2d26d78b..d970f172 100644 Binary files a/objects/crafting/sb_ironcraftingtable/ironcraftingtable.png and b/objects/crafting/sb_ironcraftingtable/ironcraftingtable.png differ diff --git a/objects/crafting/sb_ironcraftingtable/ironcraftingtableicon.png b/objects/crafting/sb_ironcraftingtable/ironcraftingtableicon.png index 448109f6..67965fd0 100644 Binary files a/objects/crafting/sb_ironcraftingtable/ironcraftingtableicon.png and b/objects/crafting/sb_ironcraftingtable/ironcraftingtableicon.png differ diff --git a/objects/crafting/sb_manipulatortable/manipulatortable.object b/objects/crafting/sb_manipulatortable/manipulatortable.object deleted file mode 100644 index 6a421cd2..00000000 --- a/objects/crafting/sb_manipulatortable/manipulatortable.object +++ /dev/null @@ -1,80 +0,0 @@ -{ - "objectName" : "sb_manipulatortable", - "colonyTags" : ["crafting","electronic","rubium"], - "rarity" : "Legendary", - "tooltipKind" : "sb_object", - "interactAction" : "OpenCraftingInterface", - "interactData" : { - "config" : "/interface/windowconfig/craftinganvil.config", - "paneLayoutOverride" : { - "windowtitle" : { - "title" : "MANIPULATOR'S TABLE", - "subtitle" : "Raw power at your fingertips!", - "icon" : { - "file" : "/interface/sb_crafting/craftingicons.png:manipulatortable" - } - } - }, - "craftingSound" : "/sfx/interface/crafting_furnacetech.ogg", - "filter" : ["craftinganvil","craftinganvil2","craftinganvil3","craftingmanipulator","sb_manipulatortable", "sb_advancedanvil","sb_scifianvil" ], - "initialRecipeUnlocks" : ["sb_apexsteelstaff1","sb_apexsteelstaff2","sb_aviancrystalstaff1","sb_aviancrystalstaff2","sb_floranleafstaff1","sb_floranleafstaff2","sb_glitchglitchstaff1","sb_glitchglitchstaff2","sb_humanplasmastaff1","sb_humanplasmastaff2","sb_hylotlaquastaff1","sb_hylotlaquastaff2","sb_novakidlightstaff1","sb_novakidlightstaff2","sb_monkeynut","sb_deadbolt"] - }, - "printable" : false, - "description" : "Craft ranged weapons of immense power and armor with deep energy reserves.", - "shortdescription" : "^orange;Manipulator's Table^reset;", - "race" : "generic", - "category" : "crafting", - "price" : 600, - - "lightColor" : [107, 131, 179], - - "flickerPeriod" : 0.3, - "flickerMinIntensity" : 0.95, - "flickerMaxIntensity" : 1, - "flickerPeriodVariance" : 0, - "flickerIntensityVariance" : 0.025, - - "apexDescription" : "The equipment I can make here would provide a lot of destructive power at the cost of my defence.", - "avianDescription" : "A manipulator's crafting table. They are masters of pure destructive power, but tend to be frail themselves.", - "floranDescription" : "Ssstaff weapon very powerful, but Floran need lotsss of energy for it.", - "glitchDescription" : "Observant. The armours I can make here won't be very strong, but they make up for it with massive energy reserves.", - "humanDescription" : "If having deep energy reserves is my highest priority, the gear I can craft on this table would be best.", - "hylotlDescription" : "With the equipment I can craft on this table, I could unleash terrible destructive power.", - "novakidDescription" : "I can make myself some terrifyingly powerful equipment from this here station.", - - - "inventoryIcon" : "manipulatortableicon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "manipulatortable.png:.", "fullbright" : true }, { "image" : "manipulatortablelit.png:." } ], - - "imagePosition" : [-24, 0], - "frames" : 3, - "animationCycle" : 0.3, - - "direction" : "left", - "flipImages" : true, - - "lightPosition" : [ -1, 1], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - - }, - { - "imageLayers" : [ { "image" : "manipulatortable.png:.", "fullbright" : true }, { "image" : "manipulatortablelit.png:." } ], - - "imagePosition" : [-24, 0], - "frames" : 3, - "animationCycle" : 0.3, - - "direction" : "right", - - "lightPosition" : [ 0, 1], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - - } - ] -} diff --git a/objects/crafting/sb_manipulatortable/manipulatortable.png b/objects/crafting/sb_manipulatortable/manipulatortable.png deleted file mode 100644 index 312733f4..00000000 Binary files a/objects/crafting/sb_manipulatortable/manipulatortable.png and /dev/null differ diff --git a/objects/crafting/sb_manipulatortable/manipulatortablelit.png b/objects/crafting/sb_manipulatortable/manipulatortablelit.png deleted file mode 100644 index 3f58798d..00000000 Binary files a/objects/crafting/sb_manipulatortable/manipulatortablelit.png and /dev/null differ diff --git a/objects/crafting/sb_metalworkstation/metalworkstation.png b/objects/crafting/sb_metalworkstation/metalworkstation.png deleted file mode 100644 index 4b86f019..00000000 Binary files a/objects/crafting/sb_metalworkstation/metalworkstation.png and /dev/null differ diff --git a/objects/crafting/sb_metalworkstation/metalworkstationicon.png b/objects/crafting/sb_metalworkstation/metalworkstationicon.png deleted file mode 100644 index 023a4af4..00000000 Binary files a/objects/crafting/sb_metalworkstation/metalworkstationicon.png and /dev/null differ diff --git a/objects/crafting/sb_metalworkstation/metalworkstationlit.png b/objects/crafting/sb_metalworkstation/metalworkstationlit.png deleted file mode 100644 index 6cb7af7b..00000000 Binary files a/objects/crafting/sb_metalworkstation/metalworkstationlit.png and /dev/null differ diff --git a/objects/crafting/sb_nanostove/nanostove.frames b/objects/crafting/sb_nanostove/nanostove.frames deleted file mode 100644 index bcd1e0ec..00000000 --- a/objects/crafting/sb_nanostove/nanostove.frames +++ /dev/null @@ -1,13 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [4, 1], - "names" : [ - [ "default.0", "default.1", "default.2", "default.3" ] - ] - }, - - "aliases" : { - "default.default" : "default.0" - } -} diff --git a/objects/crafting/sb_nanostove/nanostove.object b/objects/crafting/sb_nanostove/nanostove.object deleted file mode 100644 index 775798d9..00000000 --- a/objects/crafting/sb_nanostove/nanostove.object +++ /dev/null @@ -1,64 +0,0 @@ -{ - "objectName" : "sb_nanostove", - "colonyTags" : ["cooking"], - "rarity" : "Uncommon", - "description" : "Provides exceptional heat and a good place to cook.", - "shortdescription" : "^orange;Nanostove^reset;", - "category" : "Hi-tech cooking", - "race" : "generic", - "tooltipKind" : "sb_object", - "tooltipFields" : {"subtitle":"Crafting Station"}, - "price" : 90, - "objectType" : "container", - - "maximumLiquidLevel" : 0.2, - - "apexDescription" : "A portable, eco-friendly camping stove.", - "avianDescription" : "A handy camping stove. No more carbon footprint!", - "floranDescription" : "Floran fear ssstove will burn Floran. Floran use anyway.", - "glitchDescription" : "Admiration. This stove conserves a lot of energy.", - "humanDescription" : "Awesome, it's like camping in the future!", - "hylotlDescription" : "A garish, yet practical camping stove.", - "novakidDescription" : "A handy lil stove, but you can't beat a real campfire.", - - "lightColor" : [125, 143, 179], - - "flickerPeriod" : 0.3, - "flickerMinIntensity" : 0.95, - "flickerMaxIntensity" : 1, - "flickerPeriodVariance" : 0.075, - "flickerIntensityVariance" : 0.025, - - "inventoryIcon" : "nanostoveicon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "nanostove.png:.", "fullbright" : true }, { "image" : "nanostovelit.png:." } ], - "direction" : "left", - "flipImages" : true, - - "imagePosition" : [-8, 0], - "frames" : 4, - "animationCycle" : 0.4, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - }, - { - "imageLayers" : [ { "image" : "nanostove.png:.", "fullbright" : true }, { "image" : "nanostovelit.png:." } ], - "direction" : "right", - - "imagePosition" : [-8, 0], - "frames" : 4, - "animationCycle" : 0.4, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - } - ], - - "soundEffect" : "/sfx/objects/campfire.ogg", - "recipeGroup" : "campfire", - "openSounds" : [ "/sfx/objects/campfire_use.ogg" ], - "slotCount" : 2, - "uiConfig" : "/interface/sb_objectcrafting/campfire.config", - "frameCooldown" : 5, - "autoCloseCooldown" : 3600 -} \ No newline at end of file diff --git a/objects/crafting/sb_nanostove/nanostove.png b/objects/crafting/sb_nanostove/nanostove.png deleted file mode 100644 index 285bf79a..00000000 Binary files a/objects/crafting/sb_nanostove/nanostove.png and /dev/null differ diff --git a/objects/crafting/sb_nanostove/nanostoveicon.png b/objects/crafting/sb_nanostove/nanostoveicon.png deleted file mode 100644 index 85095979..00000000 Binary files a/objects/crafting/sb_nanostove/nanostoveicon.png and /dev/null differ diff --git a/objects/crafting/sb_nanostove/nanostovelit.frames b/objects/crafting/sb_nanostove/nanostovelit.frames deleted file mode 100644 index bcd1e0ec..00000000 --- a/objects/crafting/sb_nanostove/nanostovelit.frames +++ /dev/null @@ -1,13 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [4, 1], - "names" : [ - [ "default.0", "default.1", "default.2", "default.3" ] - ] - }, - - "aliases" : { - "default.default" : "default.0" - } -} diff --git a/objects/crafting/sb_nanostove/nanostovelit.png b/objects/crafting/sb_nanostove/nanostovelit.png deleted file mode 100644 index 76b8fcf5..00000000 Binary files a/objects/crafting/sb_nanostove/nanostovelit.png and /dev/null differ diff --git a/objects/crafting/sb_acceleratortable/acceleratortable.object b/objects/crafting/sb_old/sb_acceleratortable/acceleratortable.object similarity index 92% rename from objects/crafting/sb_acceleratortable/acceleratortable.object rename to objects/crafting/sb_old/sb_acceleratortable/acceleratortable.object index 102de234..e7b5f81b 100644 --- a/objects/crafting/sb_acceleratortable/acceleratortable.object +++ b/objects/crafting/sb_old/sb_acceleratortable/acceleratortable.object @@ -15,7 +15,6 @@ } } }, - "initialRecipeUnlocks": ["sb_aegisaltpistol", "sb_aegisaltrifle", "sb_aegisaltshotgun", "sb_aegisaltbow", "sb_feroziumrifle", "sb_feroziumrocket", "sb_feroziumsniper", "sb_feroziumpistol", "sb_feroziumbow"], "filter": ["craftinganvil", "craftinganvil2", "craftinganvil3", "craftingaccelerator", "sb_acceleratortable", "sb_advancedanvil", "sb_scifianvil"] }, "printable": false, diff --git a/objects/crafting/sb_old/sb_acceleratortable/acceleratortable.png b/objects/crafting/sb_old/sb_acceleratortable/acceleratortable.png new file mode 100644 index 00000000..7eb32be4 Binary files /dev/null and b/objects/crafting/sb_old/sb_acceleratortable/acceleratortable.png differ diff --git a/objects/crafting/sb_old/sb_acceleratortable/acceleratortableicon.png b/objects/crafting/sb_old/sb_acceleratortable/acceleratortableicon.png new file mode 100644 index 00000000..ecda1551 Binary files /dev/null and b/objects/crafting/sb_old/sb_acceleratortable/acceleratortableicon.png differ diff --git a/objects/crafting/sb_old/sb_acceleratortable/acceleratortablelit.png b/objects/crafting/sb_old/sb_acceleratortable/acceleratortablelit.png new file mode 100644 index 00000000..2de48c58 Binary files /dev/null and b/objects/crafting/sb_old/sb_acceleratortable/acceleratortablelit.png differ diff --git a/objects/crafting/sb_acceleratortable/default.frames b/objects/crafting/sb_old/sb_acceleratortable/default.frames similarity index 100% rename from objects/crafting/sb_acceleratortable/default.frames rename to objects/crafting/sb_old/sb_acceleratortable/default.frames diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnace.frames b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.frames similarity index 100% rename from objects/crafting/sb_alloyfurnace/alloyfurnace.frames rename to objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.frames diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnace.object b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.object similarity index 100% rename from objects/crafting/sb_alloyfurnace/alloyfurnace.object rename to objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.object diff --git a/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.png b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.png new file mode 100644 index 00000000..9de9d7ef Binary files /dev/null and b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnace.png differ diff --git a/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnaceicon.png b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnaceicon.png new file mode 100644 index 00000000..741839f3 Binary files /dev/null and b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnaceicon.png differ diff --git a/objects/crafting/sb_alloyfurnace/alloyfurnacelit.frames b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit.frames similarity index 100% rename from objects/crafting/sb_alloyfurnace/alloyfurnacelit.frames rename to objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit.frames diff --git a/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit.png b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit.png new file mode 100644 index 00000000..db7363a6 Binary files /dev/null and b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit.png differ diff --git a/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit2.png b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit2.png new file mode 100644 index 00000000..db7363a6 Binary files /dev/null and b/objects/crafting/sb_old/sb_alloyfurnace/alloyfurnacelit2.png differ diff --git a/objects/crafting/sb_capturestation/capturestation.frames b/objects/crafting/sb_old/sb_capturestation/capturestation.frames similarity index 100% rename from objects/crafting/sb_capturestation/capturestation.frames rename to objects/crafting/sb_old/sb_capturestation/capturestation.frames diff --git a/objects/crafting/sb_old/sb_capturestation/capturestation.object b/objects/crafting/sb_old/sb_capturestation/capturestation.object new file mode 100644 index 00000000..592b926d --- /dev/null +++ b/objects/crafting/sb_old/sb_capturestation/capturestation.object @@ -0,0 +1,44 @@ +{ + //See that cyan thing in the image? That's a pod for a capture pod. I think we could make this a scripted interface that takes some ancient bones, a brain, cell materia, then spit out a custom pod. Smash fossils into ancient bones and use those. Yes I know fossils arent bones + "objectName": "sb_capturestation", + "rarity": "legendary", + "tooltipKind": "sb_object", + "printable": false, + "objectType": "container", + "description": "Power up your monsters here!", + "shortdescription": "^orange;Monster Lab^reset;", + "race": "generic", + "category": "crafting", + "price": 2000, + "openSounds": ["/assetmissing.wav"], + "slotCount": 1, + "frameCooldown": 5, + "uiConfig": "/interface/scripted/sb_petstation/petstation.config", + "autoCloseCooldown": 3600, + + "apexDescription": "I can craft capture pods here.", + "avianDescription": "This will allow me to craft capture pods.", + "floranDescription": "Floran capture creatures sssometimes!", + "glitchDescription": "Statement. With this, I can craft capture pods.", + "humanDescription": "Cool, maybe I can capture an army of angry bees.", + "hylotlDescription": "Capturing creatures is wrong, and yet needs must.", + "novakidDescription": "Tamin' wild beasts will be child's play with capture pods.", + + // "inventoryIcon" : "capturestationicon.png", + "inventoryIcon": [{ + "image": "capturestationicon.png" + }, { + "image": "/interface/x.png" + } + ], + + "orientations": [{ + "dualImage": "capturestation.png:.", + "imagePosition": [-8, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] + } + ] +} diff --git a/objects/crafting/sb_old/sb_capturestation/capturestation.png b/objects/crafting/sb_old/sb_capturestation/capturestation.png new file mode 100644 index 00000000..e3aefb75 Binary files /dev/null and b/objects/crafting/sb_old/sb_capturestation/capturestation.png differ diff --git a/objects/crafting/sb_old/sb_capturestation/capturestationicon.png b/objects/crafting/sb_old/sb_capturestation/capturestationicon.png new file mode 100644 index 00000000..8ac52df7 Binary files /dev/null and b/objects/crafting/sb_old/sb_capturestation/capturestationicon.png differ diff --git a/objects/crafting/sb_ironanvil/ironanvil.frames b/objects/crafting/sb_old/sb_ironanvil/ironanvil.frames similarity index 100% rename from objects/crafting/sb_ironanvil/ironanvil.frames rename to objects/crafting/sb_old/sb_ironanvil/ironanvil.frames diff --git a/objects/crafting/sb_ironanvil/ironanvil.object b/objects/crafting/sb_old/sb_ironanvil/ironanvil.object similarity index 100% rename from objects/crafting/sb_ironanvil/ironanvil.object rename to objects/crafting/sb_old/sb_ironanvil/ironanvil.object diff --git a/objects/crafting/sb_old/sb_ironanvil/ironanvil.png b/objects/crafting/sb_old/sb_ironanvil/ironanvil.png new file mode 100644 index 00000000..db3e87d9 Binary files /dev/null and b/objects/crafting/sb_old/sb_ironanvil/ironanvil.png differ diff --git a/objects/crafting/sb_old/sb_ironanvil/ironanvilicon.png b/objects/crafting/sb_old/sb_ironanvil/ironanvilicon.png new file mode 100644 index 00000000..f79d9101 Binary files /dev/null and b/objects/crafting/sb_old/sb_ironanvil/ironanvilicon.png differ diff --git a/objects/crafting/sb_manipulatortable/default.frames b/objects/crafting/sb_old/sb_manipulatortable/default.frames similarity index 100% rename from objects/crafting/sb_manipulatortable/default.frames rename to objects/crafting/sb_old/sb_manipulatortable/default.frames diff --git a/objects/crafting/sb_old/sb_manipulatortable/manipulatortable.object b/objects/crafting/sb_old/sb_manipulatortable/manipulatortable.object new file mode 100644 index 00000000..eca99561 --- /dev/null +++ b/objects/crafting/sb_old/sb_manipulatortable/manipulatortable.object @@ -0,0 +1,88 @@ +{ + "objectName": "sb_manipulatortable", + "colonyTags": ["crafting", "electronic", "rubium"], + "rarity": "Legendary", + "tooltipKind": "sb_object", + "interactAction": "OpenCraftingInterface", + "interactData": { + "config": "/interface/windowconfig/craftinganvil.config", + "paneLayoutOverride": { + "windowtitle": { + "title": "MANIPULATOR'S TABLE", + "subtitle": "Raw power at your fingertips!", + "icon": { + "file": "/interface/sb_crafting/craftingicons.png:manipulatortable" + } + } + }, + "craftingSound": "/sfx/interface/crafting_furnacetech.ogg", + "filter": ["craftinganvil", "craftinganvil2", "craftinganvil3", "craftingmanipulator", "sb_manipulatortable", "sb_advancedanvil", "sb_scifianvil"] + }, + "printable": false, + "description": "Craft ranged weapons of immense power and armor with deep energy reserves.", + "shortdescription": "^orange;Manipulator's Table^reset;", + "race": "generic", + "category": "crafting", + "price": 600, + + "lightColor": [107, 131, 179], + + "flickerPeriod": 0.3, + "flickerMinIntensity": 0.95, + "flickerMaxIntensity": 1, + "flickerPeriodVariance": 0, + "flickerIntensityVariance": 0.025, + + "apexDescription": "The equipment I can make here would provide a lot of destructive power at the cost of my defence.", + "avianDescription": "A manipulator's crafting table. They are masters of pure destructive power, but tend to be frail themselves.", + "floranDescription": "Ssstaff weapon very powerful, but Floran need lotsss of energy for it.", + "glitchDescription": "Observant. The armours I can make here won't be very strong, but they make up for it with massive energy reserves.", + "humanDescription": "If having deep energy reserves is my highest priority, the gear I can craft on this table would be best.", + "hylotlDescription": "With the equipment I can craft on this table, I could unleash terrible destructive power.", + "novakidDescription": "I can make myself some terrifyingly powerful equipment from this here station.", + + "inventoryIcon": "manipulatortableicon.png", + "orientations": [{ + "imageLayers": [{ + "image": "manipulatortable.png:.", + "fullbright": true + }, { + "image": "manipulatortablelit.png:." + } + ], + + "imagePosition": [-24, 0], + "frames": 3, + "animationCycle": 0.3, + + "direction": "left", + "flipImages": true, + + "lightPosition": [-1, 1], + + "spaceScan": 0.1, + "anchors": ["bottom"] + + }, { + "imageLayers": [{ + "image": "manipulatortable.png:.", + "fullbright": true + }, { + "image": "manipulatortablelit.png:." + } + ], + + "imagePosition": [-24, 0], + "frames": 3, + "animationCycle": 0.3, + + "direction": "right", + + "lightPosition": [0, 1], + + "spaceScan": 0.1, + "anchors": ["bottom"] + + } + ] +} diff --git a/objects/crafting/sb_old/sb_manipulatortable/manipulatortable.png b/objects/crafting/sb_old/sb_manipulatortable/manipulatortable.png new file mode 100644 index 00000000..33652387 Binary files /dev/null and b/objects/crafting/sb_old/sb_manipulatortable/manipulatortable.png differ diff --git a/objects/crafting/sb_manipulatortable/manipulatortableicon.png b/objects/crafting/sb_old/sb_manipulatortable/manipulatortableicon.png similarity index 100% rename from objects/crafting/sb_manipulatortable/manipulatortableicon.png rename to objects/crafting/sb_old/sb_manipulatortable/manipulatortableicon.png diff --git a/objects/crafting/sb_old/sb_manipulatortable/manipulatortablelit.png b/objects/crafting/sb_old/sb_manipulatortable/manipulatortablelit.png new file mode 100644 index 00000000..71bf07e0 Binary files /dev/null and b/objects/crafting/sb_old/sb_manipulatortable/manipulatortablelit.png differ diff --git a/objects/crafting/sb_metalworkstation/cheater.object b/objects/crafting/sb_old/sb_metalworkstation/cheater.object similarity index 100% rename from objects/crafting/sb_metalworkstation/cheater.object rename to objects/crafting/sb_old/sb_metalworkstation/cheater.object diff --git a/objects/crafting/sb_metalworkstation/default.frames b/objects/crafting/sb_old/sb_metalworkstation/default.frames similarity index 100% rename from objects/crafting/sb_metalworkstation/default.frames rename to objects/crafting/sb_old/sb_metalworkstation/default.frames diff --git a/objects/crafting/sb_metalworkstation/metalworkstation.object b/objects/crafting/sb_old/sb_metalworkstation/metalworkstation.object similarity index 100% rename from objects/crafting/sb_metalworkstation/metalworkstation.object rename to objects/crafting/sb_old/sb_metalworkstation/metalworkstation.object diff --git a/objects/crafting/sb_old/sb_metalworkstation/metalworkstation.png b/objects/crafting/sb_old/sb_metalworkstation/metalworkstation.png new file mode 100644 index 00000000..280893b5 Binary files /dev/null and b/objects/crafting/sb_old/sb_metalworkstation/metalworkstation.png differ diff --git a/objects/crafting/sb_old/sb_metalworkstation/metalworkstationicon.png b/objects/crafting/sb_old/sb_metalworkstation/metalworkstationicon.png new file mode 100644 index 00000000..1991794e Binary files /dev/null and b/objects/crafting/sb_old/sb_metalworkstation/metalworkstationicon.png differ diff --git a/objects/crafting/sb_old/sb_metalworkstation/metalworkstationlit.png b/objects/crafting/sb_old/sb_metalworkstation/metalworkstationlit.png new file mode 100644 index 00000000..0250e6c9 Binary files /dev/null and b/objects/crafting/sb_old/sb_metalworkstation/metalworkstationlit.png differ diff --git a/objects/crafting/sb_scifianvil/scifianvil.frames b/objects/crafting/sb_old/sb_scifianvil/scifianvil.frames similarity index 100% rename from objects/crafting/sb_scifianvil/scifianvil.frames rename to objects/crafting/sb_old/sb_scifianvil/scifianvil.frames diff --git a/objects/crafting/sb_scifianvil/scifianvil.object b/objects/crafting/sb_old/sb_scifianvil/scifianvil.object similarity index 100% rename from objects/crafting/sb_scifianvil/scifianvil.object rename to objects/crafting/sb_old/sb_scifianvil/scifianvil.object diff --git a/objects/crafting/sb_old/sb_scifianvil/scifianvil.png b/objects/crafting/sb_old/sb_scifianvil/scifianvil.png new file mode 100644 index 00000000..26e38d27 Binary files /dev/null and b/objects/crafting/sb_old/sb_scifianvil/scifianvil.png differ diff --git a/objects/crafting/sb_old/sb_scifianvil/scifianvilicon.png b/objects/crafting/sb_old/sb_scifianvil/scifianvilicon.png new file mode 100644 index 00000000..f0ba3b7c Binary files /dev/null and b/objects/crafting/sb_old/sb_scifianvil/scifianvilicon.png differ diff --git a/objects/crafting/sb_scifianvil/scifianvillit.frames b/objects/crafting/sb_old/sb_scifianvil/scifianvillit.frames similarity index 100% rename from objects/crafting/sb_scifianvil/scifianvillit.frames rename to objects/crafting/sb_old/sb_scifianvil/scifianvillit.frames diff --git a/objects/crafting/sb_old/sb_scifianvil/scifianvillit.png b/objects/crafting/sb_old/sb_scifianvil/scifianvillit.png new file mode 100644 index 00000000..4717ed3b Binary files /dev/null and b/objects/crafting/sb_old/sb_scifianvil/scifianvillit.png differ diff --git a/objects/crafting/sb_scififurnace/scififurnace.frames b/objects/crafting/sb_old/sb_scififurnace/scififurnace.frames similarity index 100% rename from objects/crafting/sb_scififurnace/scififurnace.frames rename to objects/crafting/sb_old/sb_scififurnace/scififurnace.frames diff --git a/objects/crafting/sb_scififurnace/scififurnace.object b/objects/crafting/sb_old/sb_scififurnace/scififurnace.object similarity index 100% rename from objects/crafting/sb_scififurnace/scififurnace.object rename to objects/crafting/sb_old/sb_scififurnace/scififurnace.object diff --git a/objects/crafting/sb_scififurnace/scififurnace.png b/objects/crafting/sb_old/sb_scififurnace/scififurnace.png similarity index 100% rename from objects/crafting/sb_scififurnace/scififurnace.png rename to objects/crafting/sb_old/sb_scififurnace/scififurnace.png diff --git a/objects/crafting/sb_scififurnace/scififurnaceicon.png b/objects/crafting/sb_old/sb_scififurnace/scififurnaceicon.png similarity index 100% rename from objects/crafting/sb_scififurnace/scififurnaceicon.png rename to objects/crafting/sb_old/sb_scififurnace/scififurnaceicon.png diff --git a/objects/crafting/sb_scififurnace/scififurnacelit.frames b/objects/crafting/sb_old/sb_scififurnace/scififurnacelit.frames similarity index 100% rename from objects/crafting/sb_scififurnace/scififurnacelit.frames rename to objects/crafting/sb_old/sb_scififurnace/scififurnacelit.frames diff --git a/objects/crafting/sb_old/sb_scififurnace/scififurnacelit.png b/objects/crafting/sb_old/sb_scififurnace/scififurnacelit.png new file mode 100644 index 00000000..25e28a10 Binary files /dev/null and b/objects/crafting/sb_old/sb_scififurnace/scififurnacelit.png differ diff --git a/objects/crafting/sb_separatortable/default.frames b/objects/crafting/sb_old/sb_separatortable/default.frames similarity index 100% rename from objects/crafting/sb_separatortable/default.frames rename to objects/crafting/sb_old/sb_separatortable/default.frames diff --git a/objects/crafting/sb_old/sb_separatortable/separatortable.object b/objects/crafting/sb_old/sb_separatortable/separatortable.object new file mode 100644 index 00000000..3968cccf --- /dev/null +++ b/objects/crafting/sb_old/sb_separatortable/separatortable.object @@ -0,0 +1,88 @@ +{ + "objectName": "sb_separatortable", + "colonyTags": ["crafting", "electronic", "violium"], + "rarity": "Legendary", + "tooltipKind": "sb_object", + "interactAction": "OpenCraftingInterface", + "interactData": { + "config": "/interface/windowconfig/craftinganvil.config", + "paneLayoutOverride": { + "windowtitle": { + "title": "SEPARATOR'S TABLE", + "subtitle": "For when you need the best in close range combat gear!", + "icon": { + "file": "/interface/sb_crafting/craftingicons.png:separatortable" + } + } + }, + "craftingSound": "/sfx/interface/crafting_furnacetech.ogg", + "filter": ["craftinganvil", "craftinganvil2", "craftinganvil3", "craftingseparator", "sb_separatortable", "sb_advancedanvil", "sb_scifianvil"] + }, + "printable": false, + "description": "For crafting the best in close range combat gear!", + "shortdescription": "^orange;Separator's Table^reset;", + "race": "generic", + "category": "crafting", + "price": 600, + + "lightColor": [155, 107, 179], + + "flickerPeriod": 0.3, + "flickerMinIntensity": 0.95, + "flickerMaxIntensity": 1, + "flickerPeriodVariance": 0, + "flickerIntensityVariance": 0.025, + + "apexDescription": "An ideal workstation for crafting weapons and armours that are supremely durable.", + "avianDescription": "A separator's crafting table. Perfect for a close range combat specialist.", + "floranDescription": "Thisss table make armour and blade worthy of strongessst Floran warriors.", + "glitchDescription": "Observant. I could use this table to make armour capable of withstanding almost anything.", + "humanDescription": "If I want to take my fights to close quarters, the equipment I can make here would be most ideal.", + "hylotlDescription": "With this table I could craft the strongest of armours and the sharpest of blades.", + "novakidDescription": "A separator's table. I'll be usin' this to craft some superior armour and weapons.", + + "inventoryIcon": "separatortableicon.png", + "orientations": [{ + "imageLayers": [{ + "image": "separatortable.png:.", + "fullbright": true + }, { + "image": "separatortablelit.png:." + } + ], + + "imagePosition": [-16, 0], + "frames": 4, + "animationCycle": 0.4, + + "direction": "left", + "flipImages": true, + + "lightPosition": [-1, 1], + + "spaceScan": 0.1, + "anchors": ["bottom"] + + }, { + "imageLayers": [{ + "image": "separatortable.png:.", + "fullbright": true + }, { + "image": "separatortablelit.png:." + } + ], + + "imagePosition": [-16, 0], + "frames": 4, + "animationCycle": 0.4, + + "direction": "right", + + "lightPosition": [0, 1], + + "spaceScan": 0.1, + "anchors": ["bottom"] + + } + ] +} diff --git a/objects/crafting/sb_old/sb_separatortable/separatortable.png b/objects/crafting/sb_old/sb_separatortable/separatortable.png new file mode 100644 index 00000000..97ff3fe7 Binary files /dev/null and b/objects/crafting/sb_old/sb_separatortable/separatortable.png differ diff --git a/objects/crafting/sb_old/sb_separatortable/separatortableicon.png b/objects/crafting/sb_old/sb_separatortable/separatortableicon.png new file mode 100644 index 00000000..2132298e Binary files /dev/null and b/objects/crafting/sb_old/sb_separatortable/separatortableicon.png differ diff --git a/objects/crafting/sb_old/sb_separatortable/separatortablelit.png b/objects/crafting/sb_old/sb_separatortable/separatortablelit.png new file mode 100644 index 00000000..9aeb2cf1 Binary files /dev/null and b/objects/crafting/sb_old/sb_separatortable/separatortablelit.png differ diff --git a/objects/crafting/sb_skyrail/default.frames b/objects/crafting/sb_old/sb_skyrail/default.frames similarity index 100% rename from objects/crafting/sb_skyrail/default.frames rename to objects/crafting/sb_old/sb_skyrail/default.frames diff --git a/objects/crafting/sb_old/sb_skyrail/skyrailrailcraftingtabletable.png b/objects/crafting/sb_old/sb_skyrail/skyrailrailcraftingtabletable.png new file mode 100644 index 00000000..2be5624a Binary files /dev/null and b/objects/crafting/sb_old/sb_skyrail/skyrailrailcraftingtabletable.png differ diff --git a/objects/crafting/sb_old/sb_skyrail/skyrailrailcraftingtabletablelit.png b/objects/crafting/sb_old/sb_skyrail/skyrailrailcraftingtabletablelit.png new file mode 100644 index 00000000..345db65d Binary files /dev/null and b/objects/crafting/sb_old/sb_skyrail/skyrailrailcraftingtabletablelit.png differ diff --git a/objects/crafting/sb_skyrail/skyrailrailtable.object b/objects/crafting/sb_old/sb_skyrail/skyrailrailtable.object similarity index 97% rename from objects/crafting/sb_skyrail/skyrailrailtable.object rename to objects/crafting/sb_old/sb_skyrail/skyrailrailtable.object index e38188b3..97deece2 100644 --- a/objects/crafting/sb_skyrail/skyrailrailtable.object +++ b/objects/crafting/sb_old/sb_skyrail/skyrailrailtable.object @@ -4,7 +4,7 @@ "rarity" : "Legendary", "interactAction" : "OpenCraftingInterface", "interactData" : { - "config" : "/interface/windowconfig/sb_skyrailcrafting.config", + "config" : "/interface/windowconfig/sb_railcrafting.config", "paneLayoutOverride" : { "windowtitle" : { "title" : "SKYRAIL RAIL TABLE", diff --git a/objects/crafting/sb_skyrail/skyrailrailtabletableicon.png b/objects/crafting/sb_old/sb_skyrail/skyrailrailtabletableicon.png similarity index 100% rename from objects/crafting/sb_skyrail/skyrailrailtabletableicon.png rename to objects/crafting/sb_old/sb_skyrail/skyrailrailtabletableicon.png diff --git a/objects/crafting/sb_skyrail/skyrailtable.frames b/objects/crafting/sb_old/sb_skyrail/skyrailtable.frames similarity index 100% rename from objects/crafting/sb_skyrail/skyrailtable.frames rename to objects/crafting/sb_old/sb_skyrail/skyrailtable.frames diff --git a/objects/crafting/sb_skyrail/skyrailtable.object b/objects/crafting/sb_old/sb_skyrail/skyrailtable.object similarity index 96% rename from objects/crafting/sb_skyrail/skyrailtable.object rename to objects/crafting/sb_old/sb_skyrail/skyrailtable.object index 760ccfc3..8b36113b 100644 --- a/objects/crafting/sb_skyrail/skyrailtable.object +++ b/objects/crafting/sb_old/sb_skyrail/skyrailtable.object @@ -4,7 +4,7 @@ "rarity" : "Legendary", "interactAction" : "OpenCraftingInterface", "interactData" : { - "config" : "/interface/windowconfig/sb_skyrailcrafting.config", + "config" : "/interface/windowconfig/sb_railcrafting.config", "paneLayoutOverride" : { "windowtitle" : { "title" : "SKYRAIL TABLE", diff --git a/objects/crafting/sb_skyrail/skyrailtable.png b/objects/crafting/sb_old/sb_skyrail/skyrailtable.png similarity index 100% rename from objects/crafting/sb_skyrail/skyrailtable.png rename to objects/crafting/sb_old/sb_skyrail/skyrailtable.png diff --git a/objects/crafting/sb_old/sb_skyrail/skyrailtableicon.png b/objects/crafting/sb_old/sb_skyrail/skyrailtableicon.png new file mode 100644 index 00000000..965c8bd9 Binary files /dev/null and b/objects/crafting/sb_old/sb_skyrail/skyrailtableicon.png differ diff --git a/objects/crafting/sb_stonefurnace/stonefurnace.frames b/objects/crafting/sb_old/sb_stonefurnace/stonefurnace.frames similarity index 100% rename from objects/crafting/sb_stonefurnace/stonefurnace.frames rename to objects/crafting/sb_old/sb_stonefurnace/stonefurnace.frames diff --git a/objects/crafting/sb_stonefurnace/stonefurnace.object b/objects/crafting/sb_old/sb_stonefurnace/stonefurnace.object similarity index 100% rename from objects/crafting/sb_stonefurnace/stonefurnace.object rename to objects/crafting/sb_old/sb_stonefurnace/stonefurnace.object diff --git a/objects/crafting/sb_old/sb_stonefurnace/stonefurnace.png b/objects/crafting/sb_old/sb_stonefurnace/stonefurnace.png new file mode 100644 index 00000000..acecdd42 Binary files /dev/null and b/objects/crafting/sb_old/sb_stonefurnace/stonefurnace.png differ diff --git a/objects/crafting/sb_old/sb_stonefurnace/stonefurnaceicon.png b/objects/crafting/sb_old/sb_stonefurnace/stonefurnaceicon.png new file mode 100644 index 00000000..4287a6a7 Binary files /dev/null and b/objects/crafting/sb_old/sb_stonefurnace/stonefurnaceicon.png differ diff --git a/objects/crafting/sb_stonefurnace/stonefurnacelit.frames b/objects/crafting/sb_old/sb_stonefurnace/stonefurnacelit.frames similarity index 100% rename from objects/crafting/sb_stonefurnace/stonefurnacelit.frames rename to objects/crafting/sb_old/sb_stonefurnace/stonefurnacelit.frames diff --git a/objects/crafting/sb_old/sb_stonefurnace/stonefurnacelit.png b/objects/crafting/sb_old/sb_stonefurnace/stonefurnacelit.png new file mode 100644 index 00000000..88cbd157 Binary files /dev/null and b/objects/crafting/sb_old/sb_stonefurnace/stonefurnacelit.png differ diff --git a/objects/crafting/sb_portable3dprinter/portable3dprinter.object b/objects/crafting/sb_portable3dprinter/portable3dprinter.object index e8a03a8b..501c41c5 100644 --- a/objects/crafting/sb_portable3dprinter/portable3dprinter.object +++ b/objects/crafting/sb_portable3dprinter/portable3dprinter.object @@ -1,42 +1,50 @@ { - "objectName" : "sb_portable3dprinterobject", - "colonyTags" : ["crafting"], - "rarity" : "legendary", - "interactAction" : "OpenCraftingInterface", - "interactData" : { - "config" : "/interface/windowconfig/sb_portable3dprinter.config", - "paneLayoutOverride" : { - "windowtitle" : { - "title" : "Portable Pixel Printer", - "subtitle" : "Print small hi-tech items on-the-fly!", - "icon" : { - "file" : "/interface/sb_crafting/craftingicons.png:printingicon" + "objectName": "sb_portable3dprinterobject", + "colonyTags": ["crafting"], + "rarity": "legendary", + "interactAction": "OpenCraftingInterface", + "interactData": { + "config": "/interface/windowconfig/sb_portable3dprinter.config", + "paneLayoutOverride": { + "windowtitle": { + "title": "Portable Pixel Printer", + "subtitle": "Print small hi-tech items on-the-fly!", + "icon": { + "file": "/interface/sb_crafting/craftingicons.png:printingicon" } } }, - "craftingSound" : "/sfx/interface/crafting_compress.ogg", - "filter" : ["sb_portable3dprinter"] + "craftingSound": "/sfx/interface/crafting_compress.ogg", + "filter": ["sb_portable3dprinter"] }, - "printable" : false, - "lightColor" : [38,167,234], - "shortdescription" : "^orange;Portable Pixel Printer^reset;", - "description" : "Used to craft small hi-tech items on-the-fly.", - "race" : "generic", - "category" : "crafting", - "smashable" : true, - "smashParticles" : [{"count" : 4, "particle" : "protectorblade"}], - "tooltipKind" : "sb_object", - "scripts" : ["portable3dprinter.lua"], - "scriptDelta" : 10, - "breakDropOptions" : [], - "inventoryIcon" : [{"image":"/items/generic/unlock/sb_portable3dprinter.png"},{"image":"/interface/sb_inventory/x.png"}], - "orientations" : [ - { - "dualImage" : "portable3dprinter.png:", //NOTE: alpha is 7 - "imagePosition" : [-8, 0], - "frames" : 8, - "animationCycle" : 1.0, - "spaceScan" : 0.1 + "printable": false, + "lightColor": [38, 167, 234], + "shortdescription": "^orange;Portable Pixel Printer^reset;", + "description": "Used to craft small hi-tech items on-the-fly.", + "race": "generic", + "category": "crafting", + "smashable": true, + "smashParticles": [{ + "count": 4, + "particle": "protectorblade" + } + ], + "tooltipKind": "sb_object", + "scripts": ["portable3dprinter.lua"], + "scriptDelta": 10, + "breakDropOptions": [], + "inventoryIcon": [{ + "image": "/items/active/starbound/portable3dprinter/portable3dprinter.png" + }, { + "image": "/interface/x.png" + } + ], + "orientations": [{ + "dualImage": "portable3dprinter.png:", //NOTE: alpha is 7 + "imagePosition": [-8, 0], + "frames": 8, + "animationCycle": 1.0, + "spaceScan": 0.1 } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_portable3dprinter/portable3dprinter.png b/objects/crafting/sb_portable3dprinter/portable3dprinter.png index c4e80aa8..33e1fd8b 100644 Binary files a/objects/crafting/sb_portable3dprinter/portable3dprinter.png and b/objects/crafting/sb_portable3dprinter/portable3dprinter.png differ diff --git a/objects/crafting/sb_researchstation/researchstation.lua b/objects/crafting/sb_researchstation/researchstation.lua index 5c94e1ca..9a1127c7 100644 --- a/objects/crafting/sb_researchstation/researchstation.lua +++ b/objects/crafting/sb_researchstation/researchstation.lua @@ -15,14 +15,15 @@ function init() for i = 1, #v do local j = v[i]..append if sb_itemExists(j) then - local price = root.itemConfig(j).config.price or 0 - data.recipes[#data.recipes+1] = { - input = { - "sb_blankblueprint", - {"money",math.floor((price ~= 0 and price or defaultItemPrice)*BPF*buyFactor)}}, - output = j, - groups = {k} - } + local price = root.itemConfig(j).config.price or 0 + data.recipes[#data.recipes+1] = { + input = { + "sb_blankblueprint", + {"money",math.floor((price ~= 0 and price or defaultItemPrice)*BPF*buyFactor)} + }, + output = j, + groups = {k} + } else sb.logInfo("Betabound: No such item for Research Station: "..j) end diff --git a/objects/crafting/sb_researchstation/researchstation.object b/objects/crafting/sb_researchstation/researchstation.object index be25c4e9..6938cb51 100644 --- a/objects/crafting/sb_researchstation/researchstation.object +++ b/objects/crafting/sb_researchstation/researchstation.object @@ -8,649 +8,663 @@ "interactAction" : "ScriptPane", "interactData" : "/interface/windowconfig/sb_craftingresearch.config", "categoryButton" : { - "pressedOffset" : [0,-1], - "position" : [22, 44], //-10,22,33,51,58,78 increasing by 11 seems good - "baseImage" : "/interface/sb_crafting/categories.png:%s", - "baseImageChecked" : "/interface/sb_crafting/categoriesselected.png:%s", - "data" : {} + "pressedOffset" : [0,-1], + "position" : [22, 44], //-10,22,33,51,58,78 increasing by 11 seems good + "baseImage" : "/interface/sb_crafting/categories.png:%s", + "baseImageChecked" : "/interface/sb_crafting/categoriesselected.png:%s", + "data" : {} }, "scripts" : ["researchstation.lua"], //"offeredItems" : {"main":["copperbar"],"mechs":["goldbar"]}, "offeredItems" : { "main" : [ - //avian - "sb_poachedavesmingo" - ,"sb_crowncake" - ,"sb_cordialglass" - ,"sb_cordialbottle" - ,"sb_wartjuice" - ,"sb_wartwine" - ,"sb_candiedpearlpeas" - ,"sb_ricevinegar" - ,"sb_rootpopbottle" - ,"sb_rootpopflask" - ,"sb_curriedbeakseed" - ,"sb_wineglass" - ,"sb_winebottle" - - //glitch - ,"sb_blackcurrentcrumble" - ,"sb_copperkeypie" - ,"sb_sweettime" - ,"sb_corntent" - ,"sb_batteryacid" - ,"sb_boltedmilk" - - //human - ,"sb_applepie" - ,"sb_candy" - ,"sb_icecream" - ,"sb_lollypop" - ,"sb_butter" - ,"sb_toffee" - ,"sb_toffeeapple" - ,"sb_alienburger" - ,"sb_burrito" - ,"sb_chilistew" - ,"sb_hamsandwich" - ,"sb_soup" - - //floran - ,"sb_sweetmeat" - ,"sb_pussplumpie" - ,"sb_boneboomarrow" - ,"sb_meatandmarrow" - ,"sb_meatwich" - ,"sb_thespecial" - ,"sb_meatjuice" - ,"sb_meatwine" - ,"sb_offal" - - //apex - ,"sb_bananabread" - - //hylotl - ,"sb_dirtea" - ,"sb_ricewine" - ,"sb_whiskeybottle" - ,"sb_whiskeyflask" - ,"sb_eggfriedrice" - ,"sb_cornontheblob" + //avian + "sb_poachedavesmingo" + ,"sb_crowncake" + ,"sb_cordialglass" + ,"sb_cordialbottle" + ,"sb_wartjuice" + ,"sb_wartwine" + ,"sb_candiedpearlpeas" + ,"sb_ricevinegar" + ,"sb_rootpopbottle" + ,"sb_rootpopflask" + ,"sb_curriedbeakseed" + ,"sb_wineglass" + ,"sb_winebottle" + + //glitch + ,"sb_blackcurrentcrumble" + ,"sb_copperkeypie" + ,"sb_sweettime" + ,"sb_corntent" + ,"sb_batteryacid" + ,"sb_boltedmilk" + + //human + ,"sb_applepie" + ,"sb_candy" + ,"sb_icecream" + ,"sb_lollypop" + ,"sb_butter" + ,"sb_toffee" + ,"sb_toffeeapple" + ,"sb_alienburger" + ,"sb_burrito" + ,"sb_chilistew" + ,"sb_hamsandwich" + + //floran + ,"sb_sweetmeat" + ,"sb_pussplumpie" + ,"sb_boneboomarrow" + ,"sb_meatandmarrow" + ,"sb_meatwich" + ,"sb_thespecial" + ,"sb_meatjuice" + ,"sb_meatwine" + ,"sb_offal" + + //apex + ,"sb_bananabread" + + //hylotl + ,"sb_dirtea" + ,"sb_ricewine" + ,"sb_whiskeybottle" + ,"sb_whiskeyflask" + ,"sb_eggfriedrice" + ,"sb_cornontheblob" ], + "craft" : [ - //seasonal - "heartforge" - ,"holidaycraftingtable" + //seasonal + "heartforge" + ,"holidaycraftingtable" ], + "weapons" : [ - //desert - "sb_cactislammer" - - //savannah - ,"sb_thornyneedler" - - //snow - ,"snowgun" - - //jungle - ,"sb_tranquilizergun" - - //alien - - //volcanic - ,"sb_heatray" - - - //rainbow/colorful - ,"sb_crayonred" - ,"sb_crayonblue" - ,"sb_crayonyellow" - ,"sb_crayonpurple" - ,"sb_crayongreen" - ,"sb_crayonorange" - - ,"paintgunred" - ,"paintgunblue" - ,"paintgunyellow" - ,"paintgunpurple" - ,"paintgungreen" - ,"paintgunorange" - - //ocean - ,"harpoongun" - - //toxic - ,"sb_irradiatedlauncher" - ,"sb_uraniumrodstaff" - - //bone - //alpine - - //bioluminescence - ,"lightbow" - - //spring - ,"pollenpump" - - //oasis - - //tar - ,"sb_sabertoothspear" - - //swamp - - //eyeball - ,"sb_eyesword" - - //ice - ,"sb_frostspear" - ,"frostshield" - ,"frozenbow" - - //cell - ,"sb_chromosword" - - //slime - ,"sb_slimestaff" - ,"sb_cutarrh" - - //crystal - ,"sb_hackman" - - //heck - ,"sb_splatterknife" - - //mushroom - ,"sb_smashroom" - ,"mushroomshield" - - //luminous cave - ,"sb_biostaff" - - //coral - ,"sb_coralcleaver" - - //unique weapon - ,"iceboomerang" - ,"fireboomerang" - ,"lunarang" - ,"neochakram" - ,"sawchakram" - ,"hardchakram" - ,"clawglove" - ,"stunglove" - ,"vinefist" - ,"sb_explosiveglove" + //desert + "sb_cactislammer" + + //savannah + ,"sb_thornyneedler" + + //snow + ,"snowgun" + + //jungle + ,"sb_tranquilizergun" + + //alien + ,"sb_corrosivegun" + ,"sb_corrosivegrenade" + + //volcanic + ,"sb_heatray" + + + //rainbow/colorful + ,"sb_rainbowsword" + ,"sb_crayonred" + ,"sb_crayonblue" + ,"sb_crayonyellow" + ,"sb_crayonpurple" + ,"sb_crayongreen" + ,"sb_crayonorange" + + ,"paintgunred" + ,"paintgunblue" + ,"paintgunyellow" + ,"paintgunpurple" + ,"paintgungreen" + ,"paintgunorange" + + //ocean + ,"harpoongun" + ,"sb_watersword" + + //toxic + ,"sb_irradiatedlauncher" + ,"sb_uraniumrodstaff" + + //bone + ,"sb_bonehammer" + + //alpine + + //bioluminescence + ,"lightbow" + ,"sb_firesword" + + //spring + ,"pollenpump" + + //oasis + + //tar + ,"sb_sabertoothspear" + ,"sb_tarhammer" + + //swamp + + //eyeball + ,"sb_eyesword" + + //ice + ,"sb_frostspear" + ,"frostshield" + ,"frozenbow" + + //cell + ,"sb_chromosword" + + //slime + ,"sb_slimestaff" + ,"sb_cutarrh" + + //crystal + ,"sb_hackman" + + //heck + ,"sb_splatterknife" + + //mushroom + ,"sb_mushroomsword" + ,"sb_mushroomsword2" + ,"sb_smashroom" + ,"mushroomshield" + + //luminous cave + ,"sb_biostaff" + + //coral + ,"sb_coralcleaver" + + //unique weapon + ,"iceboomerang" + ,"fireboomerang" + ,"lunarang" + ,"neochakram" + ,"sawchakram" + ,"hardchakram" + ,"clawglove" + ,"stunglove" + ,"vinefist" + ,"sb_explosiveglove" ], - "mechs" : [ - //mech3 - "mechbodypirate" - ,"mechbodyreactor" - ,"mechbodymilitary" - ,"mechbodybad" - ,"mechboosterzed" - ,"mechboosterstalwart" - ,"mechboosterastro" - ,"mechlegstwinjet" - ,"mechlegshopper" - ,"mechlegsarc" - ,"mecharmheatrifle" - ,"mecharmtommygun" - ,"mecharmsplitshot" - - //mech4 - ,"mechboostersleek" - ,"mechlegssleek" - ,"mecharmcannon" - ,"mecharmgatling" - ,"mecharmchainsaw" - ,"mecharmhomingmissile" - ,"mecharmplasmadrone" - ,"mecharmclustermine" - ,"mecharmwobbleshot" - //mech5 - ,"mechbodyhero" - ,"mechbodyskull" - ,"mechbodyshark" - ,"mechboostergallant" - ,"mechboosterzero" - ,"mechboosterhammer" - ,"mechlegsronin" - ,"mechlegsintrepid" - ,"mechlegshermes" - ,"mecharmenergyrifle" - ,"mecharmdualrifle" - ,"mecharmenergyblade" - ,"mecharmguidedmissiles" - ,"mecharmshielddrone" - ,"mecharmspikefist" - ,"mecharmbeamdrill" - - //mech6 - ,"mechbodyexodus" - ,"mechbodyiris" - ,"mecharmteslastream" - ,"mecharmmultidrone" - ,"mecharmbeamsniper" - ,"mecharmgravitymine" - - //mech unique - ,"mechbodycultist" - ,"mechbodycultist2" - ,"mechbodyminiknog" - ,"mechbodyprotector" - ,"mechbodypenguin" + "mechs" : [ + //mech3 + "mechbodypirate" + ,"mechbodyreactor" + ,"mechbodymilitary" + ,"mechbodybad" + ,"mechboosterzed" + ,"mechboosterstalwart" + ,"mechboosterastro" + ,"mechlegstwinjet" + ,"mechlegshopper" + ,"mechlegsarc" + ,"mecharmheatrifle" + ,"mecharmtommygun" + ,"mecharmsplitshot" + + //mech4 + ,"mechboostersleek" + ,"mechlegssleek" + ,"mecharmcannon" + ,"mecharmgatling" + ,"mecharmchainsaw" + ,"mecharmhomingmissile" + ,"mecharmplasmadrone" + ,"mecharmclustermine" + ,"mecharmwobbleshot" + + //mech5 + ,"mechbodyhero" + ,"mechbodyskull" + ,"mechbodyshark" + ,"mechboostergallant" + ,"mechboosterzero" + ,"mechboosterhammer" + ,"mechlegsronin" + ,"mechlegsintrepid" + ,"mechlegshermes" + ,"mecharmenergyrifle" + ,"mecharmdualrifle" + ,"mecharmenergyblade" + ,"mecharmguidedmissiles" + ,"mecharmshielddrone" + ,"mecharmspikefist" + ,"mecharmbeamdrill" + + //mech6 + ,"mechbodyexodus" + ,"mechbodyiris" + ,"mecharmteslastream" + ,"mecharmmultidrone" + ,"mecharmbeamsniper" + ,"mecharmgravitymine" + + //mech unique + ,"mechbodycultist" + ,"mechbodycultist2" + ,"mechbodyminiknog" + ,"mechbodyprotector" + ,"mechbodypenguin" ], - "head" : [ - //mushroom - "mushroomhead" - - //rainbow - ,"crayonredback" - ,"crayonblueback" - ,"crayonyellowback" - ,"crayonpurpleback" - ,"crayongreenback" - ,"crayonorangeback" - - //eyeball - ,"eyehead" + "head" : [ + //mushroom + "mushroomhead" + + //rainbow + ,"crayonredback" + ,"crayonblueback" + ,"crayonyellowback" + ,"crayonpurpleback" + ,"crayongreenback" + ,"crayonorangeback" + + //eyeball + ,"eyehead" + ], "blocks" : [ - "wallpaper" - ,"slopedrustypanel" - ,"temple1" - ,"temple2" - ,"temple3" - ,"temple4" - ,"techhull1" - ,"stonetiles" - ,"stoneplatform" - ,"slopedscrappanel" - ,"slopedinsetpanel" - ,"slopedhullpanel" - ,"shojiscreenpanel" - ,"shadowwallblock" - ,"shadowspikeblock" - ,"sewerpipe" - ,"sandstoneblock" - ,"rustymetal" - ,"rustyblock" - ,"ruinsplatform" - ,"pressurisedplatform" - ,"pressurisedgirder" - ,"pressuriseddurasteel" - ,"pressurisedbeam" - ,"platematerial" - ,"plantplatform" - ,"pillarblock" - ,"petalblock" - ,"outpostwall1" - ,"outpostwall2" - ,"outpostsupport" - ,"outpostplatform" - ,"ornatewood" - ,"ornatewall" - ,"ornatetiles" - ,"ornateroofing" - ,"ornateflooring" - ,"modernplatform" - ,"mirror" - ,"metallicmaterial" - ,"lightmetal" - ,"ledgebrick" - ,"junktech" - ,"iceblock" - ,"homewalls1" - ,"heavyironbars" - ,"hazard" - ,"girdermaterial" - ,"floweryblock" - ,"fadedblocks" - ,"concretematerial" - ,"cheapwallpaper" - ,"castlewalls1" - ,"castlewalls2" - ,"bookpiles" - ,"blackglass" - ,"baseboard" - ,"bars" - ,"bambooplatform" - ,"bamboo" - ,"aztectech" - ,"apexshipwall" - ,"apexshipsupport" - ,"apexshipplatform" - ,"apexshipdetails" - ,"wreckplatform" - ,"woodenplatform" - ,"tungstenplatform" - ,"tribalplatform" - ,"tombbrick" - ,"tombbrick2" - ,"tombbrick3" - ,"tombbrick4" - ,"tombbrick5" - - ,"blackblock" - ,"outpost" - ,"sb_smoothconcrete" - ,"cloudblock" + "wallpaper" + ,"slopedrustypanel" + ,"temple1" + ,"temple2" + ,"temple3" + ,"temple4" + ,"techhull1" + ,"stonetiles" + ,"stoneplatform" + ,"slopedscrappanel" + ,"slopedinsetpanel" + ,"slopedhullpanel" + ,"shojiscreenpanel" + ,"shadowwallblock" + ,"shadowspikeblock" + ,"sewerpipe" + ,"sandstoneblock" + ,"rustymetal" + ,"rustyblock" + ,"ruinsplatform" + ,"pressurisedplatform" + ,"pressurisedgirder" + ,"pressuriseddurasteel" + ,"pressurisedbeam" + ,"platematerial" + ,"plantplatform" + ,"pillarblock" + ,"petalblock" + ,"outpostwall1" + ,"outpostwall2" + ,"outpostsupport" + ,"outpostplatform" + ,"ornatewood" + ,"ornatewall" + ,"ornatetiles" + ,"ornateroofing" + ,"ornateflooring" + ,"modernplatform" + ,"mirror" + ,"metallicmaterial" + ,"lightmetal" + ,"ledgebrick" + ,"ridgebrick" + ,"iceblock" + ,"homewalls1" + ,"heavyironbars" + ,"hazard" + ,"girdermaterial" + ,"floweryblock" + ,"fadedblocks" + ,"concretematerial" + ,"cheapwallpaper" + ,"castlewalls1" + ,"castlewalls2" + ,"bookpiles" + ,"blackglass" + ,"baseboard" + ,"bars" + ,"bambooplatform" + ,"bamboo" + ,"aztectech" + ,"apexshipwall" + ,"apexshipsupport" + ,"apexshipplatform" + ,"apexshipdetails" + ,"wreckplatform" + ,"woodenplatform" + ,"tungstenplatform" + ,"tribalplatform" + ,"tombbrick" + ,"tombbrick2" + ,"tombbrick3" + ,"tombbrick4" + ,"tombbrick5" + + ,"blackblock" + ,"outpost" + ,"sb_smoothconcrete" + ,"cloudblock" ], "planets" : [ - //garden - //forest - //desert - //savannah - //snow* - - //ocean - //jungle - //alien - "alienbed" - ,"alienchair" - ,"alienchest" - ,"aliendoor" - ,"alientable" - - //toxic - ,"toxicchest" - ,"toxicchair" - ,"toxiclamp1" - ,"toxiclamp2" - ,"toxictable" - - //volcanic - //city - ,"scorchedcitybed" - ,"scorchedcitychair" - ,"scorchedcitychestdrawerlarge" - ,"scorchedcitychestdrawersmall" - ,"scorchedcitytable" - ,"scorchedcityfridge" - ,"scorchedcitytv" - ,"scorchedcitycounter" - ,"scorchedcityregister" - ,"scorchedcitystoreshelf" - - //tentacle - - //SECONDARY SURFACE BIOMES - //mushroom* - - ,"shroombed" - ,"shroomchair" - ,"shroomchest" - ,"shroomdoor" - ,"shroomlamp" - ,"shroomtable" - - //UG mushroom - ,"shroomstatue" - - ,"shroomwardrobe" - - //spring - ,"flowerstatue" - - ,"flowerbox" - ,"flowerlamp" - ,"movingsunflower" - ,"petalfountain" - ,"springchest" - - //oasis - ,"reedchair" - ,"reedbed" - ,"reedclock" - ,"reedlamp" - ,"reeddesk" - ,"reeddoor" - ,"reedchest" - ,"reedshelf" - - //tar -// ,"asphalt" - ,"tarchair" - ,"tarbed" - ,"tarconsole" - ,"tarlight" - ,"tarman" - ,"tardoor" - ,"tarpitchest" - - //UG tar - - //colourful/rainbow* - ,"rainbowwoodbed" - ,"rainbowwoodchair" - ,"rainbowwooddoor" - ,"rainbowwoodsafe" - ,"rainbowwoodtable" - ,"rainbowunicornstatue" - ,"rainbowpainting" - - ,"rainbowbed" - ,"rainbowchair" - ,"rainbowchest" - ,"rainbowdoor" - ,"rainbowtable" - - //bone - ,"bonebed" - ,"bonechair" - ,"bonechest" - ,"bonedoor" - ,"bonetable" - - //alpine - ,"stonechest" - ,"stonebed" - ,"stonechair" - ,"stonedoor" - ,"stonetable" - - //biolumi - ,"sb_glowchest" - - ,"glowflowerlamp" - ,"glowbushlamp" - ,"glowvinelamp" - ,"glowchest" - ,"glowbed" - ,"glowchair" - ,"glowstickorange" - ,"glowstickyellow" - ,"glowstickgreen" - ,"glowstickblue" - - //giant flower - ,"giantflowerbed" - ,"giantflowerchair" - ,"giantflowerchest" - ,"giantflowerdoor" - ,"giantflowerlamp" - ,"giantflowertable" - - //swamp - ,"swampchair" - ,"swampbed" - ,"swampybed" - ,"swampchest" - - //eyeball* - ,"sb_eyebed" - ,"sb_eyechair" - ,"sb_eyechest" - ,"sb_eyedoor" - ,"sb_eyetable" - - ,"eyebed" - ,"eyechair" - ,"eyechest" - ,"eyedoor" - ,"eyetable" - - //ice* - ,"icebed" - ,"icechair" - ,"icechest" - ,"icedoor" - ,"icetable" - ,"icemachine" - - //steamspring - ,"steamspringlamp" - ,"steamspringbed" - ,"steamspringdoor" - ,"steamspringchair" - ,"steamspringtable" - - //prism - ,"prismbed" - ,"prismdoor" - ,"prismchair" - ,"prismtable" - ,"prismlamp1" - ,"prismlamp2" - ,"prismlamp3" - - //hive - ,"hivebed" - ,"hivedoor" - ,"hivechair" - ,"hivetable" - ,"hivelamp" - - //foundry - ,"foundrybed" - ,"foundrychair" - ,"foundrydoor" - ,"foundrylight" - ,"magmalamp" - - //rust - ,"rustchest" - ,"rustbed" - ,"rustchair" - ,"rustdoor" - ,"rusttable" - - //geode - ,"geodebed" - ,"geodechair" - ,"geodedoor" - ,"geodeplantpot" - ,"geodeceilinglight" - ,"geodelowanote" - ,"geodebnote" - ,"geodecnote" - ,"geodednote" - ,"geodeenote" - ,"geodefnote" - ,"geodegnote" - ,"geodehighanote" - - //crystal - ,"crystalbed" - ,"crystalchair" - ,"crystalchest" - ,"crystallamp" - ,"crystaltable" - - //UG wilderness - //UG gnome - ,"smallchurch" - ,"smallclocktower" - ,"smallhouse1" - ,"smallhouse2" - ,"smallhouse3" - ,"smallhouse4" - ,"smallhouse5" - ,"smallhouse6" - ,"smallhouse7" - ,"smallhouse8" - ,"smallhouse9" - ,"smallhouse10" - ,"smallhouse11" - ,"smallinn" - ,"smalllamppost" - ,"smallwindmill" - - //ice cave - ,"icespherechest" - - //stone cave - ,"rock01" - ,"rock02" - ,"rock03" - ,"rock04" - ,"rock12" - ,"rock14" - ,"rock15" - ,"rock17" - ,"rock19" - ,"rock20" - - ,"cavebed" - ,"cavechair" - ,"cavechest" - ,"cavelamp" - - //luminous cave - ,"bioshroomtable" - - //UG flesh - ,"fleshbed" - - ,"fleshchair" - ,"fleshchest" - ,"fleshdoor" - ,"fleshtable" - - //UG cell - ,"cellchair" - ,"celltable" - ,"celldoor" - ,"celllamp" - ,"cellchest" - - //slime cave - ,"sb_slimehide" - - ,"slimechair" - ,"slimebed" - ,"slimehide" - ,"slimetorch" - - //OLD AND BUSTED - //sandstone - ,"sandstonebed" - ,"sandstonechair" - ,"sandstonechest" - ,"sandstonedoor" - ,"sandstonetable" - ,"sandstonetorch" - - //geometric - ,"sb_geometricchair" - ,"sb_geometricchest" - ,"sb_geometricbed" - ,"sb_geometricscreen" - ,"sb_geometrictable" - - //NON-BIOME SETS. If we're doing the industrial set, should we also do mission sets such as the lunar base? - ,"industrialchair" - ,"industrialtable" - ,"industriallight" - ,"industrialcrate" - ,"industrialdoor" - ,"industrialstoragelocker" - ,"industrialdisplay" - ,"industrialcomputer" - ,"industrialcanister" + //garden + //forest + //desert + //savannah + //snow* + + //ocean + //jungle + //alien + "alienbed" + ,"alienchair" + ,"alienchest" + ,"aliendoor" + ,"alientable" + + //toxic + ,"toxicchest" + ,"toxicchair" + ,"toxiclamp1" + ,"toxiclamp2" + ,"toxictable" + + //volcanic + //city + ,"scorchedcitybed" + ,"scorchedcitychair" + ,"scorchedcitychestdrawerlarge" + ,"scorchedcitychestdrawersmall" + ,"scorchedcitytable" + ,"scorchedcityfridge" + ,"scorchedcitytv" + ,"scorchedcitycounter" + ,"scorchedcityregister" + ,"scorchedcitystoreshelf" + + //tentacle + + //SECONDARY SURFACE BIOMES + //mushroom* + + ,"shroombed" + ,"shroomchair" + ,"shroomchest" + ,"shroomdoor" + ,"shroomlamp" + ,"shroomtable" + + //UG mushroom + ,"shroomstatue" + + ,"shroomwardrobe" + + //spring + ,"flowerstatue" + + ,"flowerbox" + ,"flowerlamp" + ,"movingsunflower" + ,"petalfountain" + ,"springchest" + + //oasis + ,"reedchair" + ,"reedbed" + ,"reedclock" + ,"reedlamp" + ,"reeddesk" + ,"reeddoor" + ,"reedchest" + ,"reedshelf" + + //tar + // ,"asphalt" + ,"tarchair" + ,"tarbed" + ,"tarconsole" + ,"tarlight" + ,"tarman" + ,"tardoor" + ,"tarpitchest" + + //UG tar + + //colourful/rainbow* + ,"rainbowwoodbed" + ,"rainbowwoodchair" + ,"rainbowwooddoor" + ,"rainbowwoodsafe" + ,"rainbowwoodtable" + ,"rainbowunicornstatue" + ,"rainbowpainting" + + ,"rainbowbed" + ,"rainbowchair" + ,"rainbowchest" + ,"rainbowdoor" + ,"rainbowtable" + + //bone + ,"bonebed" + ,"bonechair" + ,"bonechest" + ,"bonedoor" + ,"bonetable" + + //alpine + ,"stonechest" + ,"stonebed" + ,"stonechair" + ,"stonedoor" + ,"stonetable" + + //biolumi + ,"sb_glowchest" + + ,"glowflowerlamp" + ,"glowbushlamp" + ,"glowvinelamp" + ,"glowchest" + ,"glowbed" + ,"glowchair" + ,"glowstickorange" + ,"glowstickyellow" + ,"glowstickgreen" + ,"glowstickblue" + + //giant flower + ,"giantflowerbed" + ,"giantflowerchair" + ,"giantflowerchest" + ,"giantflowerdoor" + ,"giantflowerlamp" + ,"giantflowertable" + + //swamp + ,"swampchair" + ,"swampbed" + ,"swampybed" + ,"swampchest" + + //eyeball* + ,"sb_eyebed" + ,"sb_eyechair" + ,"sb_eyechest" + ,"sb_eyedoor" + ,"sb_eyetable" + + ,"eyebed" + ,"eyechair" + ,"eyechest" + ,"eyedoor" + ,"eyetable" + + //ice* + ,"icebed" + ,"icechair" + ,"icechest" + ,"icedoor" + ,"icetable" + ,"icemachine" + + //steamspring + ,"steamspringlamp" + ,"steamspringbed" + ,"steamspringdoor" + ,"steamspringchair" + ,"steamspringtable" + + //prism + ,"prismbed" + ,"prismdoor" + ,"prismchair" + ,"prismtable" + ,"prismlamp1" + ,"prismlamp2" + ,"prismlamp3" + + //hive + ,"hivebed" + ,"hivedoor" + ,"hivechair" + ,"hivetable" + ,"hivelamp" + + //foundry + ,"foundrybed" + ,"foundrychair" + ,"foundrydoor" + ,"foundrylight" + ,"magmalamp" + + //rust + ,"rustchest" + ,"rustbed" + ,"rustchair" + ,"rustdoor" + ,"rusttable" + + //geode + ,"geodebed" + ,"geodechair" + ,"geodedoor" + ,"geodeplantpot" + ,"geodeceilinglight" + ,"geodelowanote" + ,"geodebnote" + ,"geodecnote" + ,"geodednote" + ,"geodeenote" + ,"geodefnote" + ,"geodegnote" + ,"geodehighanote" + + //crystal + ,"crystalbed" + ,"crystalchair" + ,"crystalchest" + ,"crystallamp" + ,"crystaltable" + + //UG wilderness + //UG gnome + ,"smallchurch" + ,"smallclocktower" + ,"smallhouse1" + ,"smallhouse2" + ,"smallhouse3" + ,"smallhouse4" + ,"smallhouse5" + ,"smallhouse6" + ,"smallhouse7" + ,"smallhouse8" + ,"smallhouse9" + ,"smallhouse10" + ,"smallhouse11" + ,"smallinn" + ,"smalllamppost" + ,"smallwindmill" + + //ice cave + ,"icespherechest" + + //stone cave + ,"rock01" + ,"rock02" + ,"rock03" + ,"rock04" + ,"rock12" + ,"rock14" + ,"rock15" + ,"rock17" + ,"rock19" + ,"rock20" + + ,"cavebed" + ,"cavechair" + ,"cavechest" + ,"cavelamp" + + //luminous cave + ,"bioshroomtable" + + //UG flesh + ,"fleshbed" + + ,"fleshchair" + ,"fleshchest" + ,"fleshdoor" + ,"fleshtable" + + //UG cell + ,"cellchair" + ,"celltable" + ,"celldoor" + ,"celllamp" + ,"cellchest" + + //slime cave + ,"sb_slimehide" + + ,"slimechair" + ,"slimebed" + ,"slimehide" + ,"slimetorch" + + //OLD AND BUSTED + //sandstone + ,"sandstonebed" + ,"sandstonechair" + ,"sandstonechest" + ,"sandstonedoor" + ,"sandstonetable" + ,"sandstonetorch" + + //geometric + ,"sb_geometricchair" + ,"sb_geometricchest" + ,"sb_geometricbed" + ,"sb_geometricscreen" + ,"sb_geometrictable" + + //NON-BIOME SETS. If we're doing the industrial set, should we also do mission sets such as the lunar base? + ,"industrialchair" + ,"industrialtable" + ,"industriallight" + ,"industrialcrate" + ,"industrialdoor" + ,"industrialstoragelocker" + ,"industrialdisplay" + ,"industrialcomputer" + ,"industrialcanister" + ,"industrialbed" ] }, "description" : "With some pixels and blank blueprints, I can develop hard-to-find blueprints here!", diff --git a/objects/crafting/sb_researchstation/researchstation.png b/objects/crafting/sb_researchstation/researchstation.png index 4639f86b..0335b08b 100644 Binary files a/objects/crafting/sb_researchstation/researchstation.png and b/objects/crafting/sb_researchstation/researchstation.png differ diff --git a/objects/crafting/sb_researchstation/researchstationicon.png b/objects/crafting/sb_researchstation/researchstationicon.png index d12e4f92..4e7da342 100644 Binary files a/objects/crafting/sb_researchstation/researchstationicon.png and b/objects/crafting/sb_researchstation/researchstationicon.png differ diff --git a/objects/crafting/sb_researchstation/researchstationlit.png b/objects/crafting/sb_researchstation/researchstationlit.png index 87a4722f..6c5ea2cd 100644 Binary files a/objects/crafting/sb_researchstation/researchstationlit.png and b/objects/crafting/sb_researchstation/researchstationlit.png differ diff --git a/objects/crafting/sb_researchstation/researchstationtransparent.png b/objects/crafting/sb_researchstation/researchstationtransparent.png index 09ce431d..3000e830 100644 Binary files a/objects/crafting/sb_researchstation/researchstationtransparent.png and b/objects/crafting/sb_researchstation/researchstationtransparent.png differ diff --git a/objects/crafting/sb_roboticcraftingtable/roboticcraftingtable.png b/objects/crafting/sb_roboticcraftingtable/roboticcraftingtable.png index bd092e4a..6fa91adf 100644 Binary files a/objects/crafting/sb_roboticcraftingtable/roboticcraftingtable.png and b/objects/crafting/sb_roboticcraftingtable/roboticcraftingtable.png differ diff --git a/objects/crafting/sb_roboticcraftingtable/roboticcraftingtableicon.png b/objects/crafting/sb_roboticcraftingtable/roboticcraftingtableicon.png index 18c412b1..735f3917 100644 Binary files a/objects/crafting/sb_roboticcraftingtable/roboticcraftingtableicon.png and b/objects/crafting/sb_roboticcraftingtable/roboticcraftingtableicon.png differ diff --git a/objects/crafting/sb_roboticcraftingtable/roboticcraftingtablelit.png b/objects/crafting/sb_roboticcraftingtable/roboticcraftingtablelit.png index 8a970d23..2bdb8e07 100644 Binary files a/objects/crafting/sb_roboticcraftingtable/roboticcraftingtablelit.png and b/objects/crafting/sb_roboticcraftingtable/roboticcraftingtablelit.png differ diff --git a/objects/crafting/sb_scifianvil/scifianvil.png b/objects/crafting/sb_scifianvil/scifianvil.png deleted file mode 100644 index 5b9f8908..00000000 Binary files a/objects/crafting/sb_scifianvil/scifianvil.png and /dev/null differ diff --git a/objects/crafting/sb_scifianvil/scifianvilicon.png b/objects/crafting/sb_scifianvil/scifianvilicon.png deleted file mode 100644 index 8f6619a4..00000000 Binary files a/objects/crafting/sb_scifianvil/scifianvilicon.png and /dev/null differ diff --git a/objects/crafting/sb_scifianvil/scifianvillit.png b/objects/crafting/sb_scifianvil/scifianvillit.png deleted file mode 100644 index 4d6a8300..00000000 Binary files a/objects/crafting/sb_scifianvil/scifianvillit.png and /dev/null differ diff --git a/objects/crafting/sb_scififurnace/scififurnacelit.png b/objects/crafting/sb_scififurnace/scififurnacelit.png deleted file mode 100644 index 9555218b..00000000 Binary files a/objects/crafting/sb_scififurnace/scififurnacelit.png and /dev/null differ diff --git a/objects/crafting/sb_separatortable/separatortable.object b/objects/crafting/sb_separatortable/separatortable.object deleted file mode 100644 index 6fd39285..00000000 --- a/objects/crafting/sb_separatortable/separatortable.object +++ /dev/null @@ -1,78 +0,0 @@ -{ - "objectName" : "sb_separatortable", - "colonyTags" : ["crafting","electronic","violium"], - "rarity" : "Legendary", - "tooltipKind" : "sb_object", - "interactAction" : "OpenCraftingInterface", - "interactData" : { - "config" : "/interface/windowconfig/craftinganvil.config", - "paneLayoutOverride" : { - "windowtitle" : { - "title" : "SEPARATOR'S TABLE", - "subtitle" : "For when you need the best in close range combat gear!", - "icon" : { - "file" : "/interface/sb_crafting/craftingicons.png:separatortable" - } - } - }, - "craftingSound" : "/sfx/interface/crafting_furnacetech.ogg", - "filter" : ["craftinganvil","craftinganvil2","craftinganvil3","craftingseparator","sb_separatortable", "sb_advancedanvil","sb_scifianvil" ] - }, - "printable" : false, - "description" : "For crafting the best in close range combat gear!", - "shortdescription" : "^orange;Separator's Table^reset;", - "race" : "generic", - "category" : "crafting", - "price" : 600, - - "lightColor" : [155, 107, 179], - - "flickerPeriod" : 0.3, - "flickerMinIntensity" : 0.95, - "flickerMaxIntensity" : 1, - "flickerPeriodVariance" : 0, - "flickerIntensityVariance" : 0.025, - - "apexDescription" : "An ideal workstation for crafting weapons and armours that are supremely durable.", - "avianDescription" : "A separator's crafting table. Perfect for a close range combat specialist.", - "floranDescription" : "Thisss table make armour and blade worthy of strongessst Floran warriors.", - "glitchDescription" : "Observant. I could use this table to make armour capable of withstanding almost anything.", - "humanDescription" : "If I want to take my fights to close quarters, the equipment I can make here would be most ideal.", - "hylotlDescription" : "With this table I could craft the strongest of armours and the sharpest of blades.", - "novakidDescription" : "A separator's table. I'll be usin' this to craft some superior armour and weapons.", - - "inventoryIcon" : "separatortableicon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "separatortable.png:.", "fullbright" : true }, { "image" : "separatortablelit.png:." } ], - - "imagePosition" : [-16, 0], - "frames" : 4, - "animationCycle" : 0.4, - - "direction" : "left", - "flipImages" : true, - - "lightPosition" : [ -1, 1], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - - }, - { - "imageLayers" : [ { "image" : "separatortable.png:.", "fullbright" : true }, { "image" : "separatortablelit.png:." } ], - - "imagePosition" : [-16, 0], - "frames" : 4, - "animationCycle" : 0.4, - - "direction" : "right", - - "lightPosition" : [ 0, 1], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - - } - ] -} diff --git a/objects/crafting/sb_separatortable/separatortable.png b/objects/crafting/sb_separatortable/separatortable.png deleted file mode 100644 index c42186fd..00000000 Binary files a/objects/crafting/sb_separatortable/separatortable.png and /dev/null differ diff --git a/objects/crafting/sb_separatortable/separatortableicon.png b/objects/crafting/sb_separatortable/separatortableicon.png deleted file mode 100644 index 3d0fc131..00000000 Binary files a/objects/crafting/sb_separatortable/separatortableicon.png and /dev/null differ diff --git a/objects/crafting/sb_separatortable/separatortablelit.png b/objects/crafting/sb_separatortable/separatortablelit.png deleted file mode 100644 index bb5d3cd1..00000000 Binary files a/objects/crafting/sb_separatortable/separatortablelit.png and /dev/null differ diff --git a/objects/crafting/sb_skyrail/skyrailrailcraftingtabletable.png b/objects/crafting/sb_skyrail/skyrailrailcraftingtabletable.png deleted file mode 100644 index bb63e7ea..00000000 Binary files a/objects/crafting/sb_skyrail/skyrailrailcraftingtabletable.png and /dev/null differ diff --git a/objects/crafting/sb_skyrail/skyrailrailcraftingtabletablelit.png b/objects/crafting/sb_skyrail/skyrailrailcraftingtabletablelit.png deleted file mode 100644 index 17871f93..00000000 Binary files a/objects/crafting/sb_skyrail/skyrailrailcraftingtabletablelit.png and /dev/null differ diff --git a/objects/crafting/sb_skyrail/skyrailtableicon.png b/objects/crafting/sb_skyrail/skyrailtableicon.png deleted file mode 100644 index b59fb13c..00000000 Binary files a/objects/crafting/sb_skyrail/skyrailtableicon.png and /dev/null differ diff --git a/objects/crafting/sb_stonefurnace/stonefurnace.png b/objects/crafting/sb_stonefurnace/stonefurnace.png deleted file mode 100644 index 52ba2c54..00000000 Binary files a/objects/crafting/sb_stonefurnace/stonefurnace.png and /dev/null differ diff --git a/objects/crafting/sb_stonefurnace/stonefurnaceicon.png b/objects/crafting/sb_stonefurnace/stonefurnaceicon.png deleted file mode 100644 index de51383f..00000000 Binary files a/objects/crafting/sb_stonefurnace/stonefurnaceicon.png and /dev/null differ diff --git a/objects/crafting/sb_stonefurnace/stonefurnacelit.png b/objects/crafting/sb_stonefurnace/stonefurnacelit.png deleted file mode 100644 index 8b69040d..00000000 Binary files a/objects/crafting/sb_stonefurnace/stonefurnacelit.png and /dev/null differ diff --git a/objects/crafting/sb_techconsole/techconsole.object b/objects/crafting/sb_techconsole/techconsole.object index bc50f14b..8db19083 100644 --- a/objects/crafting/sb_techconsole/techconsole.object +++ b/objects/crafting/sb_techconsole/techconsole.object @@ -1,66 +1,76 @@ { - "objectName" : "sb_techconsole", - "colonyTags" : ["misc"], - "printable" : false, - "rarity" : "legendary", - "price" : 6000, - "tooltipKind" : "sb_object", - "radioMessagesOnPickup" : [ "sb_pickuptechconsole" ], - "learnBlueprintsOnPickup" : [ "sb_techconsole" ], - "interactAction" : "OpenCraftingInterface", - "interactData" : { - "config" : "/interface/windowconfig/sb_craftingtechconsole.config", - "paneLayoutOverride" : { - "windowtitle" : { - "title" : "TECH DEVELOPMENT CONSOLE", - "subtitle" : "Develop specialized tech!", - "icon" : { - "file" : "/interface/sb_crafting/craftingicons.png:techconsole" + "objectName": "sb_techconsole", + "colonyTags": ["misc"], + "printable": false, + "rarity": "legendary", + "price": 6000, + "tooltipKind": "sb_object", + "radioMessagesOnPickup": ["sb_pickuptechconsole"], + "learnBlueprintsOnPickup": ["sb_techconsole"], + "interactAction": "OpenCraftingInterface", + "interactData": { + "config": "/interface/windowconfig/sb_craftingtechconsole.config", + "paneLayoutOverride": { + "windowtitle": { + "title": "TECH DEVELOPMENT CONSOLE", + "subtitle": "Develop specialized tech!", + "icon": { + "file": "/interface/sb_crafting/craftingicons.png:techconsole" } } }, - "requiresBlueprint" : false, - "filter" : ["sb_techconsole"] + "requiresBlueprint": false, + "filter": ["sb_techconsole"] }, - "description" : "Use this to create new techs to equip on adventures!", - "shortdescription" : "^orange;Tech Development Console^reset;", - "race" : "human", + "description": "Use this to create new techs to equip on adventures!", + "shortdescription": "^orange;Tech Development Console^reset;", + "race": "human", - "apexDescription" : "This console allows me to create tech.", - "avianDescription" : "The mystery of science. I can create tech here.", - "floranDescription" : "Floran pressss button, make magic thingsss.", - "glitchDescription" : "Pleased. A console that will allow me to create new tech.", - "humanDescription" : "The first time I used one of these to create new tech, it blew my mind. Then blew up my backpack, but that's besides the point.", - "hylotlDescription" : "A convenient, impressive way to create new tech.", + "apexDescription": "This console allows me to create tech.", + "avianDescription": "The mystery of science. I can create tech here.", + "floranDescription": "Floran pressss button, make magic thingsss.", + "glitchDescription": "Pleased. A console that will allow me to create new tech.", + "humanDescription": "The first time I used one of these to create new tech, it blew my mind. Then blew up my backpack, but that's besides the point.", + "hylotlDescription": "A convenient, impressive way to create new tech.", - "category" : "techManagement", - "lightColor" : [54, 77, 89], + "category": "crafting", + "lightColor": [54, 77, 89], - "inventoryIcon" : "techconsoleicon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "techconsole.png:.", "fullbright" : true }, { "image" : "techconsolelit.png:." } ], - "imagePosition" : [-12, -0], - "frames" : 6, - "animationCycle" : 0.6, - "direction" : "right", + "inventoryIcon": "techconsoleicon.png", + "orientations": [{ + "imageLayers": [{ + "image": "techconsole.png:.", + "fullbright": true + }, { + "image": "techconsolelit.png:." + } + ], + "imagePosition": [-12, -0], + "frames": 6, + "animationCycle": 0.6, + "direction": "right", - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - }, - { - "imageLayers" : [ { "image" : "techconsoler.png:.", "fullbright" : true }, { "image" : "techconsolerlit.png:." } ], - "imagePosition" : [-12, -0], - "frames" : 6, - "animationCycle" : 0.6, - "direction" : "left", + "spaceScan": 0.1, + "anchors": ["bottom"] + }, { + "imageLayers": [{ + "image": "techconsoler.png:.", + "fullbright": true + }, { + "image": "techconsolerlit.png:." + } + ], + "imagePosition": [-12, -0], + "frames": 6, + "animationCycle": 0.6, + "direction": "left", - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + "spaceScan": 0.1, + "anchors": ["bottom"] } ], - "soundEffect" : "/sfx/objects/bunkerpanel1.ogg" + "soundEffect": "/sfx/objects/bunkerpanel1.ogg" } diff --git a/objects/crafting/sb_techconsole/techconsole.png b/objects/crafting/sb_techconsole/techconsole.png index 4850b016..c609ac30 100644 Binary files a/objects/crafting/sb_techconsole/techconsole.png and b/objects/crafting/sb_techconsole/techconsole.png differ diff --git a/objects/crafting/sb_techconsole/techconsolelit.png b/objects/crafting/sb_techconsole/techconsolelit.png index e6131bb7..6f8ac3ba 100644 Binary files a/objects/crafting/sb_techconsole/techconsolelit.png and b/objects/crafting/sb_techconsole/techconsolelit.png differ diff --git a/objects/crafting/sb_techconsole/techconsoler.png b/objects/crafting/sb_techconsole/techconsoler.png index 9baee238..0dd2d782 100644 Binary files a/objects/crafting/sb_techconsole/techconsoler.png and b/objects/crafting/sb_techconsole/techconsoler.png differ diff --git a/objects/crafting/sb_techconsole/techconsolerlit.png b/objects/crafting/sb_techconsole/techconsolerlit.png index fdee67bb..54d42519 100644 Binary files a/objects/crafting/sb_techconsole/techconsolerlit.png and b/objects/crafting/sb_techconsole/techconsolerlit.png differ diff --git a/objects/crafting/sb_techstation/apex.object b/objects/crafting/sb_techstation/apex.object index f3fb3320..f4710f9b 100644 --- a/objects/crafting/sb_techstation/apex.object +++ b/objects/crafting/sb_techstation/apex.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/apex.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Apex Tech Station^reset;", - "race" : "apex", - "printable" : false, - "lightColor" : [61, 88, 102], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/apex.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Apex Tech Binder^reset;", + "race": "apex", + "printable": false, + "lightColor": [61, 88, 102], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : ["techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "apex0.png", - "lit0" : "apexlit0.png", - "station" : "apex.png", - "lit" : "apexlit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "apex0.png", + "lit0": "apexlit0.png", + "station": "apex.png", + "lit": "apexlit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "apex.png:default.2", - "inventoryIcon" : "icons.png:4", - "placementImagePosition" : [-16, -8], - "orientations" : [ - { - "imageLayers" : [{"image":"apex.png:.","fullbright":true}, {"image":"apexlit.png:."}], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "apex.png:default.2", + "inventoryIcon": "icons.png:4", + "placementImagePosition": [-16, -8], + "orientations": [{ + "imageLayers": [{ + "image": "apex.png:.", + "fullbright": true + }, { + "image": "apexlit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/apex.png b/objects/crafting/sb_techstation/apex.png index d673f46d..43736b19 100644 Binary files a/objects/crafting/sb_techstation/apex.png and b/objects/crafting/sb_techstation/apex.png differ diff --git a/objects/crafting/sb_techstation/apex0.png b/objects/crafting/sb_techstation/apex0.png index 67b69b75..04883dfb 100644 Binary files a/objects/crafting/sb_techstation/apex0.png and b/objects/crafting/sb_techstation/apex0.png differ diff --git a/objects/crafting/sb_techstation/apexlit.png b/objects/crafting/sb_techstation/apexlit.png index 5265315d..2e9b00d9 100644 Binary files a/objects/crafting/sb_techstation/apexlit.png and b/objects/crafting/sb_techstation/apexlit.png differ diff --git a/objects/crafting/sb_techstation/avian.object b/objects/crafting/sb_techstation/avian.object index 922f5482..64211cf3 100644 --- a/objects/crafting/sb_techstation/avian.object +++ b/objects/crafting/sb_techstation/avian.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation_avian", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation_avian"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/avian.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Avian Tech Station^reset;", - "race" : "avian", - "printable" : false, - "lightColor" : [185, 1, 0], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation_avian", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation_avian"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/avian.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Avian Tech Binder^reset;", + "race": "avian", + "printable": false, + "lightColor": [185, 1, 0], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : [ "techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "avian0.png", - "lit0" : "avianlit0.png", - "station" : "avian.png", - "lit" : "avianlit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "avian0.png", + "lit0": "avianlit0.png", + "station": "avian.png", + "lit": "avianlit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "avian.png:default.2", - "placementImagePosition" : [-16, -8], - "inventoryIcon" : "icons.png:0", - "orientations" : [ - { - "imageLayers" : [{"image":"avian.png:.","fullbright":true}, {"image":"avianlit.png:."}], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "avian.png:default.2", + "placementImagePosition": [-16, -8], + "inventoryIcon": "icons.png:0", + "orientations": [{ + "imageLayers": [{ + "image": "avian.png:.", + "fullbright": true + }, { + "image": "avianlit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/avian.png b/objects/crafting/sb_techstation/avian.png index 98270018..7bb58e04 100644 Binary files a/objects/crafting/sb_techstation/avian.png and b/objects/crafting/sb_techstation/avian.png differ diff --git a/objects/crafting/sb_techstation/avian0.png b/objects/crafting/sb_techstation/avian0.png index bc0a99c3..5678a26d 100644 Binary files a/objects/crafting/sb_techstation/avian0.png and b/objects/crafting/sb_techstation/avian0.png differ diff --git a/objects/crafting/sb_techstation/avianlit.png b/objects/crafting/sb_techstation/avianlit.png index f0517dd5..b4c89e8d 100644 Binary files a/objects/crafting/sb_techstation/avianlit.png and b/objects/crafting/sb_techstation/avianlit.png differ diff --git a/objects/crafting/sb_techstation/avianlit0.png b/objects/crafting/sb_techstation/avianlit0.png index 5f51748d..73f6d7cc 100644 Binary files a/objects/crafting/sb_techstation/avianlit0.png and b/objects/crafting/sb_techstation/avianlit0.png differ diff --git a/objects/crafting/sb_techstation/floran.object b/objects/crafting/sb_techstation/floran.object index e584912d..09734f5a 100644 --- a/objects/crafting/sb_techstation/floran.object +++ b/objects/crafting/sb_techstation/floran.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation_floran", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation_floran"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/floran.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Floran Tech Station^reset;", - "race" : "floran", - "printable" : false, - "lightColor" : [173, 0, 185], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation_floran", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation_floran"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/floran.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Floran Tech Binder^reset;", + "race": "floran", + "printable": false, + "lightColor": [173, 0, 185], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : [ "techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "floran0.png", - "lit0" : "floranlit0.png", - "station" : "floran.png", - "lit" : "floranlit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "floran0.png", + "lit0": "floranlit0.png", + "station": "floran.png", + "lit": "floranlit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "floran.png:default.2", - "placementImagePosition" : [-16, -8], - "inventoryIcon" : "icons.png:3", - "orientations" : [ - { - "imageLayers" : [{"image":"floran.png:.","fullbright":true}, {"image":"floranlit.png:."}], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "floran.png:default.2", + "placementImagePosition": [-16, -8], + "inventoryIcon": "icons.png:3", + "orientations": [{ + "imageLayers": [{ + "image": "floran.png:.", + "fullbright": true + }, { + "image": "floranlit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/floran0.png b/objects/crafting/sb_techstation/floran0.png index 6c45fa84..b3dd3118 100644 Binary files a/objects/crafting/sb_techstation/floran0.png and b/objects/crafting/sb_techstation/floran0.png differ diff --git a/objects/crafting/sb_techstation/floranlit.png b/objects/crafting/sb_techstation/floranlit.png index bdd28ad5..5e674058 100644 Binary files a/objects/crafting/sb_techstation/floranlit.png and b/objects/crafting/sb_techstation/floranlit.png differ diff --git a/objects/crafting/sb_techstation/glitch.object b/objects/crafting/sb_techstation/glitch.object index c5920f86..3e283e64 100644 --- a/objects/crafting/sb_techstation/glitch.object +++ b/objects/crafting/sb_techstation/glitch.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation_glitch", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation_glitch"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/glitch.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Glitch Tech Station^reset;", - "race" : "glitch", - "printable" : false, - "lightColor" : [185, 131, 0], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation_glitch", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation_glitch"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/glitch.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Glitch Tech Binder^reset;", + "race": "glitch", + "printable": false, + "lightColor": [185, 131, 0], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : [ "techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "glitch0.png", - "lit0" : "glitchlit0.png", - "station" : "glitch.png", - "lit" : "glitchlit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "glitch0.png", + "lit0": "glitchlit0.png", + "station": "glitch.png", + "lit": "glitchlit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "glitch.png:default.2", - "placementImagePosition" : [-16, -8], - "inventoryIcon" : "icons.png:1", - "orientations" : [ - { - "imageLayers" : [ { "image" : "glitch.png:.", "fullbright" : true }, { "image" : "glitchlit.png:." } ], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "glitch.png:default.2", + "placementImagePosition": [-16, -8], + "inventoryIcon": "icons.png:1", + "orientations": [{ + "imageLayers": [{ + "image": "glitch.png:.", + "fullbright": true + }, { + "image": "glitchlit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/glitch.png b/objects/crafting/sb_techstation/glitch.png index c470f979..80cbfd0e 100644 Binary files a/objects/crafting/sb_techstation/glitch.png and b/objects/crafting/sb_techstation/glitch.png differ diff --git a/objects/crafting/sb_techstation/glitch0.png b/objects/crafting/sb_techstation/glitch0.png index a91ff4fe..7dc87901 100644 Binary files a/objects/crafting/sb_techstation/glitch0.png and b/objects/crafting/sb_techstation/glitch0.png differ diff --git a/objects/crafting/sb_techstation/glitchlit.png b/objects/crafting/sb_techstation/glitchlit.png index ad2eb149..6e1ba10d 100644 Binary files a/objects/crafting/sb_techstation/glitchlit.png and b/objects/crafting/sb_techstation/glitchlit.png differ diff --git a/objects/crafting/sb_techstation/glitchlit0.png b/objects/crafting/sb_techstation/glitchlit0.png index 93ec4874..0297f41e 100644 Binary files a/objects/crafting/sb_techstation/glitchlit0.png and b/objects/crafting/sb_techstation/glitchlit0.png differ diff --git a/objects/crafting/sb_techstation/human.object b/objects/crafting/sb_techstation/human.object index 64523456..55066c94 100644 --- a/objects/crafting/sb_techstation/human.object +++ b/objects/crafting/sb_techstation/human.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation_human", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation_human"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/human.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Human Tech Station^reset;", - "race" : "human", - "printable" : false, - "lightColor" : [0, 122, 185], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation_human", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation_human"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/human.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Human Tech Binder^reset;", + "race": "human", + "printable": false, + "lightColor": [0, 122, 185], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : [ "techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "human0.png", - "lit0" : "humanlit0.png", - "station" : "human.png", - "lit" : "humanlit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "human0.png", + "lit0": "humanlit0.png", + "station": "human.png", + "lit": "humanlit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "human.png:default.2", - "placementImagePosition" : [-16, -8], - "inventoryIcon" : "icons.png:2", - "orientations" : [ - { - "imageLayers" : [{"image":"human.png:.","fullbright":true}, {"image":"humanlit.png:."}], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "human.png:default.2", + "placementImagePosition": [-16, -8], + "inventoryIcon": "icons.png:2", + "orientations": [{ + "imageLayers": [{ + "image": "human.png:.", + "fullbright": true + }, { + "image": "humanlit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/human.png b/objects/crafting/sb_techstation/human.png index 9a2bdab4..d151c40d 100644 Binary files a/objects/crafting/sb_techstation/human.png and b/objects/crafting/sb_techstation/human.png differ diff --git a/objects/crafting/sb_techstation/human0.png b/objects/crafting/sb_techstation/human0.png index a5318fa6..cec145e8 100644 Binary files a/objects/crafting/sb_techstation/human0.png and b/objects/crafting/sb_techstation/human0.png differ diff --git a/objects/crafting/sb_techstation/humanlit.png b/objects/crafting/sb_techstation/humanlit.png index 7eb9db5e..7b8c7c27 100644 Binary files a/objects/crafting/sb_techstation/humanlit.png and b/objects/crafting/sb_techstation/humanlit.png differ diff --git a/objects/crafting/sb_techstation/humanlit0.png b/objects/crafting/sb_techstation/humanlit0.png index 5f591821..e40285bb 100644 Binary files a/objects/crafting/sb_techstation/humanlit0.png and b/objects/crafting/sb_techstation/humanlit0.png differ diff --git a/objects/crafting/sb_techstation/hylotl.object b/objects/crafting/sb_techstation/hylotl.object index 1f97f01a..1e54211d 100644 --- a/objects/crafting/sb_techstation/hylotl.object +++ b/objects/crafting/sb_techstation/hylotl.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation_hylotl", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation_hylotl"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/hylotl.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Hylotl Tech Station^reset;", - "race" : "hylotl", - "printable" : false, - "lightColor" : [67, 102, 61], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation_hylotl", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation_hylotl"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/hylotl.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Hylotl Tech Binder^reset;", + "race": "hylotl", + "printable": false, + "lightColor": [67, 102, 61], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : [ "techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "hylotl0.png", - "lit0" : "hylotllit0.png", - "station" : "hylotl.png", - "lit" : "hylotllit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "hylotl0.png", + "lit0": "hylotllit0.png", + "station": "hylotl.png", + "lit": "hylotllit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "hylotl.png:default.2", - "placementImagePosition" : [-16, -8], - "inventoryIcon" : "icons.png:5", - "orientations" : [ - { - "imageLayers" : [{"image":"hylotl.png:.","fullbright":true}, {"image":"hylotllit.png:."}], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "hylotl.png:default.2", + "placementImagePosition": [-16, -8], + "inventoryIcon": "icons.png:5", + "orientations": [{ + "imageLayers": [{ + "image": "hylotl.png:.", + "fullbright": true + }, { + "image": "hylotllit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/hylotl.png b/objects/crafting/sb_techstation/hylotl.png index aab2f35a..a3010a3b 100644 Binary files a/objects/crafting/sb_techstation/hylotl.png and b/objects/crafting/sb_techstation/hylotl.png differ diff --git a/objects/crafting/sb_techstation/hylotl0.png b/objects/crafting/sb_techstation/hylotl0.png index 65816861..7a008262 100644 Binary files a/objects/crafting/sb_techstation/hylotl0.png and b/objects/crafting/sb_techstation/hylotl0.png differ diff --git a/objects/crafting/sb_techstation/hylotllit.png b/objects/crafting/sb_techstation/hylotllit.png index 3d392757..7afbe482 100644 Binary files a/objects/crafting/sb_techstation/hylotllit.png and b/objects/crafting/sb_techstation/hylotllit.png differ diff --git a/objects/crafting/sb_techstation/icons.png b/objects/crafting/sb_techstation/icons.png index bb93da94..b645e5bb 100644 Binary files a/objects/crafting/sb_techstation/icons.png and b/objects/crafting/sb_techstation/icons.png differ diff --git a/objects/crafting/sb_techstation/novakid.object b/objects/crafting/sb_techstation/novakid.object index 9f425d4b..4468bba7 100644 --- a/objects/crafting/sb_techstation/novakid.object +++ b/objects/crafting/sb_techstation/novakid.object @@ -1,52 +1,59 @@ { - "objectName" : "sb_techstation_novakid", - "rarity" : "legendary", - "learnBlueprintsOnPickup" : ["sb_techstation_novakid"], - "radioMessagesOnPickup" : ["sb_pickuptechstation"], - "category" : "techManagement", - "price" : 6000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage":"/objects/crafting/sb_techstation/novakid.png:default.2"}, - "description" : "A tech station. For sharing, binding, and equipping awesome tech!", - "shortdescription" : "^orange;Novakid Tech Station^reset;", - "race" : "novakid", - "printable" : false, - "lightColor" : [185, 171, 0], - "lightPosition" : [-1, 0], - "interactAction" : "ScriptPane", - "interactData" : "/interface/scripted/sb_techstation/techstation.config", + "objectName": "sb_techstation_novakid", + "rarity": "legendary", + "learnBlueprintsOnPickup": ["sb_techstation_novakid"], + "radioMessagesOnPickup": ["sb_pickuptechstation"], + "category": "techManagement", + "price": 6000, + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/crafting/sb_techstation/novakid.png:default.2" + }, + "description": "A tech binding station. For binding awesome tech!", + "shortdescription": "^orange;Novakid Tech Binder^reset;", + "race": "novakid", + "printable": false, + "lightColor": [185, 171, 0], + "lightPosition": [-1, 0], + "interactAction": "ScriptPane", + "interactData": "/interface/scripted/sb_techselection/techselection.config", - "apexDescription" : "This complex machine allows me to equip useful techs.", - "avianDescription" : "This console lets me equip techs! Useful devices, once you get over the weirdness.", - "floranDescription" : "This consssole lets Floran equip techs! New techsss always very exciting.", - "glitchDescription" : "Excited. This console allows me to equip and remove techs.", - "humanDescription" : "I can equip techs here! What a handy machine.", - "hylotlDescription" : "Techs are a fascinating advancement in bioengineering. I can equip them here.", - "novakidDescription" : "With a little know-how, I can use this machine to equip techs.", + "apexDescription": "This complex machine allows me to bind useful techs.", + "avianDescription": "This console lets me bind techs! Useful devices, once you get over the weirdness.", + "floranDescription": "This consssole lets Floran bind techs! New techsss always very exciting.", + "glitchDescription": "Excited. This console allows me to bind techs.", + "humanDescription": "I can bind techs here! What a handy machine.", + "hylotlDescription": "Techs are a fascinating advancement in bioengineering. I can bind them here.", + "novakidDescription": "With a little know-how, I can use this machine to bind techs.", - "inputNodes" : [[-2, -1]], - "scripts" : [ "techstation.lua"], - "animation" : "techstation.animation", - "animationParts" : { - "station0" : "novakid0.png", - "lit0" : "novakidlit0.png", - "station" : "novakid.png", - "lit" : "novakidlit.png" + "inputNodes": [[-2, -1]], + "scripts": ["techstation.lua"], + "animation": "techstation.animation", + "animationParts": { + "station0": "novakid0.png", + "lit0": "novakidlit0.png", + "station": "novakid.png", + "lit": "novakidlit.png" }, - "animationPosition" : [-16, -8], - "active" : true, + "animationPosition": [-16, -8], + "active": true, - "placementImage" : "novakid.png:default.2", - "placementImagePosition" : [-16, -8], - "inventoryIcon" : "icons.png:6", - "orientations" : [ - { - "imageLayers" : [{"image":"novakid.png:.","fullbright":true}, {"image":"novakidlit.png:."}], - "imagePosition" : [-16, -8], - "frames" : 8, - "animationCycle" : 1, - "spaceScan" : 0.1, - "anchors" : ["background"] + "placementImage": "novakid.png:default.2", + "placementImagePosition": [-16, -8], + "inventoryIcon": "icons.png:6", + "orientations": [{ + "imageLayers": [{ + "image": "novakid.png:.", + "fullbright": true + }, { + "image": "novakidlit.png:." + } + ], + "imagePosition": [-16, -8], + "frames": 8, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ] -} \ No newline at end of file +} diff --git a/objects/crafting/sb_techstation/novakid.png b/objects/crafting/sb_techstation/novakid.png index 961ba6fc..e90da3ef 100644 Binary files a/objects/crafting/sb_techstation/novakid.png and b/objects/crafting/sb_techstation/novakid.png differ diff --git a/objects/crafting/sb_techstation/novakid0.png b/objects/crafting/sb_techstation/novakid0.png index 207778ae..8f80f505 100644 Binary files a/objects/crafting/sb_techstation/novakid0.png and b/objects/crafting/sb_techstation/novakid0.png differ diff --git a/objects/crafting/sb_techstation/novakidlit.png b/objects/crafting/sb_techstation/novakidlit.png index 54dbd636..1dd6a2b7 100644 Binary files a/objects/crafting/sb_techstation/novakidlit.png and b/objects/crafting/sb_techstation/novakidlit.png differ diff --git a/objects/crafting/sb_techstation/novakidlit0.png b/objects/crafting/sb_techstation/novakidlit0.png index 52918ed2..3d12a0f5 100644 Binary files a/objects/crafting/sb_techstation/novakidlit0.png and b/objects/crafting/sb_techstation/novakidlit0.png differ diff --git a/objects/crafting/sb_woodencookingtable/woodencookingtable.png b/objects/crafting/sb_woodencookingtable/woodencookingtable.png index c3dafe84..bfc80252 100644 Binary files a/objects/crafting/sb_woodencookingtable/woodencookingtable.png and b/objects/crafting/sb_woodencookingtable/woodencookingtable.png differ diff --git a/objects/crafting/sb_woodencookingtable/woodencookingtableicon.png b/objects/crafting/sb_woodencookingtable/woodencookingtableicon.png index bfa6f33b..0cbcad8a 100644 Binary files a/objects/crafting/sb_woodencookingtable/woodencookingtableicon.png and b/objects/crafting/sb_woodencookingtable/woodencookingtableicon.png differ diff --git a/objects/crafting/sb_woodencraftingtable/woodencraftingtable.png b/objects/crafting/sb_woodencraftingtable/woodencraftingtable.png index 0335389a..0aaf218a 100644 Binary files a/objects/crafting/sb_woodencraftingtable/woodencraftingtable.png and b/objects/crafting/sb_woodencraftingtable/woodencraftingtable.png differ diff --git a/objects/crafting/sb_woodencraftingtable/woodencraftingtableicon.png b/objects/crafting/sb_woodencraftingtable/woodencraftingtableicon.png index 95588671..e5f927af 100644 Binary files a/objects/crafting/sb_woodencraftingtable/woodencraftingtableicon.png and b/objects/crafting/sb_woodencraftingtable/woodencraftingtableicon.png differ diff --git a/objects/crafting/sb_wrappingtable/wrappingtable.png b/objects/crafting/sb_wrappingtable/wrappingtable.png index 40bebabf..78d7e562 100644 Binary files a/objects/crafting/sb_wrappingtable/wrappingtable.png and b/objects/crafting/sb_wrappingtable/wrappingtable.png differ diff --git a/objects/crafting/uncrafter/sb_uncrafter.lua b/objects/crafting/uncrafter/sb_uncrafter.lua index 1bf77a8c..107353f3 100644 --- a/objects/crafting/uncrafter/sb_uncrafter.lua +++ b/objects/crafting/uncrafter/sb_uncrafter.lua @@ -1,19 +1,19 @@ local ini = init or function() end function init(a) ini(a) - local b = {} - b={"copperbar","copperbar"} sb_swapOutputs(1,"tungstenbar",b) - b={"sb_steelbar","tungstenbar"} sb_swapOutputs(2,"titaniumbar",b) - b={"goldbar","platinumbar"} sb_swapOutputs(3,"durasteelbar",b) - weaponLevelKinds[4][#weaponLevelKinds[4]+1] = "durasteelbar" - weaponLevelKinds[4][#weaponLevelKinds[4]+1] = "sb_refinedrubium" - weaponLevelKinds[4][#weaponLevelKinds[4]+1] = "sb_refinedrubium" - weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_refinedrubium" - weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_ceruliumcompound" - weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_ceruliumcompound" - weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_ceruliumcompound" + local b = {} + b={"copperbar","copperbar"} sb_swapOutputs(1,"tungstenbar",b) + b={"sb_steelbar","tungstenbar"} sb_swapOutputs(2,"titaniumbar",b) + b={"goldbar","platinumbar"} sb_swapOutputs(3,"durasteelbar",b) + weaponLevelKinds[4][#weaponLevelKinds[4]+1] = "durasteelbar" + weaponLevelKinds[4][#weaponLevelKinds[4]+1] = "sb_refinedrubium" + weaponLevelKinds[4][#weaponLevelKinds[4]+1] = "sb_refinedrubium" + weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_refinedrubium" +--weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_ceruliumcompound" +--weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_ceruliumcompound" +--weaponLevelKinds[5][#weaponLevelKinds[5]+1] = "sb_ceruliumcompound" end function sb_swapOutputs(l,m,b) - for i = 1, #weaponLevelKinds[l] do if weaponLevelKinds[l][i] == m then weaponLevelKinds[l][i] = b[1+i%2] end end + for i = 1, #weaponLevelKinds[l] do if weaponLevelKinds[l][i] == m then weaponLevelKinds[l][i] = b[1+i%2] end end end \ No newline at end of file diff --git a/objects/crafting/upgradeablecraftingobjects/craftingfurnace/craftingfurnace.object.patch b/objects/crafting/upgradeablecraftingobjects/craftingfurnace/craftingfurnace.object.patch deleted file mode 100644 index e2fd87a6..00000000 --- a/objects/crafting/upgradeablecraftingobjects/craftingfurnace/craftingfurnace.object.patch +++ /dev/null @@ -1,4 +0,0 @@ -[ -[{"op":"test","path":"/upgradeStages/0/itemSpawnParameters/inventoryIcon","value":"craftingfurnaceicon.png"},{"op":"replace","path":"/upgradeStages/0/itemSpawnParameters/inventoryIcon","value":"sb_craftingfurnaceicon.png"}], -[{"op":"test","path":"/inventoryIcon","value":"craftingfurnaceicon.png"},{"op":"replace","path":"/inventoryIcon","value":"sb_craftingfurnaceicon.png"}] -] \ No newline at end of file diff --git a/objects/crafting/upgradeablecraftingobjects/craftingfurnace/craftingfurnaceicon.png b/objects/crafting/upgradeablecraftingobjects/craftingfurnace/craftingfurnaceicon.png new file mode 100644 index 00000000..338b4085 Binary files /dev/null and b/objects/crafting/upgradeablecraftingobjects/craftingfurnace/craftingfurnaceicon.png differ diff --git a/objects/cultist/cultistairlockdoor/cultistairlockbossdoor.object.patch b/objects/cultist/cultistairlockdoor/cultistairlockbossdoor.object.patch index 4fb58fd6..93af3b1b 100644 --- a/objects/cultist/cultistairlockdoor/cultistairlockbossdoor.object.patch +++ b/objects/cultist/cultistairlockdoor/cultistairlockbossdoor.object.patch @@ -1,4 +1,5 @@ [ +[{"op":"test","path":"/printable","inverse":true},{"op":"add","path":"/printable","value":false}],//it only works from one side... [{"op":"test","path":"/shortdescription","value":"Cultist Airlock Door"}, {"op":"replace","path":"/shortdescription","value":"One-way Cultist Airlock"}], [{"op":"test","path":"/rarity","value":"Common"}, diff --git a/objects/events/sb_extractordrill/extractordrill.png b/objects/events/sb_extractordrill/extractordrill.png index 7263abcb..7eb7f205 100644 Binary files a/objects/events/sb_extractordrill/extractordrill.png and b/objects/events/sb_extractordrill/extractordrill.png differ diff --git a/objects/events/sb_extractordrill/extractordrillbg.png b/objects/events/sb_extractordrill/extractordrillbg.png index a150399a..d58c371f 100644 Binary files a/objects/events/sb_extractordrill/extractordrillbg.png and b/objects/events/sb_extractordrill/extractordrillbg.png differ diff --git a/objects/events/sb_extractordrill/extractordrillcog.png b/objects/events/sb_extractordrill/extractordrillcog.png index b1fa5703..c66cc5cd 100644 Binary files a/objects/events/sb_extractordrill/extractordrillcog.png and b/objects/events/sb_extractordrill/extractordrillcog.png differ diff --git a/objects/events/sb_extractordrill/extractordrillrack.png b/objects/events/sb_extractordrill/extractordrillrack.png index fcda9395..125ec15c 100644 Binary files a/objects/events/sb_extractordrill/extractordrillrack.png and b/objects/events/sb_extractordrill/extractordrillrack.png differ diff --git a/objects/farmables/sb_poisoncreep/poisoncreepseed.png b/objects/farmables/sb_poisoncreep/poisoncreepseed.png index b7bc562e..e54c82f5 100644 Binary files a/objects/farmables/sb_poisoncreep/poisoncreepseed.png and b/objects/farmables/sb_poisoncreep/poisoncreepseed.png differ diff --git a/objects/farmables/sb_poisoncreep/poisoncreepseedicon.png b/objects/farmables/sb_poisoncreep/poisoncreepseedicon.png index 900cccce..7b1ffe4b 100644 Binary files a/objects/farmables/sb_poisoncreep/poisoncreepseedicon.png and b/objects/farmables/sb_poisoncreep/poisoncreepseedicon.png differ diff --git a/objects/farmables/sb_swordstone/icon.png b/objects/farmables/sb_swordstone/icon.png index 59de572e..0c8afc09 100644 Binary files a/objects/farmables/sb_swordstone/icon.png and b/objects/farmables/sb_swordstone/icon.png differ diff --git a/objects/farmables/sb_swordstone/swordstone.png b/objects/farmables/sb_swordstone/swordstone.png index 31be2062..986cbca0 100644 Binary files a/objects/farmables/sb_swordstone/swordstone.png and b/objects/farmables/sb_swordstone/swordstone.png differ diff --git a/objects/floran/florancrate/florancrateicon.png b/objects/floran/florancrate/florancrateicon.png new file mode 100644 index 00000000..50ad1885 Binary files /dev/null and b/objects/floran/florancrate/florancrateicon.png differ diff --git a/objects/generic/arcadegame/arcadegameobject.object.patch b/objects/generic/arcadegame/arcadegameobject.object.patch index ffce7f29..ca19280b 100644 --- a/objects/generic/arcadegame/arcadegameobject.object.patch +++ b/objects/generic/arcadegame/arcadegameobject.object.patch @@ -1 +1,5 @@ -[[{"op":"test","path":"/category","value":"decorative"},{"op":"replace","path":"/category","value":"other"}]] \ No newline at end of file +[ +//Keep it decorative so it can be printed +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Legendary"}], +[{"op":"test","path":"/printable","value":false},{"op":"replace","path":"/printable","value":true}] +] \ No newline at end of file diff --git a/objects/generic/datastation/datastationicon.png b/objects/generic/datastation/datastationicon.png new file mode 100644 index 00000000..abccca41 Binary files /dev/null and b/objects/generic/datastation/datastationicon.png differ diff --git a/objects/generic/durasteelelevator/durasteelelevatorshortbottom.png b/objects/generic/durasteelelevator/durasteelelevatorshortbottom.png index 468bdf8f..d73d31df 100644 Binary files a/objects/generic/durasteelelevator/durasteelelevatorshortbottom.png and b/objects/generic/durasteelelevator/durasteelelevatorshortbottom.png differ diff --git a/objects/generic/durasteelelevator/platform.png b/objects/generic/durasteelelevator/platform.png index fb3a8dc4..383280f7 100644 Binary files a/objects/generic/durasteelelevator/platform.png and b/objects/generic/durasteelelevator/platform.png differ diff --git a/objects/generic/moderntable/moderntableicon.png b/objects/generic/moderntable/moderntableicon.png index 10ebb1ac..cfc0dcea 100644 Binary files a/objects/generic/moderntable/moderntableicon.png and b/objects/generic/moderntable/moderntableicon.png differ diff --git a/objects/generic/sb_explosivebarrel/explosivebarrel.png b/objects/generic/sb_explosivebarrel/explosivebarrel.png index 710175b5..5f0266ed 100644 Binary files a/objects/generic/sb_explosivebarrel/explosivebarrel.png and b/objects/generic/sb_explosivebarrel/explosivebarrel.png differ diff --git a/objects/generic/sb_explosivebarrel/explosivebarrelicon.png b/objects/generic/sb_explosivebarrel/explosivebarrelicon.png index e6c957a2..3470a973 100644 Binary files a/objects/generic/sb_explosivebarrel/explosivebarrelicon.png and b/objects/generic/sb_explosivebarrel/explosivebarrelicon.png differ diff --git a/objects/generic/sb_foodbowl/sb_foodbowl.png b/objects/generic/sb_foodbowl/sb_foodbowl.png index 03b9d52e..b73856c6 100644 Binary files a/objects/generic/sb_foodbowl/sb_foodbowl.png and b/objects/generic/sb_foodbowl/sb_foodbowl.png differ diff --git a/objects/generic/sb_foodbowl/sb_foodbowlicon.png b/objects/generic/sb_foodbowl/sb_foodbowlicon.png index 609546e2..b7edb7a0 100644 Binary files a/objects/generic/sb_foodbowl/sb_foodbowlicon.png and b/objects/generic/sb_foodbowl/sb_foodbowlicon.png differ diff --git a/objects/generic/sb_mechanicaltable/mechanicaltable.png b/objects/generic/sb_mechanicaltable/mechanicaltable.png index b309f77c..967d973c 100644 Binary files a/objects/generic/sb_mechanicaltable/mechanicaltable.png and b/objects/generic/sb_mechanicaltable/mechanicaltable.png differ diff --git a/objects/generic/sb_metalcrate/metalcrate.png b/objects/generic/sb_metalcrate/metalcrate.png index ece9cc2b..5c08ae51 100644 Binary files a/objects/generic/sb_metalcrate/metalcrate.png and b/objects/generic/sb_metalcrate/metalcrate.png differ diff --git a/objects/generic/sb_metalcrate/metalcratelit.png b/objects/generic/sb_metalcrate/metalcratelit.png index 81451e45..43acb352 100644 Binary files a/objects/generic/sb_metalcrate/metalcratelit.png and b/objects/generic/sb_metalcrate/metalcratelit.png differ diff --git a/objects/generic/sb_plate/alienfruitjam.png b/objects/generic/sb_plate/alienfruitjam.png index 05a54849..b3a8ea8d 100644 Binary files a/objects/generic/sb_plate/alienfruitjam.png and b/objects/generic/sb_plate/alienfruitjam.png differ diff --git a/objects/generic/sb_plate/bottle.png b/objects/generic/sb_plate/bottle.png new file mode 100644 index 00000000..1e29799d Binary files /dev/null and b/objects/generic/sb_plate/bottle.png differ diff --git a/objects/generic/sb_plate/feathercrownjam.png b/objects/generic/sb_plate/feathercrownjam.png index b85925e3..77ee9619 100644 Binary files a/objects/generic/sb_plate/feathercrownjam.png and b/objects/generic/sb_plate/feathercrownjam.png differ diff --git a/objects/generic/sb_plate/kiwijam.png b/objects/generic/sb_plate/kiwijam.png index 6d98ab0b..d2bbfb58 100644 Binary files a/objects/generic/sb_plate/kiwijam.png and b/objects/generic/sb_plate/kiwijam.png differ diff --git a/objects/generic/sb_plate/oceansalsa.png b/objects/generic/sb_plate/oceansalsa.png index a75c64bf..701b5aa9 100644 Binary files a/objects/generic/sb_plate/oceansalsa.png and b/objects/generic/sb_plate/oceansalsa.png differ diff --git a/objects/generic/sb_plate/pearlpeajam.png b/objects/generic/sb_plate/pearlpeajam.png index af2b9f35..364b2f11 100644 Binary files a/objects/generic/sb_plate/pearlpeajam.png and b/objects/generic/sb_plate/pearlpeajam.png differ diff --git a/objects/generic/sb_plate/pineapplejam.png b/objects/generic/sb_plate/pineapplejam.png index e770f45d..a9985c64 100644 Binary files a/objects/generic/sb_plate/pineapplejam.png and b/objects/generic/sb_plate/pineapplejam.png differ diff --git a/objects/generic/sb_plate/plate.png b/objects/generic/sb_plate/plate.png index 26f07d5c..f4edca51 100644 Binary files a/objects/generic/sb_plate/plate.png and b/objects/generic/sb_plate/plate.png differ diff --git a/objects/generic/sb_plate/pussplumjam.png b/objects/generic/sb_plate/pussplumjam.png index 94582499..bc0c1746 100644 Binary files a/objects/generic/sb_plate/pussplumjam.png and b/objects/generic/sb_plate/pussplumjam.png differ diff --git a/objects/generic/sb_plate/sb_cake.png b/objects/generic/sb_plate/sb_cake.png index 0b3a0cc4..bf2e31f3 100644 Binary files a/objects/generic/sb_plate/sb_cake.png and b/objects/generic/sb_plate/sb_cake.png differ diff --git a/objects/generic/sb_plate/sb_crystaljam.png b/objects/generic/sb_plate/sb_crystaljam.png index 29b573c7..abbd6c51 100644 Binary files a/objects/generic/sb_plate/sb_crystaljam.png and b/objects/generic/sb_plate/sb_crystaljam.png differ diff --git a/objects/generic/sb_plate/sb_plate.png b/objects/generic/sb_plate/sb_plate.png index c4a9cfcc..7033b0b7 100644 Binary files a/objects/generic/sb_plate/sb_plate.png and b/objects/generic/sb_plate/sb_plate.png differ diff --git a/objects/generic/sb_plate/volcanicsalsa.png b/objects/generic/sb_plate/volcanicsalsa.png index 88e41acc..97796dd5 100644 Binary files a/objects/generic/sb_plate/volcanicsalsa.png and b/objects/generic/sb_plate/volcanicsalsa.png differ diff --git a/objects/generic/sb_radio/radio.png b/objects/generic/sb_radio/radio.png index 15b2eca0..a2e5379b 100644 Binary files a/objects/generic/sb_radio/radio.png and b/objects/generic/sb_radio/radio.png differ diff --git a/objects/generic/sb_steelelevator/platform.png b/objects/generic/sb_steelelevator/platform.png index 68ef0618..6be263db 100644 Binary files a/objects/generic/sb_steelelevator/platform.png and b/objects/generic/sb_steelelevator/platform.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorlongbottom.png b/objects/generic/sb_steelelevator/steelelevatorlongbottom.png index c3f8c1b4..67cb338a 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorlongbottom.png and b/objects/generic/sb_steelelevator/steelelevatorlongbottom.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorlongicon.png b/objects/generic/sb_steelelevator/steelelevatorlongicon.png index aa66e20d..7da506d1 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorlongicon.png and b/objects/generic/sb_steelelevator/steelelevatorlongicon.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorlongtop.png b/objects/generic/sb_steelelevator/steelelevatorlongtop.png index 8bdeed64..2059815d 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorlongtop.png and b/objects/generic/sb_steelelevator/steelelevatorlongtop.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorshortbottom.png b/objects/generic/sb_steelelevator/steelelevatorshortbottom.png index de8f27f8..a8d2fc0f 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorshortbottom.png and b/objects/generic/sb_steelelevator/steelelevatorshortbottom.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorshorticon.png b/objects/generic/sb_steelelevator/steelelevatorshorticon.png index 31fdaea3..2fef8a8b 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorshorticon.png and b/objects/generic/sb_steelelevator/steelelevatorshorticon.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorshortstand.png b/objects/generic/sb_steelelevator/steelelevatorshortstand.png index 3ed6267d..0d45bc7a 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorshortstand.png and b/objects/generic/sb_steelelevator/steelelevatorshortstand.png differ diff --git a/objects/generic/sb_steelelevator/steelelevatorshorttop.png b/objects/generic/sb_steelelevator/steelelevatorshorttop.png index 9abfce45..f277e34b 100644 Binary files a/objects/generic/sb_steelelevator/steelelevatorshorttop.png and b/objects/generic/sb_steelelevator/steelelevatorshorttop.png differ diff --git a/objects/generic/sb_walllight/walllight.png b/objects/generic/sb_walllight/walllight.png index 69683404..8821f4ac 100644 Binary files a/objects/generic/sb_walllight/walllight.png and b/objects/generic/sb_walllight/walllight.png differ diff --git a/objects/generic/sb_walllight/walllighticon.png b/objects/generic/sb_walllight/walllighticon.png index 1f410859..8c72efdc 100644 Binary files a/objects/generic/sb_walllight/walllighticon.png and b/objects/generic/sb_walllight/walllighticon.png differ diff --git a/objects/generic/sb_woodenendtable/woodenendtable.png b/objects/generic/sb_woodenendtable/woodenendtable.png index 20c07aad..03f56c5c 100644 Binary files a/objects/generic/sb_woodenendtable/woodenendtable.png and b/objects/generic/sb_woodenendtable/woodenendtable.png differ diff --git a/objects/generic/sb_woodenlocker/woodenlocker.png b/objects/generic/sb_woodenlocker/woodenlocker.png index 809b74ed..05e193ad 100644 Binary files a/objects/generic/sb_woodenlocker/woodenlocker.png and b/objects/generic/sb_woodenlocker/woodenlocker.png differ diff --git a/objects/generic/sb_woodenlocker/woodenlockericon.png b/objects/generic/sb_woodenlocker/woodenlockericon.png index 107310bc..b1fe493c 100644 Binary files a/objects/generic/sb_woodenlocker/woodenlockericon.png and b/objects/generic/sb_woodenlocker/woodenlockericon.png differ diff --git a/objects/generic/sb_woodenshelf/woodenshelf.png b/objects/generic/sb_woodenshelf/woodenshelf.png index e1f09988..1c663d96 100644 Binary files a/objects/generic/sb_woodenshelf/woodenshelf.png and b/objects/generic/sb_woodenshelf/woodenshelf.png differ diff --git a/objects/generic/sb_woodenwallfan/woodenwallfan.png b/objects/generic/sb_woodenwallfan/woodenwallfan.png index 2324ac49..c06cc84a 100644 Binary files a/objects/generic/sb_woodenwallfan/woodenwallfan.png and b/objects/generic/sb_woodenwallfan/woodenwallfan.png differ diff --git a/objects/generic/sb_woodenwallfan/woodenwallfanicon.png b/objects/generic/sb_woodenwallfan/woodenwallfanicon.png index 949c0e8d..b3bfb457 100644 Binary files a/objects/generic/sb_woodenwallfan/woodenwallfanicon.png and b/objects/generic/sb_woodenwallfan/woodenwallfanicon.png differ diff --git a/objects/glitch/sb_tinywoodencrate/tinywoodencrate.png b/objects/glitch/sb_tinywoodencrate/tinywoodencrate.png index 5aac8dca..eb4fae3a 100644 Binary files a/objects/glitch/sb_tinywoodencrate/tinywoodencrate.png and b/objects/glitch/sb_tinywoodencrate/tinywoodencrate.png differ diff --git a/objects/holiday/bigpresent/bigpresent.object.patch b/objects/holiday/bigpresent/bigpresent.object.patch deleted file mode 100644 index 006df1b7..00000000 --- a/objects/holiday/bigpresent/bigpresent.object.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","inverse":true,"path":"/tooltipKind"},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/holiday/holidaycraftingtable/holidaycraftingtableicon.png b/objects/holiday/holidaycraftingtable/holidaycraftingtableicon.png new file mode 100644 index 00000000..7152e8c6 Binary files /dev/null and b/objects/holiday/holidaycraftingtable/holidaycraftingtableicon.png differ diff --git a/objects/holiday/present1/present1.object.patch b/objects/holiday/present1/present1.object.patch deleted file mode 100644 index 006df1b7..00000000 --- a/objects/holiday/present1/present1.object.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","inverse":true,"path":"/tooltipKind"},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/holiday/present2/present2.object.patch b/objects/holiday/present2/present2.object.patch deleted file mode 100644 index 006df1b7..00000000 --- a/objects/holiday/present2/present2.object.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","inverse":true,"path":"/tooltipKind"},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/holiday/present3/present3.object.patch b/objects/holiday/present3/present3.object.patch deleted file mode 100644 index 006df1b7..00000000 --- a/objects/holiday/present3/present3.object.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","inverse":true,"path":"/tooltipKind"},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/holiday/present4/present4.object.patch b/objects/holiday/present4/present4.object.patch deleted file mode 100644 index 006df1b7..00000000 --- a/objects/holiday/present4/present4.object.patch +++ /dev/null @@ -1 +0,0 @@ -[[{"op":"test","inverse":true,"path":"/tooltipKind"},{"op":"add","path":"/tooltipKind","value":"sb_object"}]] \ No newline at end of file diff --git a/objects/human/barbedwire/barbedwireicon.png b/objects/human/barbedwire/barbedwireicon.png new file mode 100644 index 00000000..c28bb82f Binary files /dev/null and b/objects/human/barbedwire/barbedwireicon.png differ diff --git a/objects/human/bunkercrate/bunkercrateicon.png b/objects/human/bunkercrate/bunkercrateicon.png new file mode 100644 index 00000000..6e7fb8fa Binary files /dev/null and b/objects/human/bunkercrate/bunkercrateicon.png differ diff --git a/objects/human/bunkerposter1/bunkerposter1icon.png b/objects/human/bunkerposter1/bunkerposter1icon.png index fded3df3..d5b66093 100644 Binary files a/objects/human/bunkerposter1/bunkerposter1icon.png and b/objects/human/bunkerposter1/bunkerposter1icon.png differ diff --git a/objects/human/oven1/oven1icon.png b/objects/human/oven1/oven1icon.png new file mode 100644 index 00000000..0f9d6008 Binary files /dev/null and b/objects/human/oven1/oven1icon.png differ diff --git a/objects/human/prisonbarrelfire/prisonbarrelfire.object.patch b/objects/human/prisonbarrelfire/prisonbarrelfire.object.patch index d8543c6b..5df7a78b 100644 --- a/objects/human/prisonbarrelfire/prisonbarrelfire.object.patch +++ b/objects/human/prisonbarrelfire/prisonbarrelfire.object.patch @@ -1,21 +1,41 @@ [ -[{"op":"test","path":"/interactAction","inverse":true}, -{"op":"test","path":"/recipeGroup","inverse":true}, -{"op":"test","path":"/openSounds","inverse":true}, -{"op":"test","path":"/slotCount","inverse":true}, -{"op":"test","path":"/uiConfig","inverse":true}, -{"op":"test","path":"/frameCooldown","inverse":true}, -{"op":"test","path":"/autoCloseCooldown","inverse":true}, -{"op":"test","path":"/interactive","inverse":true}, -{"op":"test","path":"/objectType","inverse":true}, -{"op":"test","path":"/tooltipKind","inverse":true}, - -{"op":"add","path":"/recipeGroup","value":"campfire"}, -{"op":"add","path":"/openSounds","value":["/sfx/objects/metalbox_open.ogg"]}, -{"op":"add","path":"/slotCount","value":2}, -{"op":"add","path":"/uiConfig","value":"/interface/sb_objectcrafting/campfire.config"}, -{"op":"add","path":"/frameCooldown","value":5}, -{"op":"add","path":"/autoCloseCooldown","value":3600}, -{"op":"add","path":"/objectType","value":"container"}, -{"op":"add","path":"/tooltipKind","value":"sb_object"}] -] \ No newline at end of file + [{ + "op": "test", + "path": "/interactAction", + "inverse": true + }, { + "op": "test", + "path": "/slotCount", + "inverse": true + }, { + "op": "test", + "path": "/interactData", + "inverse": true + }, { + "op": "test", + "path": "/interactive", + "inverse": true + }, { + "op": "add", + "path": "/interactAction", + "value": "OpenCraftingInterface" + }, { + "op": "add", + "path": "/interactData", + "value": { + "config": "/interface/windowconfig/craftingcampfire.config", + "paneLayoutOverride": { + "windowtitle": { + "title": " Barrel Fire", + "subtitle": " A variation on oil cooking" + } + }, + "filter": ["campfire"] + } + }, { + "op": "replace", + "path": "/category", + "value": "crafting" + } + ] +] diff --git a/objects/human/prisonbed/prisonbedicon.png b/objects/human/prisonbed/prisonbedicon.png new file mode 100644 index 00000000..93a0133a Binary files /dev/null and b/objects/human/prisonbed/prisonbedicon.png differ diff --git a/objects/human/prisonfile1/prisonfile1icon.png b/objects/human/prisonfile1/prisonfile1icon.png new file mode 100644 index 00000000..5c68d11d Binary files /dev/null and b/objects/human/prisonfile1/prisonfile1icon.png differ diff --git a/objects/human/prisonfile2/prisonfile2icon.png b/objects/human/prisonfile2/prisonfile2icon.png new file mode 100644 index 00000000..ba2a317c Binary files /dev/null and b/objects/human/prisonfile2/prisonfile2icon.png differ diff --git a/objects/human/prisonlocker1/prisonlocker1.object.patch b/objects/human/prisonlocker1/prisonlocker1.object.patch new file mode 100644 index 00000000..c85ffb06 --- /dev/null +++ b/objects/human/prisonlocker1/prisonlocker1.object.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/shortdescription","value":"Small Prison Locker"},{"op":"replace","path":"/shortdescription","value":"Wide Prison Locker"}] +] \ No newline at end of file diff --git a/objects/human/prisonlocker1/prisonlocker1icon.png b/objects/human/prisonlocker1/prisonlocker1icon.png new file mode 100644 index 00000000..3e78d3bb Binary files /dev/null and b/objects/human/prisonlocker1/prisonlocker1icon.png differ diff --git a/objects/human/prisonlocker2/prisonlocker2.object.patch b/objects/human/prisonlocker2/prisonlocker2.object.patch new file mode 100644 index 00000000..d6940d52 --- /dev/null +++ b/objects/human/prisonlocker2/prisonlocker2.object.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/shortdescription","value":"Tall Prison Locker"},{"op":"replace","path":"/shortdescription","value":"Prison Locker"}] +] \ No newline at end of file diff --git a/objects/human/prisonlocker2/prisonlocker2icon.png b/objects/human/prisonlocker2/prisonlocker2icon.png new file mode 100644 index 00000000..8c32bdfe Binary files /dev/null and b/objects/human/prisonlocker2/prisonlocker2icon.png differ diff --git a/objects/human/prisonradiator/prisonradiatoricon.png b/objects/human/prisonradiator/prisonradiatoricon.png new file mode 100644 index 00000000..45ad9707 Binary files /dev/null and b/objects/human/prisonradiator/prisonradiatoricon.png differ diff --git a/objects/human/sb_bunkerrobotfactory/bunkerrobotfactory.png b/objects/human/sb_bunkerrobotfactory/bunkerrobotfactory.png index 99ace94a..72628bdc 100644 Binary files a/objects/human/sb_bunkerrobotfactory/bunkerrobotfactory.png and b/objects/human/sb_bunkerrobotfactory/bunkerrobotfactory.png differ diff --git a/objects/human/sb_bunkerrobotfactory/bunkerrobotfactoryicon.png b/objects/human/sb_bunkerrobotfactory/bunkerrobotfactoryicon.png index e32c3268..c75ba0bf 100644 Binary files a/objects/human/sb_bunkerrobotfactory/bunkerrobotfactoryicon.png and b/objects/human/sb_bunkerrobotfactory/bunkerrobotfactoryicon.png differ diff --git a/objects/human/watermachine/watermachineicon.png b/objects/human/watermachine/watermachineicon.png new file mode 100644 index 00000000..170c2ee0 Binary files /dev/null and b/objects/human/watermachine/watermachineicon.png differ diff --git a/objects/hylotl/beautifulattempt/beautifulattempt.object.patch b/objects/hylotl/beautifulattempt/beautifulattempt.object.patch index ffce7f29..1a541af9 100644 --- a/objects/hylotl/beautifulattempt/beautifulattempt.object.patch +++ b/objects/hylotl/beautifulattempt/beautifulattempt.object.patch @@ -1 +1,7 @@ -[[{"op":"test","path":"/category","value":"decorative"},{"op":"replace","path":"/category","value":"other"}]] \ No newline at end of file +[ +//Keep it decorative so it can be printed +[{"op":"test","path":"/printable","value":false},{"op":"replace","path":"/printable","value":true}], +[{"op":"test","path":"/shortdescription","value":"Beautiful Attempt! Machine"},{"op":"replace","path":"/shortdescription","value":"Beautiful Attempt!"}], +[{"op":"test","path":"/retainObjectParametersInItem","inverse":true},{"op":"add","path":"/retainObjectParametersInItem","value":true}], +[{"op":"add","path":"/scripts/-","value":"/interface/scripted/sbvn/sb_sbvnobject.lua"}] +] \ No newline at end of file diff --git a/objects/hylotl/sb_hylotlpost/hylotlpost.png b/objects/hylotl/sb_hylotlpost/hylotlpost.png index bb1c0b35..557f6702 100644 Binary files a/objects/hylotl/sb_hylotlpost/hylotlpost.png and b/objects/hylotl/sb_hylotlpost/hylotlpost.png differ diff --git a/objects/hylotl/sb_hylotlpost/lit.png b/objects/hylotl/sb_hylotlpost/lit.png index 4379f49f..9ce1b315 100644 Binary files a/objects/hylotl/sb_hylotlpost/lit.png and b/objects/hylotl/sb_hylotlpost/lit.png differ diff --git a/objects/hylotl/sb_meatballs2/icon.png b/objects/hylotl/sb_meatballs2/icon.png new file mode 100644 index 00000000..6f2eb284 Binary files /dev/null and b/objects/hylotl/sb_meatballs2/icon.png differ diff --git a/objects/hylotl/sb_meatballs2/meatballs2.object b/objects/hylotl/sb_meatballs2/meatballs2.object index 43298752..ccea4621 100644 --- a/objects/hylotl/sb_meatballs2/meatballs2.object +++ b/objects/hylotl/sb_meatballs2/meatballs2.object @@ -1,32 +1,31 @@ { - "objectName" : "sb_meatballs2", - "colonyTags" : ["hylotl","hylotloceancity"], - "rarity" : "Common", - "tooltipKind" : "sb_object", - "category" : "decorative", - "price" : 25, - "description" : "Meatballs in a sealed can. There's no way we're getting this open.", - "shortdescription" : "Can of Meatballs", - "race" : "hylotl", + "objectName": "sb_meatballs2", + "colonyTags": ["hylotl", "hylotloceancity"], + "rarity": "Common", + "tooltipKind": "sb_object", + "category": "decorative", + "price": 25, + "description": "Meatballs in a sealed can. There's no way we're getting this open.", + "shortdescription": "Sealed Meatballs", + "race": "hylotl", - "apexDescription" : "A can of meatballs. Such an item is a luxury in Miniknog settlements.", - "avianDescription" : "Some Avians can open cans with their beaks. I'm not willing to try it.", - "floranDescription" : "Throw!", - "glitchDescription" : "Neutral. A tin can.", - "humanDescription" : "Meatballs in a can. Not quite homemade, but then again, we're in space.", - "hylotlDescription" : "A replica of a can of meatballs. A perfect example of modern art.", - "novakidDescription" : "Yeehaw! Target practice!", + "apexDescription": "A can of meatballs. Such an item is a luxury in Miniknog settlements.", + "avianDescription": "Some Avians can open cans with their beaks. I'm not willing to try it.", + "floranDescription": "Metal can for throwing!", + "glitchDescription": "Neutral. A tin can.", + "humanDescription": "Meatballs in a can. Not quite homemade, but then again, we're in space. Plus, they'll keep a lot longer.", + "hylotlDescription": "A replica of a can of meatballs. A perfect example of modern art.", + "novakidDescription": "Yeehaw! Target practice!", - "inventoryIcon" : "meatballs2.png?border=1;000", - "orientations" : [ - { - "dualImage" : "meatballs2.png:", - "imagePosition" : [0, 0], - "frames" : 1, - "animationCycle" : 0.5, - "spaceScan" : 0.1, - "anchors" : ["bottom"], - "collision" : "platform" + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "meatballs2.png:", + "imagePosition": [0, 0], + "frames": 1, + "animationCycle": 0.5, + "spaceScan": 0.1, + "anchors": ["bottom"], + "collision": "platform" } ] -} \ No newline at end of file +} diff --git a/objects/hylotl/sb_meatballs2/meatballs2.png b/objects/hylotl/sb_meatballs2/meatballs2.png index 6619a844..70257e71 100644 Binary files a/objects/hylotl/sb_meatballs2/meatballs2.png and b/objects/hylotl/sb_meatballs2/meatballs2.png differ diff --git a/objects/hylotl/sb_penguinplush/icon.png b/objects/hylotl/sb_penguinplush/icon.png index 31d4944d..9ac80367 100644 Binary files a/objects/hylotl/sb_penguinplush/icon.png and b/objects/hylotl/sb_penguinplush/icon.png differ diff --git a/objects/hylotl/sb_penguinplush/penguinplush.png b/objects/hylotl/sb_penguinplush/penguinplush.png index a2879bcf..3f500064 100644 Binary files a/objects/hylotl/sb_penguinplush/penguinplush.png and b/objects/hylotl/sb_penguinplush/penguinplush.png differ diff --git a/objects/hylotl/sb_softdrinks/blueicon.png b/objects/hylotl/sb_softdrinks/blueicon.png index 0d4874db..b22f3bc7 100644 Binary files a/objects/hylotl/sb_softdrinks/blueicon.png and b/objects/hylotl/sb_softdrinks/blueicon.png differ diff --git a/objects/hylotl/sb_softdrinks/redicon.png b/objects/hylotl/sb_softdrinks/redicon.png index 15381e73..a1b60d49 100644 Binary files a/objects/hylotl/sb_softdrinks/redicon.png and b/objects/hylotl/sb_softdrinks/redicon.png differ diff --git a/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmall.png b/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmall.png index 62b9080b..cc92cf80 100644 Binary files a/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmall.png and b/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmall.png differ diff --git a/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmallicon.png b/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmallicon.png index d9ae251a..0014d55d 100644 Binary files a/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmallicon.png and b/objects/hylotl/sb_underwaterlightsmall/underwaterlightsmallicon.png differ diff --git a/objects/microformer/sb_microformercoralcave.object b/objects/microformer/sb_microformercoralcave.object index 74099d60..8133a2fe 100644 --- a/objects/microformer/sb_microformercoralcave.object +++ b/objects/microformer/sb_microformercoralcave.object @@ -1,59 +1,63 @@ { - "objectName" : "sb_microformercoralcave", - "colonyTags" : [], - "rarity" : "Legendary", - "description" : "Transforms an area of a planet into a hot coral region.", - "shortdescription" : "Coral Cave Microformer", - "race" : "ancient", - "category" : "terraformer", - "price" : 3000, - "printable" : false, - - "inventoryIcon" : "flesh/microformericon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "flesh/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "right" - }, - { - "imageLayers" : [ { "image" : "flesh/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - "flipImages" : true, - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "left" + "objectName": "sb_microformercoralcave", + "colonyTags": [], + "rarity": "Legendary", + "description": "Transforms an area of a planet into a hot coral region.", + "shortdescription": "Coral Cave Microformer", + "race": "ancient", + "category": "terraformer", + "price": 3000, + "printable": false, + + "inventoryIcon": "flesh/microformericon.png", + "orientations": [{ + "imageLayers": [{ + "image": "flesh/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "right" + }, { + "imageLayers": [{ + "image": "flesh/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "flipImages": true, + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "left" } ], - "health" : 5, - "rooting" : true, - - "animation" : "microformer.animation", - "animationPosition" : [-16, 0], - "animationParts" : { - "base" : "microformer.png", - "baseFullbright" : "flesh/microformerfullbright.png" + "health": 5, + "rooting": true, + "animation": "microformer.animation", + "animationPosition": [-16, 0], + "animationParts": { + "base": "microformer.png", + "baseFullbright": "flesh/microformerfullbright.png" }, - "smashSounds" : [ "/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg" ], - "smashParticles" : [ { "count" : 20, "particle" : "ancientshard1" } ], - - "scripts" : ["/objects/microformer/microformer.lua"], - "scriptDelta" : 10, - - "terraformOffset" : [-15, 0], - "terraformSize" : 400, - - "pregenerateTime" : [5, 30], + "smashSounds": ["/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg"], + "smashParticles": [{ + "count": 20, + "particle": "ancientshard1" + } + ], - "terraformBiome" : "sb_coralcave" -} \ No newline at end of file + "scripts": ["/objects/microformer/microformer.lua"], + "scriptDelta": 10, + "terraformOffset": [-15, 0], + "terraformSize": 400, + "pregenerateTime": [5, 30], + "terraformBiome": "sb_coralcave" +} diff --git a/objects/microformer/sb_microformercrystalcave.object b/objects/microformer/sb_microformercrystalcave.object index d3811eb1..e6175560 100644 --- a/objects/microformer/sb_microformercrystalcave.object +++ b/objects/microformer/sb_microformercrystalcave.object @@ -1,59 +1,61 @@ { - "objectName" : "sb_microformercrystalcave", - "colonyTags" : [], - "rarity" : "Legendary", - "description" : "Transforms an area of a planet into a rocky crystalline region.", - "shortdescription" : "Crystal Cave Microformer", - "race" : "ancient", - "category" : "terraformer", - "price" : 3000, - "printable" : false, - - "inventoryIcon" : "eyepatch/microformericon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "eyepatch/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "right" - }, - { - "imageLayers" : [ { "image" : "eyepatch/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - "flipImages" : true, - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "left" + "objectName": "sb_microformercrystalcave", + "colonyTags": [], + "rarity": "Legendary", + "description": "Transforms an area of a planet into a rocky crystalline region.", + "shortdescription": "Crystal Cave Microformer", + "race": "ancient", + "category": "terraformer", + "price": 3000, + "printable": false, + + "inventoryIcon": "eyepatch/microformericon.png", + "orientations": [{ + "imageLayers": [{ + "image": "eyepatch/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "right" + }, { + "imageLayers": [{ + "image": "eyepatch/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "flipImages": true, + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "left" } ], - "health" : 5, - "rooting" : true, - - "animation" : "microformer.animation", - "animationPosition" : [-16, 0], - "animationParts" : { - "base" : "microformer.png", - "baseFullbright" : "eyepatch/microformerfullbright.png" + "health": 5, + "rooting": true, + "animation": "microformer.animation", + "animationPosition": [-16, 0], + "animationParts": { + "base": "microformer.png", + "baseFullbright": "eyepatch/microformerfullbright.png" }, - - "smashSounds" : [ "/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg" ], - "smashParticles" : [ { "count" : 20, "particle" : "ancientshard1" } ], - - "scripts" : ["/objects/microformer/microformer.lua"], - "scriptDelta" : 10, - - "terraformOffset" : [-15, 0], - "terraformSize" : 400, - - "pregenerateTime" : [5, 30], - - "terraformBiome" : "sb_crystalcave" -} \ No newline at end of file + "smashSounds": ["/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg"], + "smashParticles": [{ + "count": 20, + "particle": "ancientshard1" + } + ], + "scripts": ["/objects/microformer/microformer.lua"], + "scriptDelta": 10, + "terraformOffset": [-15, 0], + "terraformSize": 400, + "pregenerateTime": [5, 30], + "terraformBiome": "sb_crystalcave" +} diff --git a/objects/microformer/sb_microformerheck.object b/objects/microformer/sb_microformerheck.object index 6b3b68c4..39e4eeb1 100644 --- a/objects/microformer/sb_microformerheck.object +++ b/objects/microformer/sb_microformerheck.object @@ -1,59 +1,61 @@ { - "objectName" : "sb_microformerheck", - "colonyTags" : [], - "rarity" : "Legendary", - "description" : "Transforms an area of a planet into a hellish abomination.", - "shortdescription" : "Heck Microformer", - "race" : "ancient", - "category" : "terraformer", - "price" : 3000, - "printable" : false, - - "inventoryIcon" : "flesh/microformericon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "flesh/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "right" - }, - { - "imageLayers" : [ { "image" : "flesh/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - "flipImages" : true, - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "left" + "objectName": "sb_microformerheck", + "colonyTags": [], + "rarity": "Legendary", + "description": "Transforms an area of a planet into a hellish abomination.", + "shortdescription": "Heck Microformer", + "race": "ancient", + "category": "terraformer", + "price": 3000, + "printable": false, + + "inventoryIcon": "flesh/microformericon.png", + "orientations": [{ + "imageLayers": [{ + "image": "flesh/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "right" + }, { + "imageLayers": [{ + "image": "flesh/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "flipImages": true, + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "left" } ], - "health" : 5, - "rooting" : true, - - "animation" : "microformer.animation", - "animationPosition" : [-16, 0], - "animationParts" : { - "base" : "microformer.png", - "baseFullbright" : "flesh/microformerfullbright.png" + "health": 5, + "rooting": true, + "animation": "microformer.animation", + "animationPosition": [-16, 0], + "animationParts": { + "base": "microformer.png", + "baseFullbright": "flesh/microformerfullbright.png" }, - - "smashSounds" : [ "/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg" ], - "smashParticles" : [ { "count" : 20, "particle" : "ancientshard1" } ], - - "scripts" : ["/objects/microformer/microformer.lua"], - "scriptDelta" : 10, - - "terraformOffset" : [-15, 0], - "terraformSize" : 400, - - "pregenerateTime" : [5, 30], - - "terraformBiome" : "sb_heck" + "smashSounds": ["/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg"], + "smashParticles": [{ + "count": 20, + "particle": "ancientshard1" + } + ], + "scripts": ["/objects/microformer/microformer.lua"], + "scriptDelta": 10, + "terraformOffset": [-15, 0], + "terraformSize": 400, + "pregenerateTime": [5, 30], + "terraformBiome": "sb_heck" } diff --git a/objects/microformer/sb_microformerrust.object b/objects/microformer/sb_microformerrust.object index 941489a4..4e4057ca 100644 --- a/objects/microformer/sb_microformerrust.object +++ b/objects/microformer/sb_microformerrust.object @@ -1,59 +1,63 @@ { - "objectName" : "sb_microformerrust", - "colonyTags" : [], - "rarity" : "Legendary", - "description" : "Transforms an area of a planet into a field of rust.", - "shortdescription" : "Rust Microformer", - "race" : "ancient", - "category" : "terraformer", - "price" : 3000, - "printable" : false, - - "inventoryIcon" : "rust/microformericon.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "rust/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "right" - }, - { - "imageLayers" : [ { "image" : "rust/microformerfullbright.png:default", "fullbright" : true }, { "image" : "microformer.png:default" } ], - "flipImages" : true, - - "imagePosition" : [-16, 0], - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ], - - "direction" : "left" + "objectName": "sb_microformerrust", + "colonyTags": [], + "rarity": "Legendary", + "description": "Transforms an area of a planet into a field of rust.", + "shortdescription": "Rust Microformer", + "race": "ancient", + "category": "terraformer", + "price": 3000, + "printable": false, + + "inventoryIcon": "rust/microformericon.png", + "orientations": [{ + "imageLayers": [{ + "image": "rust/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "right" + }, { + "imageLayers": [{ + "image": "rust/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "flipImages": true, + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "left" } ], - "health" : 5, - "rooting" : true, - - "animation" : "microformer.animation", - "animationPosition" : [-16, 0], - "animationParts" : { - "base" : "microformer.png", - "baseFullbright" : "rust/microformerfullbright.png" + "health": 5, + "rooting": true, + "animation": "microformer.animation", + "animationPosition": [-16, 0], + "animationParts": { + "base": "microformer.png", + "baseFullbright": "rust/microformerfullbright.png" }, - "smashSounds" : [ "/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg" ], - "smashParticles" : [ { "count" : 20, "particle" : "ancientshard1" } ], - - "scripts" : ["/objects/microformer/microformer.lua"], - "scriptDelta" : 10, - - "terraformOffset" : [-15, 0], - "terraformSize" : 400, - - "pregenerateTime" : [5, 30], - - "terraformBiome" : "sb_rust" + "smashSounds": ["/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg"], + "smashParticles": [{ + "count": 20, + "particle": "ancientshard1" + } + ], + "scripts": ["/objects/microformer/microformer.lua"], + "scriptDelta": 10, + "terraformOffset": [-15, 0], + "terraformSize": 400, + "pregenerateTime": [5, 30], + "terraformBiome": "sb_rust" } diff --git a/objects/microformer/sb_microformersulphur.object b/objects/microformer/sb_microformersulphur.object new file mode 100644 index 00000000..b5091c7a --- /dev/null +++ b/objects/microformer/sb_microformersulphur.object @@ -0,0 +1,61 @@ +{ + "objectName": "sb_microformersulphur", + "colonyTags": [], + "rarity": "Legendary", + "description": "Transforms an area of a planet into a hot sulphuric region.", + "shortdescription": "Sulphuric Microformer", + "race": "ancient", + "category": "terraformer", + "price": 3000, + "printable": false, + + "inventoryIcon": "steamspring/microformericon.png", + "orientations": [{ + "imageLayers": [{ + "image": "steamspring/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "right" + }, { + "imageLayers": [{ + "image": "steamspring/microformerfullbright.png:default", + "fullbright": true + }, { + "image": "microformer.png:default" + } + ], + "flipImages": true, + "imagePosition": [-16, 0], + "spaceScan": 0.1, + "anchors": ["bottom"], + "direction": "left" + } + ], + + "health": 5, + "rooting": true, + "animation": "microformer.animation", + "animationPosition": [-16, 0], + "animationParts": { + "base": "microformer.png", + "baseFullbright": "steamspring/microformerfullbright.png" + }, + "smashSounds": ["/sfx/objects/rock_crumble1.ogg", "/sfx/objects/rock_crumble2.ogg", "/sfx/objects/rock_crumble3.ogg", "/sfx/objects/rock_crumble4.ogg", "/sfx/objects/rock_crumble5.ogg"], + "smashParticles": [{ + "count": 20, + "particle": "ancientshard1" + } + ], + "scripts": ["/objects/microformer/microformer.lua"], + "scriptDelta": 10, + "terraformOffset": [-15, 0], + "terraformSize": 400, + "pregenerateTime": [5, 30], + "terraformBiome": "sb_sulphur" +} diff --git a/objects/mission/bossdoor/bossdoor.object.patch b/objects/mission/bossdoor/bossdoor.object.patch new file mode 100644 index 00000000..26ce1f78 --- /dev/null +++ b/objects/mission/bossdoor/bossdoor.object.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/printable","value":false},{"op":"replace","path":"/printable","value":true}], +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Rare"}], +[{"op":"test","path":"/shortdescription","value":"Force Field"},{"op":"replace","path":"/description","value":"One-way Door"}] +] \ No newline at end of file diff --git a/objects/mission/caveart3/sb_caveart3.object b/objects/mission/caveart3/sb_caveart3.object index 157486e1..17b62705 100644 --- a/objects/mission/caveart3/sb_caveart3.object +++ b/objects/mission/caveart3/sb_caveart3.object @@ -1,19 +1,18 @@ { - "objectName" : "sb_caveart3", - "rarity" : "rare", - "printable" : false, - "scripts" : ["/scripts/sb_mimicobject.lua"], - "inventoryIcon" : "icon.png", - "breakDropOptions" : [[["caveart3",1,{}]]], - "orientations" : [ - { - "dualImage" : "caveart3.png:", - "imagePosition" : [-56, -8], - "spaces" : [ - [-7,1],[-6,1],[-5,1],[-4,1],[-3,1],[-2,1],[-1,1],[0,1],[1,1],[2,1],[3,1], - [-7,0],[-6,0],[-5,0],[-4,0],[-3,0],[-2,0],[-1,0],[0,0],[1,0],[2,0],[3,0], - [-7,-1],[-6,-1],[-5,-1],[-4,-1],[-3,-1],[-2,-1],[-1,-1],[0,-1],[1,-1],[2,-1],[3,-1] + "objectName": "sb_caveart3", + "rarity": "rare", + "printable": false, + "scripts": ["/scripts/sb_mimicobject.lua"], + "inventoryIcon": "icon.png", + "breakDropOptions": [[["caveart3", 1, {}]]], + "orientations": [{ + "dualImage": "caveart3.png:", + "imagePosition": [-56, -8], + "spaces": [ + [-7,1],[-6,1],[-5,1],[-4,1],[-3,1],[-2,1],[-1,1],[0,1],[1,1],[2,1],[3,1], + [-7,0],[-6,0],[-5,0],[-4,0],[-3,0],[-2,0],[-1,0],[0,0],[1,0],[2,0],[3,0], + [-7,-1],[-6,-1],[-5,-1],[-4,-1],[-3,-1],[-2,-1],[-1,-1],[0,-1],[1,-1],[2,-1],[3,-1] ] } ] -} \ No newline at end of file +} diff --git a/objects/outpost/coffeemachine/coffeemachine.object.patch b/objects/outpost/coffeemachine/coffeemachine.object.patch new file mode 100644 index 00000000..48b3d6a5 --- /dev/null +++ b/objects/outpost/coffeemachine/coffeemachine.object.patch @@ -0,0 +1,80 @@ +[ + [{ + "op": "test", + "path": "/interactAction", + "inverse": true + }, { + "op": "test", + "path": "/slotCount", + "inverse": true + }, { + "op": "test", + "path": "/interactData", + "inverse": true + }, { + "op": "test", + "path": "/interactive", + "inverse": true + }, + // + { + "op": "add", + "path": "/uiConfig", + "value": "/interface/sb_objectcrafting/coffeemachine.config" + }, { + "op": "add", + "path": "/recipeGroup", + "value": "sb_coffee" + }, { + "op": "add", + "path": "/slotCount", + "value": 2 + }, { + "op": "add", + "path": "/frameCooldown", + "value": 5 + }, { + "op": "add", + "path": "/autoCloseCooldown", + "value": 3600 + }, { + "op": "add", + "path": "/openSounds", + "value": ["/sfx/objects/chest_medium_open.ogg"] + }, { + "op": "add", + "path": "/closeSounds", + "value": ["/sfx/objects/chest_medium_close.ogg"] + }, { + "op": "copy", + "path": "/category", + "from": "/subtitle" + }, { + "op": "add", + "path": "/objectType", + "value": "container" + } + ], [{ + "op": "test", + "path": "/tooltipFields", + "inverse": true + }, { + "op": "add", + "path": "/tooltipFields", + "value": {} + } + ], [{ + "op": "test", + "path": "/shortdescription", + "value": "Coffee Machine" + }, { + "op": "add", + "path": "/tooltipFields/subtitle", + "value": "Crafting Station" + }, { + "op": "replace", + "path": "/shortdescription", + "value": "^orange;Coffee Machine^reset;" + } + ] +] diff --git a/objects/outpost/infinityexpress/infinityexpress.object.patch b/objects/outpost/infinityexpress/infinityexpress.object.patch index 2367e616..48a8d10e 100644 --- a/objects/outpost/infinityexpress/infinityexpress.object.patch +++ b/objects/outpost/infinityexpress/infinityexpress.object.patch @@ -10,7 +10,7 @@ ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_meatballs"}} ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_copybook"}} ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_customcodex"}} -,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_coffeemachine","prerequisiteQuest":"sb_coffee0.gearup"}} +,{"op":"add","path":"/interactData/items/-","value":{"item":"coffeemachine","prerequisiteQuest":"sb_coffee0.gearup"}} //Can't print it due to category ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_airpocketback","prerequisiteQuest":"sb_outpost2.gearup"}}] @@ -25,7 +25,7 @@ ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_meatballs"}} ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_copybook"}} ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_customcodex"}} -,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_coffeemachine","prerequisiteQuest":"sb_coffee0.gearup"}} +,{"op":"add","path":"/interactData/items/-","value":{"item":"coffeemachine","prerequisiteQuest":"sb_coffee0.gearup"}} ,{"op":"add","path":"/interactData/items/-","value":{"item":"sb_airpocketback","prerequisiteQuest":"sb_outpost2.gearup"}}], @@ -33,9 +33,10 @@ [{"op":"test","path":"/animation","inverse":true},{"op":"add","path":"/scripts/-","value":"sb_infinityexpress.lua"}], [{"op":"test","path":"/animation","inverse":true},{"op":"add","path":"/animation","value":"sb_infinityexpress.animation"}], [{"op":"test","path":"/animationParts","inverse":true},{"op":"add","path":"/animationParts","value":{"shopright":"infinityexpressright.png","shopleft":"infinityexpressleft.png"}}], - //Yes, it NEEDS to be 0 0 because otherwise it's offset for some reason. Changing `centered` in the animation just buries it - [{"op":"replace","path":"/orientations/0/imagePosition","value":[-0,0]}], - [{"op":"replace","path":"/orientations/1/imagePosition","value":[-0,0]}], + //i hate this so much. i swear to god if it randomly jumps around when unloaded i will SCREAM + [{"op":"replace","path":"/orientations/0/imagePosition","value":[-88,0]}], + [{"op":"replace","path":"/orientations/1/imagePosition","value":[-88,0]}], + [{"op":"add","path":"/animationPosition","value":[-88,0]}], [{"op":"test","path":"/orientations/0/imageLayers/0/image","value":"infinityexpressleft.png:"},{"op":"replace","path":"/orientations/0/imageLayers/0/image","value":"infinityexpressleft.png:."}], [{"op":"test","path":"/orientations/1/imageLayers/0/image","value":"infinityexpressright.png:"},{"op":"replace","path":"/orientations/1/imageLayers/0/image","value":"infinityexpressright.png:."}] ] diff --git a/objects/outpost/infinityexpress/infinityexpressleft.frames.patch b/objects/outpost/infinityexpress/infinityexpressleft.frames.patch index 769a342b..ba1cbc87 100644 --- a/objects/outpost/infinityexpress/infinityexpressleft.frames.patch +++ b/objects/outpost/infinityexpress/infinityexpressleft.frames.patch @@ -21,6 +21,7 @@ "op": "add", "path": "/aliases", "value": { + "default": "default.1", "0.default": "default.1", "default.default": "default.1", "default.reverse1": "default.4", diff --git a/objects/outpost/infinityexpress/infinityexpressright.frames.patch b/objects/outpost/infinityexpress/infinityexpressright.frames.patch index 769a342b..ba1cbc87 100644 --- a/objects/outpost/infinityexpress/infinityexpressright.frames.patch +++ b/objects/outpost/infinityexpress/infinityexpressright.frames.patch @@ -21,6 +21,7 @@ "op": "add", "path": "/aliases", "value": { + "default": "default.1", "0.default": "default.1", "default.default": "default.1", "default.reverse1": "default.4", diff --git a/objects/outpost/techlab/techlabconsole1.object.patch b/objects/outpost/techlab/techlabconsole1.object.patch index fa1299e6..0b6129aa 100644 --- a/objects/outpost/techlab/techlabconsole1.object.patch +++ b/objects/outpost/techlab/techlabconsole1.object.patch @@ -1,8 +1,10 @@ -[{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_avian"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_human"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_novakid"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_glitch"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_floran"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_hylotl"}},"prerequisiteQuest":"sb_outpostSkin.gearup"}, -{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techconsole"}},"prerequisiteQuest":"sb_kelpquest.gearup"}] \ No newline at end of file +[ +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techconsole"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_avian"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_glitch"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_human"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_floran"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_hylotl"}}}, +{"op":"add","path":"/interactData/items/-","value":{"item":{"name":"sb_techstation_novakid"}}} +] \ No newline at end of file diff --git a/objects/outpost/terramart/sb_terramart/apexleft.png b/objects/outpost/terramart/sb_terramart/apexleft.png index 1359d8e4..25e3d4e8 100644 Binary files a/objects/outpost/terramart/sb_terramart/apexleft.png and b/objects/outpost/terramart/sb_terramart/apexleft.png differ diff --git a/objects/outpost/terramart/sb_terramart/apexright.png b/objects/outpost/terramart/sb_terramart/apexright.png index 8488a1c4..ff4696ef 100644 Binary files a/objects/outpost/terramart/sb_terramart/apexright.png and b/objects/outpost/terramart/sb_terramart/apexright.png differ diff --git a/objects/outpost/terramart/sb_terramart/avianright.png b/objects/outpost/terramart/sb_terramart/avianright.png index 7e31eeca..9e7d6d27 100644 Binary files a/objects/outpost/terramart/sb_terramart/avianright.png and b/objects/outpost/terramart/sb_terramart/avianright.png differ diff --git a/objects/outpost/terramart/sb_terramart/glitchleft.png b/objects/outpost/terramart/sb_terramart/glitchleft.png index 1c71e19d..96451bd6 100644 Binary files a/objects/outpost/terramart/sb_terramart/glitchleft.png and b/objects/outpost/terramart/sb_terramart/glitchleft.png differ diff --git a/objects/outpost/terramart/sb_terramart/glitchright.png b/objects/outpost/terramart/sb_terramart/glitchright.png index df3d6db0..091a87d9 100644 Binary files a/objects/outpost/terramart/sb_terramart/glitchright.png and b/objects/outpost/terramart/sb_terramart/glitchright.png differ diff --git a/objects/outpost/terramart/sb_terramart/humanleft.png b/objects/outpost/terramart/sb_terramart/humanleft.png index fef50222..56a18233 100644 Binary files a/objects/outpost/terramart/sb_terramart/humanleft.png and b/objects/outpost/terramart/sb_terramart/humanleft.png differ diff --git a/objects/outpost/terramart/sb_terramart/humanright.png b/objects/outpost/terramart/sb_terramart/humanright.png index 83f82ba3..c677ee93 100644 Binary files a/objects/outpost/terramart/sb_terramart/humanright.png and b/objects/outpost/terramart/sb_terramart/humanright.png differ diff --git a/objects/outpost/terramart/sb_terramart/hylotlleft.png b/objects/outpost/terramart/sb_terramart/hylotlleft.png index 2950e3ee..ffa7e5e5 100644 Binary files a/objects/outpost/terramart/sb_terramart/hylotlleft.png and b/objects/outpost/terramart/sb_terramart/hylotlleft.png differ diff --git a/objects/outpost/terramart/sb_terramart/hylotlright.png b/objects/outpost/terramart/sb_terramart/hylotlright.png index ae98c35d..3ca32c64 100644 Binary files a/objects/outpost/terramart/sb_terramart/hylotlright.png and b/objects/outpost/terramart/sb_terramart/hylotlright.png differ diff --git a/objects/peacekeeper/peacekeeperdesk/peacekeeperdesk.object.patch b/objects/peacekeeper/peacekeeperdesk/peacekeeperdesk.object.patch new file mode 100644 index 00000000..90629840 --- /dev/null +++ b/objects/peacekeeper/peacekeeperdesk/peacekeeperdesk.object.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Uncommon"}], +[{"op":"test","path":"/price","value":110},{"op":"replace","path":"/price","value":60}] +] \ No newline at end of file diff --git a/objects/peacekeeper/peacekeeperfurnishings/peacekeeperfurnishings.object.patch b/objects/peacekeeper/peacekeeperfurnishings/peacekeeperfurnishings.object.patch new file mode 100644 index 00000000..92314377 --- /dev/null +++ b/objects/peacekeeper/peacekeeperfurnishings/peacekeeperfurnishings.object.patch @@ -0,0 +1,3 @@ +[ +[{"op":"add","path":"/interactData/items/-","value":{"item":"peacekeeperdesk"}}] +] \ No newline at end of file diff --git a/objects/sb_ladders/copperladder.png b/objects/sb_ladders/copperladder.png index fcce3656..cfed99de 100644 Binary files a/objects/sb_ladders/copperladder.png and b/objects/sb_ladders/copperladder.png differ diff --git a/objects/sb_ladders/copperladderlarge.png b/objects/sb_ladders/copperladderlarge.png index b963ccf8..27738e81 100644 Binary files a/objects/sb_ladders/copperladderlarge.png and b/objects/sb_ladders/copperladderlarge.png differ diff --git a/objects/sb_ladders/medievalladder.png b/objects/sb_ladders/medievalladder.png index 87a58583..8778a2bc 100644 Binary files a/objects/sb_ladders/medievalladder.png and b/objects/sb_ladders/medievalladder.png differ diff --git a/objects/sb_ladders/medievalladderlarge.png b/objects/sb_ladders/medievalladderlarge.png index a74b1451..3fe2e9c5 100644 Binary files a/objects/sb_ladders/medievalladderlarge.png and b/objects/sb_ladders/medievalladderlarge.png differ diff --git a/objects/sb_ladders/modernladder.png b/objects/sb_ladders/modernladder.png index 096b7164..9808f95e 100644 Binary files a/objects/sb_ladders/modernladder.png and b/objects/sb_ladders/modernladder.png differ diff --git a/objects/sb_ladders/modernladdericon.png b/objects/sb_ladders/modernladdericon.png index 8512ca98..22b6112c 100644 Binary files a/objects/sb_ladders/modernladdericon.png and b/objects/sb_ladders/modernladdericon.png differ diff --git a/objects/sb_ladders/modernladderlarge.png b/objects/sb_ladders/modernladderlarge.png index 760a0a90..af8afac9 100644 Binary files a/objects/sb_ladders/modernladderlarge.png and b/objects/sb_ladders/modernladderlarge.png differ diff --git a/objects/ship/sb_fuelhatch/apex.png b/objects/ship/sb_fuelhatch/apex.png index d9a50972..9062d4eb 100644 Binary files a/objects/ship/sb_fuelhatch/apex.png and b/objects/ship/sb_fuelhatch/apex.png differ diff --git a/objects/ship/sb_fuelhatch/apexicon.png b/objects/ship/sb_fuelhatch/apexicon.png index 655742a8..d19a02a3 100644 Binary files a/objects/ship/sb_fuelhatch/apexicon.png and b/objects/ship/sb_fuelhatch/apexicon.png differ diff --git a/objects/ship/sb_fuelhatch/avian.png b/objects/ship/sb_fuelhatch/avian.png index afbd7ab1..efe45f2e 100644 Binary files a/objects/ship/sb_fuelhatch/avian.png and b/objects/ship/sb_fuelhatch/avian.png differ diff --git a/objects/ship/sb_fuelhatch/avianicon.png b/objects/ship/sb_fuelhatch/avianicon.png index 0a426017..c7a94587 100644 Binary files a/objects/ship/sb_fuelhatch/avianicon.png and b/objects/ship/sb_fuelhatch/avianicon.png differ diff --git a/objects/ship/sb_fuelhatch/floran.png b/objects/ship/sb_fuelhatch/floran.png index a728ef57..4360cca1 100644 Binary files a/objects/ship/sb_fuelhatch/floran.png and b/objects/ship/sb_fuelhatch/floran.png differ diff --git a/objects/ship/sb_fuelhatch/floranicon.png b/objects/ship/sb_fuelhatch/floranicon.png index ded8c459..4bd06b06 100644 Binary files a/objects/ship/sb_fuelhatch/floranicon.png and b/objects/ship/sb_fuelhatch/floranicon.png differ diff --git a/objects/ship/sb_fuelhatch/glitch.png b/objects/ship/sb_fuelhatch/glitch.png index 387224cf..d34151a1 100644 Binary files a/objects/ship/sb_fuelhatch/glitch.png and b/objects/ship/sb_fuelhatch/glitch.png differ diff --git a/objects/ship/sb_fuelhatch/glitchicon.png b/objects/ship/sb_fuelhatch/glitchicon.png index b3f0342e..27f46da4 100644 Binary files a/objects/ship/sb_fuelhatch/glitchicon.png and b/objects/ship/sb_fuelhatch/glitchicon.png differ diff --git a/objects/ship/sb_fuelhatch/human.png b/objects/ship/sb_fuelhatch/human.png index cbcf8d31..073fdd97 100644 Binary files a/objects/ship/sb_fuelhatch/human.png and b/objects/ship/sb_fuelhatch/human.png differ diff --git a/objects/ship/sb_fuelhatch/humanicon.png b/objects/ship/sb_fuelhatch/humanicon.png index 4a2f8892..ab988035 100644 Binary files a/objects/ship/sb_fuelhatch/humanicon.png and b/objects/ship/sb_fuelhatch/humanicon.png differ diff --git a/objects/ship/sb_fuelhatch/hylotl.png b/objects/ship/sb_fuelhatch/hylotl.png index f7855d9e..1ced538b 100644 Binary files a/objects/ship/sb_fuelhatch/hylotl.png and b/objects/ship/sb_fuelhatch/hylotl.png differ diff --git a/objects/ship/sb_fuelhatch/novakid.png b/objects/ship/sb_fuelhatch/novakid.png index 0a41ac7e..04b49b87 100644 Binary files a/objects/ship/sb_fuelhatch/novakid.png and b/objects/ship/sb_fuelhatch/novakid.png differ diff --git a/objects/ship/sb_fuelhatch/novakidicon.png b/objects/ship/sb_fuelhatch/novakidicon.png index 0eb0030a..cbe434fa 100644 Binary files a/objects/ship/sb_fuelhatch/novakidicon.png and b/objects/ship/sb_fuelhatch/novakidicon.png differ diff --git a/objects/ship/sb_teleporter/apexteleporter.object b/objects/ship/sb_teleporter/apexteleporter.object index f836a336..3f4b7fdf 100644 --- a/objects/ship/sb_teleporter/apexteleporter.object +++ b/objects/ship/sb_teleporter/apexteleporter.object @@ -5,7 +5,7 @@ "printable" : false, "rarity" : "Legendary", "description" : "Trusty teleporter, what would we do without you? -^#f00;Destroyed when broken.", +^red;Destroyed when broken.^reset;", "tooltipKind" : "sb_object", "price" : 3000, "shortdescription" : "Small Apex Teleporter", diff --git a/objects/ship/sb_teleporter/apexteleporter.png b/objects/ship/sb_teleporter/apexteleporter.png index 539b2534..5f942d3f 100644 Binary files a/objects/ship/sb_teleporter/apexteleporter.png and b/objects/ship/sb_teleporter/apexteleporter.png differ diff --git a/objects/ship/sb_teleporter/apexteleportertier0.png b/objects/ship/sb_teleporter/apexteleportertier0.png index 2c49a99c..d4016868 100644 Binary files a/objects/ship/sb_teleporter/apexteleportertier0.png and b/objects/ship/sb_teleporter/apexteleportertier0.png differ diff --git a/objects/ship/sb_teleporter/avianteleporter.object b/objects/ship/sb_teleporter/avianteleporter.object index 37a7082c..23e6ff77 100644 --- a/objects/ship/sb_teleporter/avianteleporter.object +++ b/objects/ship/sb_teleporter/avianteleporter.object @@ -5,7 +5,7 @@ "printable" : false, "rarity" : "Legendary", "description" : "Trusty teleporter, what would we do without you? -^#f00;Destroyed when broken.", +^red;Destroyed when broken.^reset;", "tooltipKind" : "sb_object", "price" : 3000, "shortdescription" : "Small Avian Teleporter", diff --git a/objects/ship/sb_teleporter/avianteleporter.png b/objects/ship/sb_teleporter/avianteleporter.png index d14367e1..1d4a95b3 100644 Binary files a/objects/ship/sb_teleporter/avianteleporter.png and b/objects/ship/sb_teleporter/avianteleporter.png differ diff --git a/objects/ship/sb_teleporter/avianteleporterlit.png b/objects/ship/sb_teleporter/avianteleporterlit.png index a4824561..898e9877 100644 Binary files a/objects/ship/sb_teleporter/avianteleporterlit.png and b/objects/ship/sb_teleporter/avianteleporterlit.png differ diff --git a/objects/ship/sb_teleporter/avianteleportertier0.png b/objects/ship/sb_teleporter/avianteleportertier0.png index bafce239..88cdaf32 100644 Binary files a/objects/ship/sb_teleporter/avianteleportertier0.png and b/objects/ship/sb_teleporter/avianteleportertier0.png differ diff --git a/objects/ship/sb_teleporter/floranteleporter.object b/objects/ship/sb_teleporter/floranteleporter.object index ca3e7182..f2e12df8 100644 --- a/objects/ship/sb_teleporter/floranteleporter.object +++ b/objects/ship/sb_teleporter/floranteleporter.object @@ -5,7 +5,7 @@ "printable" : false, "rarity" : "Legendary", "description" : "Trusty teleporter, what would we do without you? -^#f00;Destroyed when broken.", +^red;Destroyed when broken.^reset;", "tooltipKind" : "sb_object", "price" : 3000, "shortdescription" : "Small Floran Teleporter", diff --git a/objects/ship/sb_teleporter/floranteleporter.png b/objects/ship/sb_teleporter/floranteleporter.png index 1276b71d..dc267e0c 100644 Binary files a/objects/ship/sb_teleporter/floranteleporter.png and b/objects/ship/sb_teleporter/floranteleporter.png differ diff --git a/objects/ship/sb_teleporter/floranteleporterlit.png b/objects/ship/sb_teleporter/floranteleporterlit.png index b692c166..f17fc229 100644 Binary files a/objects/ship/sb_teleporter/floranteleporterlit.png and b/objects/ship/sb_teleporter/floranteleporterlit.png differ diff --git a/objects/ship/sb_teleporter/floranteleportertier0.png b/objects/ship/sb_teleporter/floranteleportertier0.png index 0a5f92f2..6c1e7ed4 100644 Binary files a/objects/ship/sb_teleporter/floranteleportertier0.png and b/objects/ship/sb_teleporter/floranteleportertier0.png differ diff --git a/objects/ship/sb_teleporter/glitchteleporter.object b/objects/ship/sb_teleporter/glitchteleporter.object index bc932e46..8693fb10 100644 --- a/objects/ship/sb_teleporter/glitchteleporter.object +++ b/objects/ship/sb_teleporter/glitchteleporter.object @@ -5,7 +5,7 @@ "printable" : false, "rarity" : "Legendary", "description" : "Trusty teleporter, what would we do without you? -^#f00;Destroyed when broken.", +^red;Destroyed when broken.^reset;", "tooltipKind" : "sb_object", "price" : 3000, "shortdescription" : "Small Glitch Teleporter", diff --git a/objects/ship/sb_teleporter/glitchteleporter.png b/objects/ship/sb_teleporter/glitchteleporter.png index a0253da9..c0794e76 100644 Binary files a/objects/ship/sb_teleporter/glitchteleporter.png and b/objects/ship/sb_teleporter/glitchteleporter.png differ diff --git a/objects/ship/sb_teleporter/glitchteleporterlit.png b/objects/ship/sb_teleporter/glitchteleporterlit.png index 6ad16531..af754328 100644 Binary files a/objects/ship/sb_teleporter/glitchteleporterlit.png and b/objects/ship/sb_teleporter/glitchteleporterlit.png differ diff --git a/objects/ship/sb_teleporter/glitchteleportertier0.png b/objects/ship/sb_teleporter/glitchteleportertier0.png index ebeb0fe4..1774a776 100644 Binary files a/objects/ship/sb_teleporter/glitchteleportertier0.png and b/objects/ship/sb_teleporter/glitchteleportertier0.png differ diff --git a/objects/ship/sb_teleporter/humanteleporter.object b/objects/ship/sb_teleporter/humanteleporter.object index 93bd879b..d1dfd6ad 100644 --- a/objects/ship/sb_teleporter/humanteleporter.object +++ b/objects/ship/sb_teleporter/humanteleporter.object @@ -5,7 +5,7 @@ "printable" : false, "rarity" : "Legendary", "description" : "Trusty teleporter, what would we do without you? -^#f00;Destroyed when broken.", +^red;Destroyed when broken.^reset;", "tooltipKind" : "sb_object", "price" : 3000, "shortdescription" : "Small Human Teleporter", diff --git a/objects/ship/sb_teleporter/humanteleporter.png b/objects/ship/sb_teleporter/humanteleporter.png index 04a9af88..b1ee5455 100644 Binary files a/objects/ship/sb_teleporter/humanteleporter.png and b/objects/ship/sb_teleporter/humanteleporter.png differ diff --git a/objects/ship/sb_teleporter/humanteleportertier0.png b/objects/ship/sb_teleporter/humanteleportertier0.png index d54a0dbc..dcd5ffc9 100644 Binary files a/objects/ship/sb_teleporter/humanteleportertier0.png and b/objects/ship/sb_teleporter/humanteleportertier0.png differ diff --git a/objects/ship/sb_teleporter/hylotlteleporter.object b/objects/ship/sb_teleporter/hylotlteleporter.object index aae1e90c..63cf216c 100644 --- a/objects/ship/sb_teleporter/hylotlteleporter.object +++ b/objects/ship/sb_teleporter/hylotlteleporter.object @@ -5,7 +5,7 @@ "printable" : false, "rarity" : "Legendary", "description" : "Trusty teleporter, what would we do without you? -^#f00;Destroyed when broken.", +^red;Destroyed when broken.^reset;", "tooltipKind" : "sb_object", "price" : 3000, "shortdescription" : "Small Hylotl Teleporter", diff --git a/objects/ship/sb_teleporter/hylotlteleporterlit.png b/objects/ship/sb_teleporter/hylotlteleporterlit.png index b69eea1c..12744ba8 100644 Binary files a/objects/ship/sb_teleporter/hylotlteleporterlit.png and b/objects/ship/sb_teleporter/hylotlteleporterlit.png differ diff --git a/objects/ship/sb_teleporter/hylotlteleportertier0.png b/objects/ship/sb_teleporter/hylotlteleportertier0.png index f439eaf7..8dfde565 100644 Binary files a/objects/ship/sb_teleporter/hylotlteleportertier0.png and b/objects/ship/sb_teleporter/hylotlteleportertier0.png differ diff --git a/objects/ship/sb_teleporter/novakidteleporter.png b/objects/ship/sb_teleporter/novakidteleporter.png index 3d4c8db0..f03bdae0 100644 Binary files a/objects/ship/sb_teleporter/novakidteleporter.png and b/objects/ship/sb_teleporter/novakidteleporter.png differ diff --git a/objects/ship/sb_teleporter/novakidteleporterlit.png b/objects/ship/sb_teleporter/novakidteleporterlit.png index 28eb4b51..92cc88b2 100644 Binary files a/objects/ship/sb_teleporter/novakidteleporterlit.png and b/objects/ship/sb_teleporter/novakidteleporterlit.png differ diff --git a/objects/ship/sb_teleporter/novakidteleportertier0.png b/objects/ship/sb_teleporter/novakidteleportertier0.png index 41fd110d..c6d99ce0 100644 Binary files a/objects/ship/sb_teleporter/novakidteleportertier0.png and b/objects/ship/sb_teleporter/novakidteleportertier0.png differ diff --git a/objects/spawner/pettether/pettether.object.patch b/objects/spawner/pettether/pettether.object.patch new file mode 100644 index 00000000..bbec4842 --- /dev/null +++ b/objects/spawner/pettether/pettether.object.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/rarity","value":"Common"},{"op":"replace","path":"/rarity","value":"Rare"}] +] \ No newline at end of file diff --git a/objects/spawner/spawners/sb_spawner_doctor.png b/objects/spawner/spawners/sb_spawner_doctor.png index e23e1765..6a68f374 100644 Binary files a/objects/spawner/spawners/sb_spawner_doctor.png and b/objects/spawner/spawners/sb_spawner_doctor.png differ diff --git a/objects/spawner/spawners/sb_spawner_novakid.png b/objects/spawner/spawners/sb_spawner_novakid.png index 8e9089f0..d03c6be2 100644 Binary files a/objects/spawner/spawners/sb_spawner_novakid.png and b/objects/spawner/spawners/sb_spawner_novakid.png differ diff --git a/objects/spawner/spawners/sb_spawner_pirate.png b/objects/spawner/spawners/sb_spawner_pirate.png index 8d583f91..ad4821a3 100644 Binary files a/objects/spawner/spawners/sb_spawner_pirate.png and b/objects/spawner/spawners/sb_spawner_pirate.png differ diff --git a/objects/spawner/spawners/sb_spawner_stim.png b/objects/spawner/spawners/sb_spawner_stim.png index caef8e77..4309f3fd 100644 Binary files a/objects/spawner/spawners/sb_spawner_stim.png and b/objects/spawner/spawners/sb_spawner_stim.png differ diff --git a/objects/terraformer/sb_terraformertentacle.object b/objects/terraformer/sb_terraformertentacle.object index b19b39d3..70a73cc3 100644 --- a/objects/terraformer/sb_terraformertentacle.object +++ b/objects/terraformer/sb_terraformertentacle.object @@ -1,59 +1,59 @@ { - "objectName" : "sb_terraformertentacle", - "colonyTags" : [], - "rarity" : "Legendary", - "description" : "Transforms a planet's climate into a corrupted tentacular landscape.", - "shortdescription" : "Tentacle Terraformer", - "race" : "ancient", - "category" : "terraformer", - "price" : 5000, - "printable" : false, - - "inventoryIcon" : "terraformericon_poison.png", - "orientations" : [ - { - "imageLayers" : [ { "image" : "terraformerfullbright_poison.png:inactive", "fullbright" : true }, { "image" : "terraformer.png:inactive" } ], - "imagePosition" : [-16, 0], - - "direction" : "left", - "flipImages" : true, - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - }, - { - "imageLayers" : [ { "image" : "terraformerfullbright_poison.png:inactive", "fullbright" : true }, { "image" : "terraformer.png:inactive" } ], - "imagePosition" : [-16, 0], - - "direction" : "right", - - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] + "objectName": "sb_terraformertentacle", + "colonyTags": [], + "rarity": "Legendary", + "description": "Transforms a planet's climate into a corrupted tentacular landscape.", + "shortdescription": "Tentacle Terraformer", + "race": "ancient", + "category": "terraformer", + "price": 5000, + "printable": false, + + "inventoryIcon": "terraformericon_poison.png", + "orientations": [{ + "imageLayers": [{ + "image": "terraformerfullbright_poison.png:inactive", + "fullbright": true + }, { + "image": "terraformer.png:inactive" + } + ], + "imagePosition": [-16, 0], + "direction": "left", + "flipImages": true, + "spaceScan": 0.1, + "anchors": ["bottom"] + }, { + "imageLayers": [{ + "image": "terraformerfullbright_poison.png:inactive", + "fullbright": true + }, { + "image": "terraformer.png:inactive" + } + ], + "imagePosition": [-16, 0], + "direction": "right", + "spaceScan": 0.1, + "anchors": ["bottom"] } ], - "health" : 8, - "rooting" : true, - - "animation" : "terraformer.animation", - "animationPosition" : [-16, 0], - "animationParts" : { - "base" : "terraformer.png", - "baseFullbright" : "terraformerfullbright_poison.png", - "beam" : "beam/terraformer_beam_poison.png" + "health": 8, + "rooting": true, + "animation": "terraformer.animation", + "animationPosition": [-16, 0], + "animationParts": { + "base": "terraformer.png", + "baseFullbright": "terraformerfullbright_poison.png", + "beam": "beam/terraformer_beam_poison.png" }, - - "scripts" : ["/objects/terraformer/terraformer.lua"], - "scriptDelta" : 10, - - "terraformOffset" : [-15, 0], - - "minPregenerateTime" : 5, - "basePregenerateTime" : 10, - "pregenerateTimePerTile" : 0.1, - - "planetTypeChangeThreshold" : 0.5, - - "terraformBiome" : "sb_tentacle", - "terraformPlanetType" : "sb_tentacle" -} \ No newline at end of file + "scripts": ["/objects/terraformer/terraformer.lua"], + "scriptDelta": 10, + "terraformOffset": [-15, 0], + "minPregenerateTime": 5, + "basePregenerateTime": 10, + "pregenerateTimePerTile": 0.1, + "planetTypeChangeThreshold": 0.5, + "terraformBiome": "sb_tentacle", + "terraformPlanetType": "sb_tentacle" +} diff --git a/objects/themed/executive/executivechair/sb_executivechaircover.png b/objects/themed/executive/executivechair/sb_executivechaircover.png index 4c3efb5a..d71c7bb9 100644 Binary files a/objects/themed/executive/executivechair/sb_executivechaircover.png and b/objects/themed/executive/executivechair/sb_executivechaircover.png differ diff --git a/objects/tiered/sb_techchests/icons.png b/objects/tiered/sb_techchests/icons.png index fe2f6e32..78634dd0 100644 Binary files a/objects/tiered/sb_techchests/icons.png and b/objects/tiered/sb_techchests/icons.png differ diff --git a/objects/tiered/sb_techchests/tier1techchest.png b/objects/tiered/sb_techchests/tier1techchest.png index 0d18751a..61d700e0 100644 Binary files a/objects/tiered/sb_techchests/tier1techchest.png and b/objects/tiered/sb_techchests/tier1techchest.png differ diff --git a/objects/tiered/sb_techchests/tier2techchest.png b/objects/tiered/sb_techchests/tier2techchest.png index 62dc4469..47b12b50 100644 Binary files a/objects/tiered/sb_techchests/tier2techchest.png and b/objects/tiered/sb_techchests/tier2techchest.png differ diff --git a/objects/tiered/sb_techchests/tier3techchest.png b/objects/tiered/sb_techchests/tier3techchest.png index 40e36b6d..f4744518 100644 Binary files a/objects/tiered/sb_techchests/tier3techchest.png and b/objects/tiered/sb_techchests/tier3techchest.png differ diff --git a/objects/tiered/sb_techchests/tier4techchest.png b/objects/tiered/sb_techchests/tier4techchest.png index 00cefae4..dfa4bdea 100644 Binary files a/objects/tiered/sb_techchests/tier4techchest.png and b/objects/tiered/sb_techchests/tier4techchest.png differ diff --git a/objects/tiered/sb_techchests/tier5atechchest.png b/objects/tiered/sb_techchests/tier5atechchest.png index 5d1b18c0..def4a52c 100644 Binary files a/objects/tiered/sb_techchests/tier5atechchest.png and b/objects/tiered/sb_techchests/tier5atechchest.png differ diff --git a/objects/tiered/sb_techchests/tier5mtechchest.png b/objects/tiered/sb_techchests/tier5mtechchest.png index e76598a5..75f5d5de 100644 Binary files a/objects/tiered/sb_techchests/tier5mtechchest.png and b/objects/tiered/sb_techchests/tier5mtechchest.png differ diff --git a/objects/tiered/sb_techchests/tier5stechchest.png b/objects/tiered/sb_techchests/tier5stechchest.png index b88718b2..1e15cfde 100644 Binary files a/objects/tiered/sb_techchests/tier5stechchest.png and b/objects/tiered/sb_techchests/tier5stechchest.png differ diff --git a/objects/tiered/sb_techchests/tier6atechchest.png b/objects/tiered/sb_techchests/tier6atechchest.png index 83b0fd68..03a02d73 100644 Binary files a/objects/tiered/sb_techchests/tier6atechchest.png and b/objects/tiered/sb_techchests/tier6atechchest.png differ diff --git a/objects/tiered/sb_techchests/tier6mtechchest.png b/objects/tiered/sb_techchests/tier6mtechchest.png index 07f26206..31cdc4f4 100644 Binary files a/objects/tiered/sb_techchests/tier6mtechchest.png and b/objects/tiered/sb_techchests/tier6mtechchest.png differ diff --git a/objects/tiered/sb_techchests/tier6stechchest.png b/objects/tiered/sb_techchests/tier6stechchest.png index 4817a629..ad9144ff 100644 Binary files a/objects/tiered/sb_techchests/tier6stechchest.png and b/objects/tiered/sb_techchests/tier6stechchest.png differ diff --git a/objects/wired/drain/sb_drain.png b/objects/wired/drain/sb_drain.png index ea672486..406d6512 100644 Binary files a/objects/wired/drain/sb_drain.png and b/objects/wired/drain/sb_drain.png differ diff --git a/objects/wired/drain/sb_drainicon.png b/objects/wired/drain/sb_drainicon.png index 634a2436..1d1160d2 100644 Binary files a/objects/wired/drain/sb_drainicon.png and b/objects/wired/drain/sb_drainicon.png differ diff --git a/objects/wired/keypad/keypad.object.patch b/objects/wired/keypad/keypad.object.patch index 7a219b21..f93c3a5a 100644 --- a/objects/wired/keypad/keypad.object.patch +++ b/objects/wired/keypad/keypad.object.patch @@ -1 +1,4 @@ -[[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":30}]] \ No newline at end of file +[ +[{"op":"test","path":"/price","inverse":true},{"op":"add","path":"/price","value":30}], +[{"op":"test","path":"/category","inverse":true},{"op":"add","path":"/category","value":"wire"}] +] \ No newline at end of file diff --git a/objects/wired/movingplatform/sb_movingelevatorlong.object b/objects/wired/movingplatform/sb_movingelevatorlong.object deleted file mode 100644 index 11cbf6ff..00000000 --- a/objects/wired/movingplatform/sb_movingelevatorlong.object +++ /dev/null @@ -1,109 +0,0 @@ -{ - "objectName" : "sb_movingelevatorlong", - "objectType" : "physics", - "colonyTags" : ["wired"], - "printable" : false, - "rarity" : "Rare", - "category" : "Wire", - "price" : 225, - "tooltipKind" : "sb_object", - - "description" : "A moving platform.", - "shortdescription" : "Long Elevator", - "race" : "generic", - - "apexDescription" : "A moving platform.", - "avianDescription" : "A moving platform.", - "floranDescription" : "A moving platform.", - "glitchDescription" : "A moving platform.", - "humanDescription" : "A moving platform.", - "hylotlDescription" : "A moving platform.", - -// "inventoryIcon" : "platform.png", - "inventoryIcon" : [{"image":"platform.png"},{"image":"/interface/sb_inventory/x.png"}], - - "orientations" : [ - { - "direction" : "left", - "image" : "longelevatortop.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11], [-2, 12], [-1, 12], [0, 12], [1, 12], [2, 12], [-2, 13], [-1, 13], [0, 13], [1, 13], [2, 13], [-2, 14], [-1, 14], [0, 14], [1, 14], [2, 14], [-2, 15], [-1, 15], [0, 15], [1, 15], [2, 15], [-2, 16], [-1, 16], [0, 16], [1, 16], [2, 16], [-2, 17], [-1, 17], [0, 17], [1, 17], [2, 17], [-2, 18], [-1, 18], [0, 18], [1, 18], [2, 18], [-2, 19], [-1, 19], [0, 19], [1, 19], [2, 19], [-2, 20], [-1, 20], [0, 20], [1, 20], [2, 20], [-2, 21], [-1, 21], [0, 21], [1, 21], [2, 21], [-2, 22], [-1, 22], [0, 22], [1, 22], [2, 22], [-2, 23], [-1, 23], [0, 23], [1, 23], [2, 23] ], - "fgAnchors" : [ [-1, -1], [0, -1], [1, -1] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11], [0, 12], [0, 13], [0, 14], [0, 15], [0, 16], [0, 17], [0, 18], [0, 19], [0, 20], [0, 21], [0, 22], [0, 23] ], - - "platformStart" : [0.5, 23.75], - "platformEnd" : [0.5, 0.25], - "platformMoveTime" : 4 - }, - { - "direction" : "right", - "image" : "longelevatorbottom.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11], [-2, 12], [-1, 12], [0, 12], [1, 12], [2, 12], [-2, 13], [-1, 13], [0, 13], [1, 13], [2, 13], [-2, 14], [-1, 14], [0, 14], [1, 14], [2, 14], [-2, 15], [-1, 15], [0, 15], [1, 15], [2, 15], [-2, 16], [-1, 16], [0, 16], [1, 16], [2, 16], [-2, 17], [-1, 17], [0, 17], [1, 17], [2, 17], [-2, 18], [-1, 18], [0, 18], [1, 18], [2, 18], [-2, 19], [-1, 19], [0, 19], [1, 19], [2, 19], [-2, 20], [-1, 20], [0, 20], [1, 20], [2, 20], [-2, 21], [-1, 21], [0, 21], [1, 21], [2, 21], [-2, 22], [-1, 22], [0, 22], [1, 22], [2, 22], [-2, 23], [-1, 23], [0, 23], [1, 23], [2, 23] ], - "fgAnchors" : [ [-1, -1], [0, -1], [1, -1] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11], [0, 12], [0, 13], [0, 14], [0, 15], [0, 16], [0, 17], [0, 18], [0, 19], [0, 20], [0, 21], [0, 22], [0, 23] ], - - "platformStart" : [0.5, 0.25], - "platformEnd" : [0.5, 23.75], - "platformMoveTime" : 4 - }, - { - "direction" : "left", - "image" : "longelevatorbgtop.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11], [-2, 12], [-1, 12], [0, 12], [1, 12], [2, 12], [-2, 13], [-1, 13], [0, 13], [1, 13], [2, 13], [-2, 14], [-1, 14], [0, 14], [1, 14], [2, 14], [-2, 15], [-1, 15], [0, 15], [1, 15], [2, 15], [-2, 16], [-1, 16], [0, 16], [1, 16], [2, 16], [-2, 17], [-1, 17], [0, 17], [1, 17], [2, 17], [-2, 18], [-1, 18], [0, 18], [1, 18], [2, 18], [-2, 19], [-1, 19], [0, 19], [1, 19], [2, 19], [-2, 20], [-1, 20], [0, 20], [1, 20], [2, 20], [-2, 21], [-1, 21], [0, 21], [1, 21], [2, 21], [-2, 22], [-1, 22], [0, 22], [1, 22], [2, 22], [-2, 23], [-1, 23], [0, 23], [1, 23], [2, 23] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11], [0, 12], [0, 13], [0, 14], [0, 15], [0, 16], [0, 17], [0, 18], [0, 19], [0, 20], [0, 21], [0, 22], [0, 23] ], - - "animationParts" : { - "base" : "longverticalstandbg.png", - "platform" : "platform.png" - }, - - "platformStart" : [0.5, 23.75], - "platformEnd" : [0.5, 0.25], - "platformMoveTime" : 4 - }, - { - "direction" : "right", - "image" : "longelevatorbgbottom.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11], [-2, 12], [-1, 12], [0, 12], [1, 12], [2, 12], [-2, 13], [-1, 13], [0, 13], [1, 13], [2, 13], [-2, 14], [-1, 14], [0, 14], [1, 14], [2, 14], [-2, 15], [-1, 15], [0, 15], [1, 15], [2, 15], [-2, 16], [-1, 16], [0, 16], [1, 16], [2, 16], [-2, 17], [-1, 17], [0, 17], [1, 17], [2, 17], [-2, 18], [-1, 18], [0, 18], [1, 18], [2, 18], [-2, 19], [-1, 19], [0, 19], [1, 19], [2, 19], [-2, 20], [-1, 20], [0, 20], [1, 20], [2, 20], [-2, 21], [-1, 21], [0, 21], [1, 21], [2, 21], [-2, 22], [-1, 22], [0, 22], [1, 22], [2, 22], [-2, 23], [-1, 23], [0, 23], [1, 23], [2, 23] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11], [0, 12], [0, 13], [0, 14], [0, 15], [0, 16], [0, 17], [0, 18], [0, 19], [0, 20], [0, 21], [0, 22], [0, 23] ], - - "animationParts" : { - "base" : "longverticalstandbg.png", - "platform" : "platform.png" - }, - - "platformStart" : [0.5, 0.25], - "platformEnd" : [0.5, 23.75], - "platformMoveTime" : 4 - } - ], - - "scripts" : [ "movingplatform.lua" ], - "scriptDelta" : 1, - - "animation" : "movingplatform.animation", - "animationParts" : { - "base" : "longverticalstand.png", - "platform" : "platform.png" - }, - - "physicsCollisions" : { - "platform" : { - "collision" : [ - [-2.25, -0.35], - [2.25, -0.35], - [2.25, 0.35], - [-2.25, 0.35] - ], - "collisionKind" : "slippery", - - "position" : [0, 1] - } - }, - - "inputNodes" : [[0, 0]] - -} diff --git a/objects/wired/movingplatform/sb_movingelevatorshort.object b/objects/wired/movingplatform/sb_movingelevatorshort.object deleted file mode 100644 index 3b7f25c7..00000000 --- a/objects/wired/movingplatform/sb_movingelevatorshort.object +++ /dev/null @@ -1,109 +0,0 @@ -{ - "objectName" : "sb_movingelevatorshort", - "objectType" : "physics", - "colonyTags" : ["wired"], - "printable" : false, - "rarity" : "Rare", - "category" : "Wire", - "price" : 125, - "tooltipKind" : "sb_object", - - "description" : "A moving platform.", - "shortdescription" : "Short Elevator", - "race" : "generic", - - "apexDescription" : "A moving platform.", - "avianDescription" : "A moving platform.", - "floranDescription" : "A moving platform.", - "glitchDescription" : "A moving platform.", - "humanDescription" : "A moving platform.", - "hylotlDescription" : "A moving platform.", - -// "inventoryIcon" : "platform.png", - "inventoryIcon" : [{"image":"platform.png"},{"image":"/interface/sb_inventory/x.png"}], - - "orientations" : [ - { - "direction" : "left", - "image" : "shortelevatortop.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11] ], - "fgAnchors" : [ [-1, -1], [0, -1], [1, -1] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11] ], - - "platformStart" : [0.5, 11.75], - "platformEnd" : [0.5, 0.25], - "platformMoveTime" : 2 - }, - { - "direction" : "right", - "image" : "shortelevatorbottom.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11] ], - "fgAnchors" : [ [-1, -1], [0, -1], [1, -1] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11] ], - - "platformStart" : [0.5, 0.25], - "platformEnd" : [0.5, 11.75], - "platformMoveTime" : 2 - }, - { - "direction" : "left", - "image" : "shortelevatorbgtop.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11] ], - - "animationParts" : { - "base" : "shortverticalstandbg.png", - "platform" : "platform.png" - }, - - "platformStart" : [0.5, 11.75], - "platformEnd" : [0.5, 0.25], - "platformMoveTime" : 2 - }, - { - "direction" : "right", - "image" : "shortelevatorbgbottom.png", - "imagePosition" : [-16, 0], - "spaces" : [ [-2, 0], [-1, 0], [0, 0], [1, 0], [2, 0], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1], [-2, 2], [-1, 2], [0, 2], [1, 2], [2, 2], [-2, 3], [-1, 3], [0, 3], [1, 3], [2, 3], [-2, 4], [-1, 4], [0, 4], [1, 4], [2, 4], [-2, 5], [-1, 5], [0, 5], [1, 5], [2, 5], [-2, 6], [-1, 6], [0, 6], [1, 6], [2, 6], [-2, 7], [-1, 7], [0, 7], [1, 7], [2, 7], [-2, 8], [-1, 8], [0, 8], [1, 8], [2, 8], [-2, 9], [-1, 9], [0, 9], [1, 9], [2, 9], [-2, 10], [-1, 10], [0, 10], [1, 10], [2, 10], [-2, 11], [-1, 11], [0, 11], [1, 11], [2, 11] ], - "bgAnchors" : [ [0, 0], [0, 1], [0, 2], [0, 3], [0, 4], [0, 5], [0, 6], [0, 7], [0, 8], [0, 9], [0, 10], [0, 11] ], - - "animationParts" : { - "base" : "shortverticalstandbg.png", - "platform" : "platform.png" - }, - - "platformStart" : [0.5, 0.25], - "platformEnd" : [0.5, 11.75], - "platformMoveTime" : 2 - } - ], - - "scripts" : [ "movingplatform.lua" ], - "scriptDelta" : 1, - - "animation" : "movingplatform.animation", - "animationParts" : { - "base" : "shortverticalstand.png", - "platform" : "platform.png" - }, - - "physicsCollisions" : { - "platform" : { - "collision" : [ - [-2.25, -0.35], - [2.25, -0.35], - [2.25, 0.35], - [-2.25, 0.35] - ], - "collisionKind" : "platform", - - "position" : [0, 1] - } - }, - - "inputNodes" : [[0, 0]] - -} diff --git a/objects/wired/sb_dpstestdummy/dpstestdummy.frames b/objects/wired/sb_dpstestdummy/dpstestdummy.frames new file mode 100644 index 00000000..5c7c661e --- /dev/null +++ b/objects/wired/sb_dpstestdummy/dpstestdummy.frames @@ -0,0 +1,9 @@ +{ + "frameGrid": { + "size": [32, 32], + "dimensions": [1, 1], + "names": [ + ["default"] + ] + } +} diff --git a/objects/wired/sb_dpstestdummy/dpstestdummy.object b/objects/wired/sb_dpstestdummy/dpstestdummy.object new file mode 100644 index 00000000..249c214c --- /dev/null +++ b/objects/wired/sb_dpstestdummy/dpstestdummy.object @@ -0,0 +1,33 @@ +{ + "objectName": "sb_dpstestdummy", + "colonyTags": [], + "rarity": "Uncommon", + "description": "This straw dummy is filled with advanced sensors to measure incoming damage.\n^green;[E]^reset; to reset tracked damage.\n^green;[E]^red; to pick up after resetting.^reset;", + "inspectionDescription": "This straw dummy is filled with advanced sensors to measure incoming damage. ^green;[E]^reset; to reset tracked damage. ^green;[E]^red; to pick up after resetting.^reset;", + "shortdescription": "DPS Test Dummy", + "tooltipKind": "sb_object4b", + "category": "other", + "printable": false, + "price": 300, + + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "dpstestdummy.png:", + "imagePosition": [-16, -0], + "frames": 1, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["bottom"] + } + ], + + "smashable": true, + "smashDropOptions": [[["sb_dpstestdummy"]]], + "health": 10000, + "damageTeam": { + "type": "indiscriminate" + }, + "scripts": ["recount.lua"], + "scriptDelta": 1, + "dialogue": "^green;%.1f^reset; damage over\n^green;%.1f^reset; seconds\n^green;%.1f^reset; DPS" +} diff --git a/objects/wired/sb_dpstestdummy/dpstestdummy.png b/objects/wired/sb_dpstestdummy/dpstestdummy.png new file mode 100644 index 00000000..31f0bc59 Binary files /dev/null and b/objects/wired/sb_dpstestdummy/dpstestdummy.png differ diff --git a/objects/wired/sb_dpstestdummy/icon.png b/objects/wired/sb_dpstestdummy/icon.png new file mode 100644 index 00000000..623f9965 Binary files /dev/null and b/objects/wired/sb_dpstestdummy/icon.png differ diff --git a/objects/wired/sb_dpstestdummy/recount.lua b/objects/wired/sb_dpstestdummy/recount.lua new file mode 100644 index 00000000..c951f63d --- /dev/null +++ b/objects/wired/sb_dpstestdummy/recount.lua @@ -0,0 +1,66 @@ +function init() + maxHealth = config.getParameter("health") + dialogue = config.getParameter("dialogue") + autoResetTime = config.getParameter("autoResetTime", 7) + autoResetTimer = 0 + wasHit = false + firstHit = false + lastMeterTimer = 0 + lastDps = 0 + reset() + object.setInteractive(true) +end + +function update(dt) + local currentHealth = object.health() + + autoResetTimer = math.max(0, autoResetTimer - dt) + if autoResetTimer == 0 then + reset() + end + + if currentHealth < maxHealth then + meterActive = true + autoResetTimer = autoResetTime + wasHit = true + else + wasHit = false + end + + if meterActive then + meterTimer = meterTimer + dt + totalDamage = totalDamage + (maxHealth - currentHealth) + object.setHealth(maxHealth) + end + + local dps = meterTimer > 0 and (totalDamage / (not firstHit and 1 or meterTimer)) or 0 + if wasHit then + firstHit = true + lastMeterTimer = meterTimer + lastDps = dps + end + + if meterTimer ~= 0 then + object.say(string.format(dialogue, totalDamage, lastMeterTimer, lastDps)) + end +end + +function onInteraction(args) + if meterActive then + object.say(string.format(dialogue, 0, 0, 0)) + reset() + else + object.smash() + end +end + +function reset() + meterActive = false + firstHit = false + wasHit = false + meterTimer = 0 + totalDamage = 0 + lastMeterTimer = 0 + lastDps = 0 + object.setHealth(maxHealth) +end \ No newline at end of file diff --git a/objects/wired/sb_fallingblock/fallingblock.object b/objects/wired/sb_fallingblock/fallingblock.object index 6af6c734..3f0e1b05 100644 --- a/objects/wired/sb_fallingblock/fallingblock.object +++ b/objects/wired/sb_fallingblock/fallingblock.object @@ -1,46 +1,50 @@ { - "objectName" : "sb_fallingblock", - "objectType" : "physics", - "colonyTags" : ["wired"], - "printable" : false, - "rarity" : "Rare", - "description" : "Watch your step! These blocks can't hold much weight.", - "shortdescription" : "Falling Block", - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage" : "/objects/wired/sb_fallingblock/fallingblock.png:5"}, - - "category" : "wire", - "price" : 50, - - "floranDescription" : "They ssstep, they fall.", - "glitchDescription" : "Cautious. I should be careful not to fall.", - "humanDescription" : "It's just like those video games.", - - "inventoryIcon" : "icon.png", -// "inventoryIcon" : [{"image":"icon.png"},{"image":"/interface/sb_inventory/x.png"}], - "orientations" : [ - { - "direction" : "right", - "image" : "fallingblock.png:", - "animationParts" : {"fallingblock" : "fallingblock.png"}, - "imagePosition" : [0, 0], - "frames" : 5, - "animationCycle" : 1.0, - "spaceScan" : 0.1, - "anchors" : [ "background" ] + "objectName": "sb_fallingblock", + "objectType": "physics", + "colonyTags": ["wired"], + "printable": false, + "rarity": "Rare", + "description": "Watch your step! These blocks can't hold much weight.", + "shortdescription": "Falling Block", + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/wired/sb_fallingblock/fallingblock.png:5" + }, + + "category": "wire", + "price": 50, + + "floranDescription": "They ssstep, they fall.", + "glitchDescription": "Cautious. I should be careful not to fall.", + "humanDescription": "It's just like those video games.", + + "inventoryIcon": "icon.png", + "orientations": [{ + "direction": "right", + "image": "fallingblock.png:", + "animationParts": { + "fallingblock": "fallingblock.png" + }, + "imagePosition": [0, 0], + "frames": 5, + "animationCycle": 1, + "spaceScan": 0.1, + "anchors": ["background"] } ], - "scripts" : [ "/objects/wired/sb_fallingblock/fallingblock.lua" ], - "scriptDelta" : 60, + "scripts": ["/objects/wired/sb_fallingblock/fallingblock.lua"], + "scriptDelta": 60, - "animation" : "/objects/wired/sb_fallingblock/fallingblock.animation", + "animation": "/objects/wired/sb_fallingblock/fallingblock.animation", - "detectArea" : [[-0.05,0],[1.05,1.25]],//[ [-0.25, 0], [0.25, 1.25] ], + "detectArea": [[-0.05, 0], [1.05, 1.25]], //[ [-0.25, 0], [0.25, 1.25] ], - "stayClosedTime" : 0.04, - "stayOpenTime" : 2.0, + "stayClosedTime": 0.04, + "stayOpenTime": 2, - "animationParts" : {"fallingblock" : "fallingblock.png"}, - "animationPosition" : [0, 0] + "animationParts": { + "fallingblock": "fallingblock.png" + }, + "animationPosition": [0, 0] } diff --git a/objects/wired/sb_fallingblock/fallingblock.png b/objects/wired/sb_fallingblock/fallingblock.png index e95b5928..2f7e1e9d 100644 Binary files a/objects/wired/sb_fallingblock/fallingblock.png and b/objects/wired/sb_fallingblock/fallingblock.png differ diff --git a/objects/wired/sb_fallingblock/icon.png b/objects/wired/sb_fallingblock/icon.png index 36b4f778..d0b2ccaf 100644 Binary files a/objects/wired/sb_fallingblock/icon.png and b/objects/wired/sb_fallingblock/icon.png differ diff --git a/objects/wired/sb_forcepad/forcepad.animation b/objects/wired/sb_forcepad/forcepad.animation index 38ba9e9c..e145594a 100644 --- a/objects/wired/sb_forcepad/forcepad.animation +++ b/objects/wired/sb_forcepad/forcepad.animation @@ -7,7 +7,7 @@ "off": { "frames": 1, "properties": { - "particleEmittersOff": [ "left", "right", "top", "bottom" ] + "particleEmittersOff": ["left", "right", "top", "bottom"] } }, "on": { @@ -44,22 +44,23 @@ "left": { "active": false, "emissionRate": 200, - "offsetRegion": [6,0,1.2,2], - "particles": [ - { + "offsetRegion": [6, 0, 1.2, 2], + "particles": [{ "particle": { "type": "streak", "size": 1, - "color": [220,220,220,200], + "color": [220, 220, 220, 200], "fade": 0.9, - "position": [0,0], - "initialVelocity": [12,0], - "finalVelocity": [0,0], + "position": [0, 0], + "initialVelocity": [12, 0], + "finalVelocity": [0, 0], "destructionTime": 0, - "approach": [0,10], - "timeToLive": 0.5, + "approach": [0, 10], + "timeToLive": 0.25, "length": 2, - "variance": {"initialVelocity": [3,1]} + "variance": { + "initialVelocity": [3, 1] + } } } ] @@ -67,22 +68,23 @@ "right": { "active": false, "emissionRate": 200, - "offsetRegion": [6,0,1.2,2], - "particles": [ - { + "offsetRegion": [6, 0, 1.2, 2], + "particles": [{ "particle": { "type": "streak", "size": 1, - "color": [220,220,220,200], + "color": [220, 220, 220, 200], "fade": 0.9, - "position": [0,0], - "initialVelocity": [12,0], - "finalVelocity": [0,0], + "position": [0, 0], + "initialVelocity": [12, 0], + "finalVelocity": [0, 0], "destructionTime": 0, - "approach": [0,10], - "timeToLive": 0.5, + "approach": [0, 10], + "timeToLive": 0.25, "length": 2, - "variance": {"initialVelocity": [3,1]} + "variance": { + "initialVelocity": [3, 1] + } } } ] @@ -90,22 +92,23 @@ "top": { "active": false, "emissionRate": 200, - "offsetRegion": [0,-1.2,2,-6], - "particles": [ - { + "offsetRegion": [0, -1.2, 2, -4], + "particles": [{ "particle": { "type": "streak", "size": 1, - "color": [220,220,220,200], + "color": [220, 220, 220, 200], "fade": 0.9, - "position": [0,0], - "initialVelocity": [0,-12], - "finalVelocity": [0,0], + "position": [0, 1], + "initialVelocity": [0, -12], + "finalVelocity": [0, 0], "destructionTime": 0, - "approach": [0,-10], - "timeToLive": 0.5, + "approach": [0, -10], + "timeToLive": 0.25, "length": 2, - "variance": {"initialVelocity": [1,-3]} + "variance": { + "initialVelocity": [1, -3] + } } } ] @@ -113,25 +116,26 @@ "bottom": { "active": false, "emissionRate": 200, - "offsetRegion": [0,6,2,1.2], - "particles": [ - { + "offsetRegion": [0, 6, 2, 1.2], + "particles": [{ "particle": { "type": "streak", "size": 1, - "color": [220,220,220,200], + "color": [220, 220, 220, 200], "fade": 0.9, - "position": [0,0], - "initialVelocity": [0,12], - "finalVelocity": [0,0], + "position": [0, 0], + "initialVelocity": [0, 12], + "finalVelocity": [0, 0], "destructionTime": 0, - "approach": [0,10], - "timeToLive": 0.5, + "approach": [0, 10], + "timeToLive": 0.25, "length": 2, - "variance": {"initialVelocity": [1,3]} + "variance": { + "initialVelocity": [1, 3] + } } } ] } } -} \ No newline at end of file +} diff --git a/objects/wired/sb_forcepad/forcepad.object b/objects/wired/sb_forcepad/forcepad.object index 7f1f4728..0816c784 100644 --- a/objects/wired/sb_forcepad/forcepad.object +++ b/objects/wired/sb_forcepad/forcepad.object @@ -1,98 +1,106 @@ { - "objectName" : "sb_forcepad", - "objectType" : "physics", - "colonyTags" : ["wired"], - "printable" : false, - "rarity" : "Rare", - "description" : "Blows away nearby people with a strong elastic force.", - "shortdescription" : "Force Pad", - "tooltipKind" : "sb_object", - "tooltipFields" : {"objectImage" : "/objects/wired/sb_forcepad/y.png:3"}, + "objectName": "sb_forcepad", + "objectType": "physics", + "colonyTags": ["wired"], + "printable": false, + "rarity": "Rare", + "description": "Blows away nearby people with a strong elastic force.", + "shortdescription": "Force Pad", + "tooltipKind": "sb_object", + "tooltipFields": { + "objectImage": "/objects/wired/sb_forcepad/y.png:3" + }, - "category" : "wire", - "price" : 250, + "category": "wire", + "price": 250, - "floranDescription" : "Isss thiss a fan or a pump?", - "glitchDescription" : "Cautious. These pads could prove fatal if used recklessly.", - "humanDescription" : "I bet the guy that invented these got rich from it!", + "floranDescription": "Wind!", + "glitchDescription": "Cautious. These pads could prove fatal if used recklessly.", + "humanDescription": "I bet the guy that invented these got rich from it!", - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "direction" : "right", - "image" : "x.png:", - "animationParts" : {"forcepad" : "x.png"}, - "imagePosition" : [0, 0], - "frames" : 6, - "animationCycle" : 1.0, - "spaceScan" : 0.1, - "anchors" : [ "left" ] - }, - { - "direction" : "left", - "image" : "x.png:", - "animationParts" : {"forcepad" : "x.png"}, - "imagePosition" : [0, 0], - "frames" : 6, - "metaBoundBox" : [-12, 0, 0, 0], - "animationCycle" : 1.0, - "spaceScan" : 0.1, - "anchors" : [ "right" ] - }, - { - "image" : "y.png:", - "animationParts" : {"forcepad" : "y.png"}, - "imagePosition" : [0, 0], - "frames" : 6, - "animationCycle" : 1.0, - "spaceScan" : 0.1, - "anchors" : [ "bottom" ] - }, - { - "image" : "y2.png:", - "animationParts" : {"forcepad" : "y2.png"}, - "imagePosition" : [0, 0], - "frames" : 6, - "metaBoundBox" : [0, -12, 0, 0], - "animationCycle" : 1.0, - "spaceScan" : 0.1, - "anchors" : [ "top" ] + "inventoryIcon": "icon.png", + "orientations": [{ + "direction": "right", + "image": "x.png:", + "animationParts": { + "forcepad": "x.png" + }, + "imagePosition": [0, 0], + "frames": 6, + "animationCycle": 1.0, + "spaceScan": 0.1, + "anchors": ["left"] + }, { + "direction": "left", + "image": "x.png:", + "animationParts": { + "forcepad": "x.png" + }, + "imagePosition": [0, 0], + "frames": 6, + "metaBoundBox": [-12, 0, 0, 0], + "animationCycle": 1.0, + "spaceScan": 0.1, + "anchors": ["right"] + }, { + "image": "y.png:", + "animationParts": { + "forcepad": "y.png" + }, + "imagePosition": [0, 0], + "frames": 6, + "animationCycle": 1.0, + "spaceScan": 0.1, + "anchors": ["bottom"] + }, { + "image": "y2.png:", + "animationParts": { + "forcepad": "y2.png" + }, + "imagePosition": [0, 0], + "frames": 6, + "metaBoundBox": [0, -12, 0, 0], + "animationCycle": 1.0, + "spaceScan": 0.1, + "anchors": ["top"] } ], - "scripts" : [ "/objects/wired/sb_forcepad/forcepad.lua" ], - "scriptDelta" : 0, + "scripts": ["/objects/wired/sb_forcepad/forcepad.lua"], + "scriptDelta": 0, - "animation" : "/objects/wired/sb_forcepad/forcepad.animation", + "animation": "/objects/wired/sb_forcepad/forcepad.animation", - "animationParts" : {"forcepad" : "x.png"}, - "animationPosition" : [0, 0], + "animationParts": { + "forcepad": "x.png" + }, + "animationPosition": [0, 0], - "inputNodes" : [[0, 0]], - "physicsForces" : { - "jumpForce_left" : { - "type" : "DirectionalForceRegion", - "rectRegion" : [12,2,0,0], - "xTargetVelocity" : 350, - "controlForce" : 505 + "inputNodes": [[0, 0]], + "physicsForces": { + "jumpForce_left": { + "type": "DirectionalForceRegion", + "rectRegion": [12, 2, 0, 0], + "xTargetVelocity": 350, + "controlForce": 505 }, - "jumpForce_right" : { - "type" : "DirectionalForceRegion", - "rectRegion" : [0,0,-12,2], - "xTargetVelocity" : 350, - "controlForce" : 505 + "jumpForce_right": { + "type": "DirectionalForceRegion", + "rectRegion": [1, 0, -11, 2], + "xTargetVelocity": 350, + "controlForce": 505 }, - "jumpForce_bottom" : { - "type" : "DirectionalForceRegion", - "rectRegion" : [0,0,2,12], - "yTargetVelocity" : 650, - "controlForce" : 344 + "jumpForce_bottom": { + "type": "DirectionalForceRegion", + "rectRegion": [0, 0, 2, 12], + "yTargetVelocity": 650, + "controlForce": 344 }, - "jumpForce_top" : { - "type" : "DirectionalForceRegion", - "rectRegion" : [0,0,2,-12], - "yTargetVelocity" : 650, - "controlForce" : 344 + "jumpForce_top": { + "type": "DirectionalForceRegion", + "rectRegion": [0, 1, 2, -11], + "yTargetVelocity": 650, + "controlForce": 344 } } } diff --git a/objects/wired/sb_forcepad/x.png b/objects/wired/sb_forcepad/x.png index 5ff49f47..59c36d9c 100644 Binary files a/objects/wired/sb_forcepad/x.png and b/objects/wired/sb_forcepad/x.png differ diff --git a/objects/wired/sb_pump/icon.png b/objects/wired/sb_pump/icon.png index 818e2926..7696b7cb 100644 Binary files a/objects/wired/sb_pump/icon.png and b/objects/wired/sb_pump/icon.png differ diff --git a/objects/wired/sb_pump/pump.png b/objects/wired/sb_pump/pump.png index d29d362f..8513d7c0 100644 Binary files a/objects/wired/sb_pump/pump.png and b/objects/wired/sb_pump/pump.png differ diff --git a/objects/wired/sb_pump/pumplit.png b/objects/wired/sb_pump/pumplit.png index 9bc52657..c94f4636 100644 Binary files a/objects/wired/sb_pump/pumplit.png and b/objects/wired/sb_pump/pumplit.png differ diff --git a/objects/wired/sb_standingturret/standingturret.lua b/objects/wired/sb_standingturret/standingturret.lua index df9d7f5c..077266ad 100644 --- a/objects/wired/sb_standingturret/standingturret.lua +++ b/objects/wired/sb_standingturret/standingturret.lua @@ -2,253 +2,253 @@ require "/scripts/util.lua" require "/scripts/interp.lua" function init() - mechArm = root.assetJson("/vehicles/modularmech/mechparts_arm.config") - selfprojectile = {"standardbullet",{},0} containerCallback() - selfdefaultProjectile = {"standardbullet",{},0} - -- Positions and angles - selfbaseOffset = config.getParameter("baseOffset") - selfbasePosition = vec2.add(object.position(), selfbaseOffset) - selftipOffset = config.getParameter("tipOffset") --This is offset from BASE position, not object origin - - selfrotationSpeed = util.toRadians(config.getParameter("rotationSpeed")) - selfoffAngle = util.toRadians(config.getParameter("offAngle", -30)) - - -- Targeting - selftargetQueryRange = config.getParameter("targetQueryRange") - selftargetMinRange = config.getParameter("targetMinRange") - selftargetMaxRange = config.getParameter("targetMaxRange") - selftargetAngleRange = util.toRadians(config.getParameter("targetAngleRange")) - - -- Energy - storage.energy = storage.energy or 0 - selfregenBlockTimer = 0 - selfenergyRegen = config.getParameter("energyRegen") - selfmaxEnergy = config.getParameter("maxEnergy") - selfenergyRegenBlock = config.getParameter("energyRegenBlock") - - selfenergyBarOffset = config.getParameter("energyBarOffset") - selfverticalScaling = config.getParameter("verticalScaling") - animator.translateTransformationGroup("energy", selfenergyBarOffset) - - selfstate = FSM:new() - selfstate:set(offState) + mechArm = root.assetJson("/vehicles/modularmech/mechparts_arm.config") + self.projectile = {"standardbullet",{},0} containerCallback() + self.defaultProjectile = {"standardbullet",{},0} + -- Positions and angles + self.baseOffset = config.getParameter("baseOffset") + self.basePosition = vec2.add(object.position(), self.baseOffset) + self.tipOffset = config.getParameter("tipOffset") --This is offset from BASE position, not object origin + + self.rotationSpeed = util.toRadians(config.getParameter("rotationSpeed")) + self.offAngle = util.toRadians(config.getParameter("offAngle", -30)) + + -- Targeting + self.targetQueryRange = config.getParameter("targetQueryRange") + self.targetMinRange = config.getParameter("targetMinRange") + self.targetMaxRange = config.getParameter("targetMaxRange") + self.targetAngleRange = util.toRadians(config.getParameter("targetAngleRange")) + + -- Energy + storage.energy = storage.energy or 0 + self.regenBlockTimer = 0 + self.energyRegen = config.getParameter("energyRegen") + self.maxEnergy = config.getParameter("maxEnergy") + self.energyRegenBlock = config.getParameter("energyRegenBlock") + + self.energyBarOffset = config.getParameter("energyBarOffset") + self.verticalScaling = config.getParameter("verticalScaling") + animator.translateTransformationGroup("energy", self.energyBarOffset) + + self.state = FSM:new() + self.state:set(offState) end function update(dt) - selfstate:update(dt) + self.state:update(dt) - world.debugPoint(firePosition(), "green") + world.debugPoint(firePosition(), "green") - if storage.energy == 0 then - selfblockEnergyUsage = true - elseif storage.energy == selfmaxEnergy then - selfblockEnergyUsage = false - end + if storage.energy == 0 then + self.blockEnergyUsage = true + elseif storage.energy == self.maxEnergy then + self.blockEnergyUsage = false + end - if selfregenBlockTimer > 0 then - selfregenBlockTimer = math.max(0, selfregenBlockTimer - script.updateDt()) - else - storage.energy = math.min(selfmaxEnergy, storage.energy + selfenergyRegen * script.updateDt()) - end + if self.regenBlockTimer > 0 then + self.regenBlockTimer = math.max(0, self.regenBlockTimer - script.updateDt()) + else + storage.energy = math.min(self.maxEnergy, storage.energy + self.energyRegen * script.updateDt()) + end - local ratio = storage.energy / selfmaxEnergy - local animationState = "full" + local ratio = storage.energy / self.maxEnergy + local animationState = "full" - if ratio <= 0.75 then animationState = "high" end - if ratio <= 0.5 then animationState = "medium" end - if ratio <= 0.25 then animationState = "low" end - if ratio <= 0 then animationState = "none" end + if ratio <= 0.75 then animationState = "high" end + if ratio <= 0.5 then animationState = "medium" end + if ratio <= 0.25 then animationState = "low" end + if ratio <= 0 then animationState = "none" end - local scale = selfverticalScaling and {1, ratio * 11} or {ratio * 11, 1} + local scale = self.verticalScaling and {1, ratio * 11} or {ratio * 11, 1} - animator.resetTransformationGroup("energy") - animator.scaleTransformationGroup("energy", scale) - animator.translateTransformationGroup("energy", selfenergyBarOffset) + animator.resetTransformationGroup("energy") + animator.scaleTransformationGroup("energy", scale) + animator.translateTransformationGroup("energy", self.energyBarOffset) - animator.setAnimationState("energy", animationState) + animator.setAnimationState("energy", animationState) end ---------------------------------------------------------------------------------------------------------- -- States function offState() - animator.setAnimationState("attack", "dead") - animator.playSound("powerDown") - object.setAllOutputNodes(false) + animator.setAnimationState("attack", "dead") + animator.playSound("powerDown") + object.setAllOutputNodes(false) - while true do - animator.rotateGroup("gun", selfoffAngle) + while true do + animator.rotateGroup("gun", self.offAngle) - if active() then break end - coroutine.yield() - end + if active() then break end + coroutine.yield() + end - animator.playSound("powerUp") + animator.playSound("powerUp") - selfstate:set(scanState) + self.state:set(scanState) end function scanState() - animator.setAnimationState("attack", "idle") - util.wait(0.5) - animator.playSound("scan") - object.setAllOutputNodes(false) + animator.setAnimationState("attack", "idle") + util.wait(0.5) + animator.playSound("scan") + object.setAllOutputNodes(false) - local timer = 0 + local timer = 0 - local scanInterval = config.getParameter("scanInterval") - local scanAngle = util.toRadians(config.getParameter("scanAngle")) + local scanInterval = config.getParameter("scanInterval") + local scanAngle = util.toRadians(config.getParameter("scanAngle")) - local scan = coroutine.wrap(function() - while true do + local scan = coroutine.wrap(function() + while true do local target = findTarget() - if target then return selfstate:set(fireState, target) end + if target then return self.state:set(fireState, target) end util.wait(1.0) - end - end) + end + end) - while true do - timer = timer + script.updateDt() / scanInterval - if timer > 1 then timer = 0 end - animator.rotateGroup("gun", scanAngle * math.sin(timer * math.pi*2)) + while true do + timer = timer + script.updateDt() / scanInterval + if timer > 1 then timer = 0 end + animator.rotateGroup("gun", scanAngle * math.sin(timer * math.pi*2)) - scan() + scan() - if not active() then break end - coroutine.yield() - end + if not active() then break end + coroutine.yield() + end - selfstate:set(offState) + self.state:set(offState) end function fireState(targetId) - animator.setAnimationState("attack", "attack") - animator.playSound("foundTarget") - object.setAllOutputNodes(true) + animator.setAnimationState("attack", "attack") + animator.playSound("foundTarget") + object.setAllOutputNodes(true) - local maxFireAngle = util.toRadians(config.getParameter("maxFireAngle")) - local fire = coroutine.wrap(autoFire) + local maxFireAngle = util.toRadians(config.getParameter("maxFireAngle")) + local fire = coroutine.wrap(autoFire) - while true do - if not active() then return selfstate:set(offState) end + while true do + if not active() then return self.state:set(offState) end - if not world.entityExists(targetId) then break end + if not world.entityExists(targetId) then break end - local targetPosition = world.entityPosition(targetId) - local toTarget = world.distance(targetPosition, selfbasePosition) - local targetDistance = world.magnitude(toTarget) - local targetAngle = math.atan(toTarget[2], object.direction() * toTarget[1]) + local targetPosition = world.entityPosition(targetId) + local toTarget = world.distance(targetPosition, self.basePosition) + local targetDistance = world.magnitude(toTarget) + local targetAngle = math.atan(toTarget[2], object.direction() * toTarget[1]) - if targetDistance > selftargetMaxRange or targetDistance < selftargetMinRange or world.lineTileCollision(selfbasePosition, targetPosition) then break end - if math.abs(targetAngle) > selftargetAngleRange then break end + if targetDistance > self.targetMaxRange or targetDistance < self.targetMinRange or world.lineTileCollision(self.basePosition, targetPosition) then break end + if math.abs(targetAngle) > self.targetAngleRange then break end - animator.rotateGroup("gun", targetAngle) + animator.rotateGroup("gun", targetAngle) - local rotation = animator.currentRotationAngle("gun") - if math.abs(util.angleDiff(targetAngle, rotation)) < maxFireAngle then - fire() - end - coroutine.yield() - end + local rotation = animator.currentRotationAngle("gun") + if math.abs(util.angleDiff(targetAngle, rotation)) < maxFireAngle then + fire() + end + coroutine.yield() + end - util.wait(1.0) + util.wait(1.0) - selfstate:set(scanState) + self.state:set(scanState) end ---------------------------------------------------------------------------------------------------------- -- Helping functions, not states function consumeEnergy(amount) - if storage.energy <= 0 or selfblockEnergyUsage then return false end - storage.energy = storage.energy - amount - selfregenBlockTimer = selfenergyRegenBlock - return true + if storage.energy <= 0 or self.blockEnergyUsage then return false end + storage.energy = storage.energy - amount + self.regenBlockTimer = self.energyRegenBlock + return true end function active() - if object.isInputNodeConnected(0) then - return object.getInputNodeLevel(0) - end + if object.isInputNodeConnected(0) then + return object.getInputNodeLevel(0) + end - storage.active = storage.active ~= nil and storage.active or true - return storage.active + storage.active = storage.active ~= nil and storage.active or true + return storage.active end function firePosition() - local animationPosition = vec2.div(config.getParameter("animationPosition"), 8) - local fireOffset = vec2.add(animationPosition, animator.partPoint("gun", "projectileSource")) - return vec2.add(object.position(), fireOffset) + local animationPosition = vec2.div(config.getParameter("animationPosition"), 8) + local fireOffset = vec2.add(animationPosition, animator.partPoint("gun", "projectileSource")) + return vec2.add(object.position(), fireOffset) end function containerCallback() - local level = math.max(1.0, world.threatLevel()) - local power = config.getParameter("power", 2) - power = root.evalFunction("monsterLevelPowerMultiplier", level) * power ---power, firetime - selfmisc = {power,config.getParameter("fireTime", 0.1),config.getParameter("energyUsage")} - local contents = world.containerItems(entity.id()) - if contents ~= nil then -if contents[1] ~= nil then - local projectile = {contents[1].parameters or {}, root.itemConfig(contents[1].name).config} - if projectile[2].mechPart and projectile[2].mechPart[1] == "arm" then -local mechName = projectile[2].mechPart[2] - local mechParams = mechArm[mechName].partParameters - if mechParams.armClass == "GunArm" then selfprojectile = {mechParams.projectileType,mechParams.projectileParameters,0} - return end - end - projectile[3] = projectile[2].ammoUsage or 0 - projectile[1].primaryAbility = projectile[1].primaryAbility or {} --selfprojectile[1] - projectile[2].primaryAbility = projectile[2].primaryAbility or {} --selfprojectile[1] - projectile[1].projectileType = projectile[1].projectileType or nil - projectile[2].projectileType = projectile[2].projectileType or nil - selfprojectile = {projectile[1].projectileType or - projectile[2].projectileType or - projectile[1].primaryAbility.projectileType or - projectile[2].primaryAbility.projectileType or - selfdefaultProjectile[1],projectile[1].primaryAbility.projectileParameters or - projectile[2].primaryAbility.projectileParameters or - projectile[1].projectileParameters or projectile[2].projectileParameters or {}} - selfprojectile[3] = projectile[3] or 0 - local o = selfmisc - --TODO: should probably do something about the bubble gun not working because the projectile speed is a range - selfmisc[1] = projectile[1].primaryAbility.baseDamageFactor or projectile[2].primaryAbility.baseDamageFactor or selfmisc[1] - --selfmisc[2] = projectile[1].primaryAbility.fireTimeFactor or projectile[2].primaryAbility.fireTimeFactor or selfmisc[2] - selfmisc[3] = projectile[1].primaryAbility.energyUsageFactor or projectile[2].primaryAbility.energyUsageFactor or selfmisc[3] - for i = 1, 3 do if selfmisc[i] ~= o[i] then selfmisc[i] = (root.evalFunction("monsterLevelPowerMultiplier", level) * power) * 90 end end - - else selfprojectile = selfdefaultProjectile end end -end - -function getProjectiles(a) -if type(a) == "table" then return a[math.random(1,#a)] else return a end -end - --- Coroutine -function autoFire() - selfprojectile[2].power = selfmisc[1] - - while true do - while not consumeEnergy(selfmisc[3]) do coroutine.yield() end - - local rotation = animator.currentRotationAngle("gun") - local aimVector = {object.direction() * math.cos(rotation), math.sin(rotation)} - world.spawnProjectile(getProjectiles(selfprojectile[1]), firePosition(), entity.id(), aimVector, false, selfprojectile[2]) - if selfprojectile[3] > 0 then world.containerTakeNumItemsAt(entity.id(),0,selfprojectile[3]) end - animator.playSound("fire") - util.wait(selfmisc[2]) - end -end - --- Coroutine -function findTarget() - local nearEntities = world.entityQuery(selfbasePosition, selftargetQueryRange, { includedTypes = { "monster", "npc", "player" } }) - return util.find(nearEntities, function(entityId) - local targetPosition = world.entityPosition(entityId) - if not entity.isValidTarget(entityId) or world.lineTileCollision(selfbasePosition, targetPosition) then return false end - - local toTarget = world.distance(targetPosition, selfbasePosition) - local targetAngle = math.atan(toTarget[2], object.direction() * toTarget[1]) - return world.magnitude(toTarget) > selftargetMinRange and math.abs(targetAngle) < selftargetAngleRange - end) -end + local level = math.max(1.0, world.threatLevel()) + local power = config.getParameter("power", 2) + power = root.evalFunction("monsterLevelPowerMultiplier", level) * power + --power, firetime + self.misc = {power,config.getParameter("fireTime", 0.1),config.getParameter("energyUsage")} + local contents = world.containerItems(entity.id()) + if contents ~= nil then + if contents[1] ~= nil then + local projectile = {contents[1].parameters or {}, root.itemConfig(contents[1].name).config} + if projectile[2].mechPart and projectile[2].mechPart[1] == "arm" then + local mechName = projectile[2].mechPart[2] + local mechParams = mechArm[mechName].partParameters + if mechParams.armClass == "GunArm" then self.projectile = {mechParams.projectileType,mechParams.projectileParameters,0} + return end + end + projectile[3] = projectile[2].ammoUsage or 0 + projectile[1].primaryAbility = projectile[1].primaryAbility or {} --self.projectile[1] + projectile[2].primaryAbility = projectile[2].primaryAbility or {} --self.projectile[1] + projectile[1].projectileType = projectile[1].projectileType or nil + projectile[2].projectileType = projectile[2].projectileType or nil + self.projectile = {projectile[1].projectileType or + projectile[2].projectileType or + projectile[1].primaryAbility.projectileType or + projectile[2].primaryAbility.projectileType or + self.defaultProjectile[1],projectile[1].primaryAbility.projectileParameters or + projectile[2].primaryAbility.projectileParameters or + projectile[1].projectileParameters or projectile[2].projectileParameters or {}} + self.projectile[3] = projectile[3] or 0 + local o = self.misc + --TODO: should probably do something about the bubble gun not working because the projectile speed is a range + self.misc[1] = projectile[1].primaryAbility.baseDamageFactor or projectile[2].primaryAbility.baseDamageFactor or self.misc[1] + --self.misc[2] = projectile[1].primaryAbility.fireTimeFactor or projectile[2].primaryAbility.fireTimeFactor or self.misc[2] + self.misc[3] = projectile[1].primaryAbility.energyUsageFactor or projectile[2].primaryAbility.energyUsageFactor or self.misc[3] + for i = 1, 3 do if self.misc[i] ~= o[i] then self.misc[i] = (root.evalFunction("monsterLevelPowerMultiplier", level) * power) * 90 end end + + else self.projectile = self.defaultProjectile end end + end + + function getProjectiles(a) + if type(a) == "table" then return a[math.random(1,#a)] else return a end + end + + -- Coroutine + function autoFire() + self.projectile[2].power = self.misc[1] + + while true do + while not consumeEnergy(self.misc[3]) do coroutine.yield() end + + local rotation = animator.currentRotationAngle("gun") + local aimVector = {object.direction() * math.cos(rotation), math.sin(rotation)} + world.spawnProjectile(getProjectiles(self.projectile[1]), firePosition(), entity.id(), aimVector, false, self.projectile[2]) + if self.projectile[3] > 0 then world.containerTakeNumItemsAt(entity.id(),0,self.projectile[3]) end + animator.playSound("fire") + util.wait(self.misc[2]) + end + end + + -- Coroutine + function findTarget() + local nearEntities = world.entityQuery(self.basePosition, self.targetQueryRange, { includedTypes = { "monster", "npc", "player" } }) + return util.find(nearEntities, function(entityId) + local targetPosition = world.entityPosition(entityId) + if not entity.isValidTarget(entityId) or world.lineTileCollision(self.basePosition, targetPosition) then return false end + + local toTarget = world.distance(targetPosition, self.basePosition) + local targetAngle = math.atan(toTarget[2], object.direction() * toTarget[1]) + return world.magnitude(toTarget) > self.targetMinRange and math.abs(targetAngle) < self.targetAngleRange + end) + end diff --git a/objects/wired/sb_standingturret/turretgun.png b/objects/wired/sb_standingturret/turretgun.png index 364586d2..4ef73706 100644 Binary files a/objects/wired/sb_standingturret/turretgun.png and b/objects/wired/sb_standingturret/turretgun.png differ diff --git a/objects/wired/sb_standingturret/turretstand.png b/objects/wired/sb_standingturret/turretstand.png index 6d166b4d..a1bc6836 100644 Binary files a/objects/wired/sb_standingturret/turretstand.png and b/objects/wired/sb_standingturret/turretstand.png differ diff --git a/objects/wreck/sb_wreckchains/icon.png b/objects/wreck/sb_wreckchains/icon.png index 2a2425f9..c38856be 100644 Binary files a/objects/wreck/sb_wreckchains/icon.png and b/objects/wreck/sb_wreckchains/icon.png differ diff --git a/objects/wreck/sb_wreckchains/wreckchains1.png b/objects/wreck/sb_wreckchains/wreckchains1.png index fc1e6740..78e78a4d 100644 Binary files a/objects/wreck/sb_wreckchains/wreckchains1.png and b/objects/wreck/sb_wreckchains/wreckchains1.png differ diff --git a/objects/wreck/sb_wreckchains/wreckchains2.png b/objects/wreck/sb_wreckchains/wreckchains2.png index f22a743a..da4c5878 100644 Binary files a/objects/wreck/sb_wreckchains/wreckchains2.png and b/objects/wreck/sb_wreckchains/wreckchains2.png differ diff --git a/objects/wreck/sb_wreckchains/wreckchains3.png b/objects/wreck/sb_wreckchains/wreckchains3.png index a650e1ba..f0dffbb7 100644 Binary files a/objects/wreck/sb_wreckchains/wreckchains3.png and b/objects/wreck/sb_wreckchains/wreckchains3.png differ diff --git a/objects/wreck/sb_wreckcratewide/icon.png b/objects/wreck/sb_wreckcratewide/icon.png index 969ab2b5..0736d352 100644 Binary files a/objects/wreck/sb_wreckcratewide/icon.png and b/objects/wreck/sb_wreckcratewide/icon.png differ diff --git a/objects/wreck/sb_wreckcratewide/wreckcratewide.object b/objects/wreck/sb_wreckcratewide/wreckcratewide.object index 49cc5a6b..49a61005 100644 --- a/objects/wreck/sb_wreckcratewide/wreckcratewide.object +++ b/objects/wreck/sb_wreckcratewide/wreckcratewide.object @@ -1,44 +1,42 @@ { - "objectName" : "sb_wreckcratewide", - "rarity" : "Common", - "objectType" : "container", - "description" : "A antique crate, I wonder what's inside..", - "shortdescription" : "Wide Wrecked Crate", - "race" : "generic", - "category" : "storage", - "price" : 115, - "tooltipKind" : "sb_container", - "builder" : "/items/buildscripts/starbound/buildcontainer.lua", - "scripts" : ["/scripts/sb_container.lua"], + "objectName": "sb_wreckcratewide", + "rarity": "Common", + "objectType": "container", + "description": "A antique crate, I wonder what's inside..", + "shortdescription": "Wide Wrecked Crate", + "race": "generic", + "category": "storage", + "price": 115, + "tooltipKind": "sb_container", + "builder": "/items/buildscripts/starbound/buildcontainer.lua", + "scripts": ["/scripts/sb_container.lua"], - "apexDescription" : "A battered crate.", - "avianDescription" : "Could there be anything still in here?", - "floranDescription" : "Old ssmashed storage.", - "glitchDescription" : "Intrigued. An old storage container.", - "humanDescription" : "An old crate. Might still be something in there.", - "hylotlDescription" : "Could any treasures of worth be concealed in such a ruined crate?", - "novakidDescription" : "Even I ain't sure this crate's worth lookin' in.", - - "inventoryIcon" : "icon.png", - "orientations" : [ - { - "dualImage" : "wreckcratewide.png:", - - "imagePosition" : [-8, 0], - "frames" : 1, - "animationCycle" : 1.0, - - "spaceScan" : 0.1, - "anchors" : ["bottom"], - "collision" : "platform" + "apexDescription": "A battered crate.", + "avianDescription": "Could there be anything still in here?", + "floranDescription": "Old ssmashed storage.", + "glitchDescription": "Intrigued. An old storage container.", + "humanDescription": "An old crate. Might still be something in there.", + "hylotlDescription": "Could any treasures of worth be concealed in such a ruined crate?", + "novakidDescription": "Even I ain't sure this crate's worth lookin' in.", + "inventoryIcon": "icon.png", + "orientations": [{ + "dualImage": "wreckcratewide.png:", + "imagePosition": [-8, 0], + "frames": 1, + "animationCycle": 1.0, + "spaceScan": 0.1, + "anchors": ["bottom"], + "collision": "platform" } ], - "openSounds" : ["/sfx/objects/metalbox_open.ogg"], - "closeSounds" : ["/sfx/objects/metalbox_close.ogg"], - "slotCount" : 24, - "tooltipFields":{"slotCountLabel":"Holds 24 Items"}, - "uiConfig" : "/interface/sb_chests/chest.config", - "frameCooldown" : 5, - "autoCloseCooldown" : 3600 -} \ No newline at end of file + "openSounds": ["/sfx/objects/metalbox_open.ogg"], + "closeSounds": ["/sfx/objects/metalbox_close.ogg"], + "slotCount": 24, + "tooltipFields": { + "slotCountLabel": "Holds 24 Items" + }, + "uiConfig": "/interface/sb_chests/chest.config", + "frameCooldown": 5, + "autoCloseCooldown": 3600 +} diff --git a/objects/wreck/sb_wreckcratewide/wreckcratewide.png b/objects/wreck/sb_wreckcratewide/wreckcratewide.png index 2e6849a1..c926961f 100644 Binary files a/objects/wreck/sb_wreckcratewide/wreckcratewide.png and b/objects/wreck/sb_wreckcratewide/wreckcratewide.png differ diff --git a/objects/wreck/wreckconsole3/wreckconsole3icon.png b/objects/wreck/wreckconsole3/wreckconsole3icon.png new file mode 100644 index 00000000..503bee05 Binary files /dev/null and b/objects/wreck/wreckconsole3/wreckconsole3icon.png differ diff --git a/objects/wreck/wreckcrate1/wreckcrate1icon.png b/objects/wreck/wreckcrate1/wreckcrate1icon.png new file mode 100644 index 00000000..2c97874f Binary files /dev/null and b/objects/wreck/wreckcrate1/wreckcrate1icon.png differ diff --git a/parallax/images/tile/sb_coralcave/base/1.png b/parallax/images/tile/sb_coralcave/base/1.png index a7dc0011..b47730b6 100644 Binary files a/parallax/images/tile/sb_coralcave/base/1.png and b/parallax/images/tile/sb_coralcave/base/1.png differ diff --git a/parallax/images/tile/sb_crystalcave/base/1.png b/parallax/images/tile/sb_crystalcave/base/1.png index a5b94f43..68497a91 100644 Binary files a/parallax/images/tile/sb_crystalcave/base/1.png and b/parallax/images/tile/sb_crystalcave/base/1.png differ diff --git a/parallax/images/tile/sb_heck/base/1.png b/parallax/images/tile/sb_heck/base/1.png index 5aa2180c..16594f4e 100644 Binary files a/parallax/images/tile/sb_heck/base/1.png and b/parallax/images/tile/sb_heck/base/1.png differ diff --git a/parallax/images/tile/sb_heck/base/sb_heckrockdivider.png b/parallax/images/tile/sb_heck/base/sb_heckrockdivider.png deleted file mode 100644 index da5b5455..00000000 Binary files a/parallax/images/tile/sb_heck/base/sb_heckrockdivider.png and /dev/null differ diff --git a/parallax/images/tile/sb_sulphur/base/1.png b/parallax/images/tile/sb_sulphur/base/1.png new file mode 100644 index 00000000..1a771493 Binary files /dev/null and b/parallax/images/tile/sb_sulphur/base/1.png differ diff --git a/parallax/images/tile/sb_tentacles/base/1.png b/parallax/images/tile/sb_tentacles/base/1.png index a245e847..e40ac947 100644 Binary files a/parallax/images/tile/sb_tentacles/base/1.png and b/parallax/images/tile/sb_tentacles/base/1.png differ diff --git a/parallax/images/tile/sb_tentacletakeover/base/1.png b/parallax/images/tile/sb_tentacletakeover/base/1.png index cdd368f7..b5e85e0f 100644 Binary files a/parallax/images/tile/sb_tentacletakeover/base/1.png and b/parallax/images/tile/sb_tentacletakeover/base/1.png differ diff --git a/parallax/surface/sb_tentacles.parallax b/parallax/surface/sb_tentacles.parallax index eb345046..a9f35dc4 100644 --- a/parallax/surface/sb_tentacles.parallax +++ b/parallax/surface/sb_tentacles.parallax @@ -1,129 +1,116 @@ { - "verticalOrigin" : 10, - "layers" : [ - { - "kind" : "clouds3", - "baseCount" : 2, - "offset" : [0, 120], - "parallax" : 9, - "minSpeed" : 5000, - "maxSpeed" : 10000, - "fadePercent" : 0.15 - }, - { - "kind" : "clouds2", - "baseCount" : 2, - "offset" : [0, 140], - "parallax" : 14, - "minSpeed" : 2000, - "maxSpeed" : 5000, - "fadePercent" : 0.06 - }, - { - "kind" : "clouds1", - "baseCount" : 2, - "offset" : [0, 150], - "parallax" : 6, - "minSpeed" : 5000, - "maxSpeed" : 10000, - "fadePercent" : 0.04 - }, - { - "kind" : "clouds3", - "baseCount" : 2, - "offset" : [0, 60], - "parallax" : 9, - "minSpeed" : 5000, - "maxSpeed" : 10000, - "fadePercent" : 0.15 - }, - { - "kind" : "clouds2", - "baseCount" : 2, - "offset" : [0, 80], - "parallax" : 14, - "minSpeed" : 2000, - "maxSpeed" : 5000, - "fadePercent" : 0.06 - }, - { - "kind" : "clouds1", - "baseCount" : 2, - "offset" : [0, 100], - "parallax" : 6, - "minSpeed" : 5000, - "maxSpeed" : 10000, - "fadePercent" : 0.04 - }, - { - "kind" : "clouds3", - "baseCount" : 2, - "offset" : [0, 1], - "parallax" : 9, - "minSpeed" : 5000, - "maxSpeed" : 10000, - "fadePercent" : 0.15 + "verticalOrigin": 10, + "layers": [{ + "kind": "clouds3", + "baseCount": 2, + "offset": [0, 120], + "parallax": 9, + "minSpeed": 5000, + "maxSpeed": 10000, + "fadePercent": 0.15 + }, { + "kind": "clouds2", + "baseCount": 2, + "offset": [0, 140], + "parallax": 14, + "minSpeed": 2000, + "maxSpeed": 5000, + "fadePercent": 0.06 + }, { + "kind": "clouds1", + "baseCount": 2, + "offset": [0, 150], + "parallax": 6, + "minSpeed": 5000, + "maxSpeed": 10000, + "fadePercent": 0.04 + }, { + "kind": "clouds3", + "baseCount": 2, + "offset": [0, 60], + "parallax": 9, + "minSpeed": 5000, + "maxSpeed": 10000, + "fadePercent": 0.15 + }, { + "kind": "clouds2", + "baseCount": 2, + "offset": [0, 80], + "parallax": 14, + "minSpeed": 2000, + "maxSpeed": 5000, + "fadePercent": 0.06 + }, { + "kind": "clouds1", + "baseCount": 2, + "offset": [0, 100], + "parallax": 6, + "minSpeed": 5000, + "maxSpeed": 10000, + "fadePercent": 0.04 + }, { + "kind": "clouds3", + "baseCount": 2, + "offset": [0, 1], + "parallax": 9, + "minSpeed": 5000, + "maxSpeed": 10000, + "fadePercent": 0.15 + }, { + "kind": "clouds2", + "baseCount": 2, + "offset": [0, 20], + "parallax": 14, + "minSpeed": 2000, + "maxSpeed": 5000, + "fadePercent": 0.06 + }, { + "kind": "clouds1", + "baseCount": 2, + "offset": [0, 40], + "parallax": 6, + "minSpeed": 5000, + "maxSpeed": 10000, + "fadePercent": 0.04 + }, { + "kind": "desertfront2", //desertback", + "offset": [0, 550], + "parallax": [1.8001, 2], + // "parallax" : 1.199, + "fadePercent": 0.11 + }, { + "kind": "tile/sb_tentacles", + "offset": [0, 100], + // "parallax" : 1.199, + "parallax": [1.8, 2], + "fadePercent": 0.11 + }, { + "kind": "tile/sb_tentacletakeover", + "offset": [0, 350], + "parallax": [1.8001, 2], + // "parallax" : 1.199, + "fadePercent": 0.11 }, - { - "kind" : "clouds2", - "baseCount" : 2, - "offset" : [0, 20], - "parallax" : 14, - "minSpeed" : 2000, - "maxSpeed" : 5000, - "fadePercent" : 0.06 - }, - { - "kind" : "clouds1", - "baseCount" : 2, - "offset" : [0, 40], - "parallax" : 6, - "minSpeed" : 5000, - "maxSpeed" : 10000, - "fadePercent" : 0.04 - }, - { - "kind" : "desertfront2",//desertback", - "offset" : [0, 550], - "parallax" : [1.8001, 2], -// "parallax" : 1.199, - "fadePercent" : 0.11 - }, - { - "kind" : "tile/sb_tentacles", - "offset" : [0, 100], -// "parallax" : 1.199, - "parallax" : [1.8, 2], - "fadePercent" : 0.11 - }, - { - "kind" : "tile/sb_tentacletakeover", - "offset" : [0, 350], - "parallax" : [1.8001, 2], -// "parallax" : 1.199, - "fadePercent" : 0.11 - }, -/* { - "kind" : "desertfront2", - "offset" : [0, -50], - "parallax" : [1.8001, 1], - "fadePercent" : 0.11 + /* { + "kind" : "desertfront2", + "offset" : [0, -50], + "parallax" : [1.8001, 1], + "fadePercent" : 0.11 },*/ { - "kind" : "divider/dirt", - "offset" : [0, 400], - "nohueshift" : true, - "lightMapped" : true, - "parallax" : 1.199 - }, - { - "kind" : "tile/dirt", - "nohueshift" : true, - "lightMapped" : true, - "repeatY" : true, - "tileLimitTop" : 325, -// "offset" : [0, 500], - "parallax" : 1.2 + "kind": "divider/dirt", + "offset": [0, 400], + "nohueshift": true, + "lightMapped": true, + "parallax": 1.199 + }, { + "kind": "tile/dirt", + "nohueshift": true, + "lightMapped": true, + "repeatY": true, + "tileLimitTop": 325, + // "offset" : [0, 500], + "parallax": 1.2 } ] } diff --git a/parallax/underground/sb_coralcave.parallax b/parallax/underground/sb_coralcave.parallax index 26a70f6b..97bcfd04 100644 --- a/parallax/underground/sb_coralcave.parallax +++ b/parallax/underground/sb_coralcave.parallax @@ -1,12 +1,11 @@ { - "layers" : [ - { - "kind" : "tile/sb_coralcave", - "nohueshift" : true, - "lightMapped" : true, - "parallax" : 1.2, - "directives" : "?brightness=-65", - "repeatY" : true + "layers": [{ + "kind": "tile/sb_coralcave", + "nohueshift": true, + "lightMapped": true, + "parallax": 1.2, + "directives": "?brightness=-65", + "repeatY": true } ] } diff --git a/parallax/underground/sb_crystalcave.parallax b/parallax/underground/sb_crystalcave.parallax index b7b79240..3047527b 100644 --- a/parallax/underground/sb_crystalcave.parallax +++ b/parallax/underground/sb_crystalcave.parallax @@ -1,12 +1,11 @@ { - "layers" : [ - { - "kind" : "tile/sb_crystalcave", - "nohueshift" : true, - "lightMapped" : true, - "parallax" : 1.2, - "directives" : "?brightness=-65", - "repeatY" : true + "layers": [{ + "kind": "tile/sb_crystalcave", + "nohueshift": true, + "lightMapped": true, + "parallax": 1.2, + "directives": "?brightness=-65", + "repeatY": true } ] } diff --git a/parallax/underground/sb_heck.parallax b/parallax/underground/sb_heck.parallax index 8c06c3f3..7ecb9361 100644 --- a/parallax/underground/sb_heck.parallax +++ b/parallax/underground/sb_heck.parallax @@ -1,12 +1,11 @@ { - "layers" : [ - { - "kind" : "tile/sb_heck", - "nohueshift" : true, - "lightMapped" : true, - "parallax" : 1.2, - "directives" : "?brightness=-65", - "repeatY" : true + "layers": [{ + "kind": "tile/sb_heck", + "nohueshift": true, + "lightMapped": true, + "parallax": 1.2, + "directives": "?brightness=-65", + "repeatY": true } ] } diff --git a/parallax/underground/sb_sulphur.parallax b/parallax/underground/sb_sulphur.parallax new file mode 100644 index 00000000..3ae2039f --- /dev/null +++ b/parallax/underground/sb_sulphur.parallax @@ -0,0 +1,11 @@ +{ + "layers": [{ + "kind": "tile/sb_sulphur", + "nohueshift": true, + "lightMapped": true, + "parallax": 1.2, + "directives": "?brightness=-65", + "repeatY": true + } + ] +} diff --git a/particles/damagenumbers/sb_frozenburning_firedamagenumber.particle b/particles/damagenumbers/sb_frozenburning_firedamagenumber.particle deleted file mode 100644 index 65a277e6..00000000 --- a/particles/damagenumbers/sb_frozenburning_firedamagenumber.particle +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kind" : "sb_frozenburning_firedamagenumber", - "definition" : { - "type" : "text", - "text" : "^shadow;$dmg$", - "color" : [206, 125, 250, 255], - "light" : [47, 0, 69], - "fullbright" : true, - "initialVelocity" : [0, 15], - "finalVelocity" : [0, -15], - "size" : 1, - "approach" : [3, 40], - "angularVelocity" : 20, - "timeToLive" : 0.7, - "layer" : "front", - "destructionAction" : "shrink", - "destructionTime" : 0.5, - "variance" : { - "initialVelocity" : [12, 3] - }, - "flippable" : false - } -} \ No newline at end of file diff --git a/particles/damagenumbers/sb_frozenburning_firedamagenumberstrong.particle b/particles/damagenumbers/sb_frozenburning_firedamagenumberstrong.particle deleted file mode 100644 index 25abc297..00000000 --- a/particles/damagenumbers/sb_frozenburning_firedamagenumberstrong.particle +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kind" : "sb_frozenburning_firedamagenumberstrong", - "definition" : { - "type" : "text", - "text" : "^shadow;$dmg$", - "color" : [206, 125, 250, 255], - "light" : [47, 0, 69], - "fullbright" : true, - "initialVelocity" : [0, 15], - "finalVelocity" : [0, -15], - "size" : 1.2, - "approach" : [3, 30], - "angularVelocity" : 20, - "timeToLive" : 0.7, - "layer" : "front", - "destructionAction" : "shrink", - "destructionTime" : 0.5, - "variance" : { - "initialVelocity" : [9, 3] - }, - "flippable" : false - } -} \ No newline at end of file diff --git a/particles/damagenumbers/sb_frozenburning_firedamagenumberweak.particle b/particles/damagenumbers/sb_frozenburning_firedamagenumberweak.particle deleted file mode 100644 index b40e9912..00000000 --- a/particles/damagenumbers/sb_frozenburning_firedamagenumberweak.particle +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kind" : "sb_frozenburning_firedamagenumberweak", - "definition" : { - "type" : "text", - "text" : "^shadow;$dmg$", - "color" : [206, 125, 250, 255], - "light" : [47, 0, 69], - "fullbright" : true, - "initialVelocity" : [0, 15], - "finalVelocity" : [0, -15], - "size" : 0.8, - "approach" : [3, 50], - "angularVelocity" : 20, - "timeToLive" : 0.7, - "layer" : "front", - "destructionAction" : "shrink", - "destructionTime" : 0.5, - "variance" : { - "initialVelocity" : [15, 3] - }, - "flippable" : false - } -} \ No newline at end of file diff --git a/particles/damagenumbers/sb_frozenburning_icedamagenumber.particle b/particles/damagenumbers/sb_frozenburning_icedamagenumber.particle deleted file mode 100644 index 9c8c3f9d..00000000 --- a/particles/damagenumbers/sb_frozenburning_icedamagenumber.particle +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kind" : "sb_frozenburning_icedamagenumber", - "definition" : { - "type" : "text", - "text" : "^shadow;$dmg$", - "color" : [206, 125, 250, 255], - "light" : [47, 0, 69], - "fullbright" : true, - "initialVelocity" : [0, 15], - "finalVelocity" : [0, -15], - "size" : 1, - "approach" : [3, 40], - "angularVelocity" : 20, - "timeToLive" : 0.7, - "layer" : "front", - "destructionAction" : "shrink", - "destructionTime" : 0.5, - "variance" : { - "initialVelocity" : [12, 3] - }, - "flippable" : false - } -} \ No newline at end of file diff --git a/particles/damagenumbers/sb_frozenburning_icedamagenumberstrong.particle b/particles/damagenumbers/sb_frozenburning_icedamagenumberstrong.particle deleted file mode 100644 index 1a884339..00000000 --- a/particles/damagenumbers/sb_frozenburning_icedamagenumberstrong.particle +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kind" : "sb_frozenburning_icedamagenumberstrong", - "definition" : { - "type" : "text", - "text" : "^shadow;$dmg$", - "color" : [206, 125, 250, 255], - "light" : [47, 0, 69], - "fullbright" : true, - "initialVelocity" : [0, 15], - "finalVelocity" : [0, -15], - "size" : 1.2, - "approach" : [3, 30], - "angularVelocity" : 20, - "timeToLive" : 0.7, - "layer" : "front", - "destructionAction" : "shrink", - "destructionTime" : 0.5, - "variance" : { - "initialVelocity" : [9, 3] - }, - "flippable" : false - } -} \ No newline at end of file diff --git a/particles/damagenumbers/sb_frozenburning_icedamagenumberweak.particle b/particles/damagenumbers/sb_frozenburning_icedamagenumberweak.particle deleted file mode 100644 index 22df1ba3..00000000 --- a/particles/damagenumbers/sb_frozenburning_icedamagenumberweak.particle +++ /dev/null @@ -1,23 +0,0 @@ -{ - "kind" : "sb_frozenburning_icedamagenumberweak", - "definition" : { - "type" : "text", - "text" : "^shadow;$dmg$", - "color" : [206, 125, 250, 255], - "light" : [47, 0, 69], - "fullbright" : true, - "initialVelocity" : [0, 15], - "finalVelocity" : [0, -15], - "size" : 0.8, - "approach" : [3, 50], - "angularVelocity" : 20, - "timeToLive" : 0.7, - "layer" : "front", - "destructionAction" : "shrink", - "destructionTime" : 0.5, - "variance" : { - "initialVelocity" : [15.0, 3] - }, - "flippable" : false - } -} \ No newline at end of file diff --git a/particles/damagenumbers/sb_frozenburningdamagenumber.particle b/particles/damagenumbers/sb_frozenburningdamagenumber.particle new file mode 100644 index 00000000..a7814efe --- /dev/null +++ b/particles/damagenumbers/sb_frozenburningdamagenumber.particle @@ -0,0 +1,23 @@ +{ + "kind": "sb_frozenburningdamagenumber", + "definition": { + "type": "text", + "text": "^shadow;$dmg$", + "color": [206, 125, 250, 255], + "light": [47, 0, 69], + "fullbright": true, + "initialVelocity": [0, 15], + "finalVelocity": [0, -15], + "size": 1, + "approach": [3, 40], + "angularVelocity": 20, + "timeToLive": 0.7, + "layer": "front", + "destructionAction": "shrink", + "destructionTime": 0.5, + "variance": { + "initialVelocity": [12, 3] + }, + "flippable": false + } +} diff --git a/particles/damagenumbers/sb_frozenburningdamagenumberstrong.particle b/particles/damagenumbers/sb_frozenburningdamagenumberstrong.particle new file mode 100644 index 00000000..92f7800c --- /dev/null +++ b/particles/damagenumbers/sb_frozenburningdamagenumberstrong.particle @@ -0,0 +1,23 @@ +{ + "kind": "sb_frozenburningdamagenumberstrong", + "definition": { + "type": "text", + "text": "^shadow;$dmg$", + "color": [206, 125, 250, 255], + "light": [47, 0, 69], + "fullbright": true, + "initialVelocity": [0, 15], + "finalVelocity": [0, -15], + "size": 1.2, + "approach": [3, 30], + "angularVelocity": 20, + "timeToLive": 0.7, + "layer": "front", + "destructionAction": "shrink", + "destructionTime": 0.5, + "variance": { + "initialVelocity": [9, 3] + }, + "flippable": false + } +} diff --git a/particles/damagenumbers/sb_frozenburningdamagenumberweak.particle b/particles/damagenumbers/sb_frozenburningdamagenumberweak.particle new file mode 100644 index 00000000..be8a0f65 --- /dev/null +++ b/particles/damagenumbers/sb_frozenburningdamagenumberweak.particle @@ -0,0 +1,23 @@ +{ + "kind": "sb_frozenburningdamagenumberweak", + "definition": { + "type": "text", + "text": "^shadow;$dmg$", + "color": [206, 125, 250, 255], + "light": [47, 0, 69], + "fullbright": true, + "initialVelocity": [0, 15], + "finalVelocity": [0, -15], + "size": 0.8, + "approach": [3, 50], + "angularVelocity": 20, + "timeToLive": 0.7, + "layer": "front", + "destructionAction": "shrink", + "destructionTime": 0.5, + "variance": { + "initialVelocity": [15, 3] + }, + "flippable": false + } +} diff --git a/particles/monsterdeath/sb_jelly/1.png b/particles/monsterdeath/sb_jelly/1.png index 385124ba..1d7f41ef 100644 Binary files a/particles/monsterdeath/sb_jelly/1.png and b/particles/monsterdeath/sb_jelly/1.png differ diff --git a/particles/monsterdeath/sb_jelly/2.png b/particles/monsterdeath/sb_jelly/2.png index 210c845b..8250aca9 100644 Binary files a/particles/monsterdeath/sb_jelly/2.png and b/particles/monsterdeath/sb_jelly/2.png differ diff --git a/particles/monsterdeath/sb_jelly/3.png b/particles/monsterdeath/sb_jelly/3.png index 8516b00b..8c5d68de 100644 Binary files a/particles/monsterdeath/sb_jelly/3.png and b/particles/monsterdeath/sb_jelly/3.png differ diff --git a/particles/monsterdeath/sb_jelly/4.png b/particles/monsterdeath/sb_jelly/4.png index 982d5a80..bce423a2 100644 Binary files a/particles/monsterdeath/sb_jelly/4.png and b/particles/monsterdeath/sb_jelly/4.png differ diff --git a/particles/monsterdeath/sb_jelly/5.png b/particles/monsterdeath/sb_jelly/5.png index 31cc57ce..209f52ff 100644 Binary files a/particles/monsterdeath/sb_jelly/5.png and b/particles/monsterdeath/sb_jelly/5.png differ diff --git a/particles/monsterdeath/sb_robot/s2.png b/particles/monsterdeath/sb_robot/s2.png index 75a8a0db..1b054b58 100644 Binary files a/particles/monsterdeath/sb_robot/s2.png and b/particles/monsterdeath/sb_robot/s2.png differ diff --git a/particles/monsterdeath/sb_robot/s3.png b/particles/monsterdeath/sb_robot/s3.png index 6f1440fa..71a6d12f 100644 Binary files a/particles/monsterdeath/sb_robot/s3.png and b/particles/monsterdeath/sb_robot/s3.png differ diff --git a/particles/monsterdeath/sb_robot/s4.png b/particles/monsterdeath/sb_robot/s4.png index 4bc6bbab..75b202ee 100644 Binary files a/particles/monsterdeath/sb_robot/s4.png and b/particles/monsterdeath/sb_robot/s4.png differ diff --git a/particles/monsterdeath/sb_robot/s5.png b/particles/monsterdeath/sb_robot/s5.png index 475b0786..f3d16c46 100644 Binary files a/particles/monsterdeath/sb_robot/s5.png and b/particles/monsterdeath/sb_robot/s5.png differ diff --git a/particles/monsterdeath/sb_robot/s6.png b/particles/monsterdeath/sb_robot/s6.png index 46752b9e..631c4b46 100644 Binary files a/particles/monsterdeath/sb_robot/s6.png and b/particles/monsterdeath/sb_robot/s6.png differ diff --git a/particles/monsterdeath/sb_robot/s7.png b/particles/monsterdeath/sb_robot/s7.png index 0d35ca67..69abcc52 100644 Binary files a/particles/monsterdeath/sb_robot/s7.png and b/particles/monsterdeath/sb_robot/s7.png differ diff --git a/particles/sb_crouchdash.particle b/particles/sb_crouchdash.particle index ee29dab8..ef7608e0 100644 --- a/particles/sb_crouchdash.particle +++ b/particles/sb_crouchdash.particle @@ -1,16 +1,15 @@ { - "kind" : "sb_crouchdash", - "definition" : { - "type" : "animated", - "animation" : "/animations/dash/sb_crouchdash.animation", - "position" : [0, 0], - "finalVelocity" : [0, 0], - "approach" : [0, 0], - "fade" : 1, - "size" : 1, - "layer" : "back", - "timeToLive" : 0.85, - "variance" : { - } + "kind": "sb_crouchdash", + "definition": { + "type": "animated", + "animation": "/animations/dash/sb_crouchdash.animation", + "position": [0, 0], + "finalVelocity": [0, 0], + "approach": [0, 0], + "fade": 1, + "size": 1, + "layer": "back", + "timeToLive": 0.85, + "variance": {} } -} \ No newline at end of file +} diff --git a/particles/sb_fallingblock/debris1.png b/particles/sb_fallingblock/debris1.png index 644c6dbf..0f7fdea7 100644 Binary files a/particles/sb_fallingblock/debris1.png and b/particles/sb_fallingblock/debris1.png differ diff --git a/particles/sb_fallingblock/debris2.png b/particles/sb_fallingblock/debris2.png index 364f06c5..02dca1cf 100644 Binary files a/particles/sb_fallingblock/debris2.png and b/particles/sb_fallingblock/debris2.png differ diff --git a/particles/sb_fallingblock/debris3.png b/particles/sb_fallingblock/debris3.png index 1e4c1ae3..2c8d0d70 100644 Binary files a/particles/sb_fallingblock/debris3.png and b/particles/sb_fallingblock/debris3.png differ diff --git a/particles/sb_fallingblock/debris4.png b/particles/sb_fallingblock/debris4.png index 6a270d04..7f696129 100644 Binary files a/particles/sb_fallingblock/debris4.png and b/particles/sb_fallingblock/debris4.png differ diff --git a/particles/sb_fallingblock/debris5.png b/particles/sb_fallingblock/debris5.png index 0f78d53a..22973a32 100644 Binary files a/particles/sb_fallingblock/debris5.png and b/particles/sb_fallingblock/debris5.png differ diff --git a/plants/bushes/ground/crystals/crystals.bush.patch b/plants/bushes/ground/crystals/crystals.bush.patch new file mode 100644 index 00000000..fe82078c --- /dev/null +++ b/plants/bushes/ground/crystals/crystals.bush.patch @@ -0,0 +1,14 @@ +[ + [{ + "op": "test", + "path": "/shapes/5", + "inverse": true + }, { + "op": "add", + "path": "/shapes/-", + "value": { + "base": "6.png" + } + } + ] +] diff --git a/plants/bushes/ground/swampbush/swampbush.bush.patch b/plants/bushes/ground/swampbush/swampbush.bush.patch new file mode 100644 index 00000000..4f42d8f7 --- /dev/null +++ b/plants/bushes/ground/swampbush/swampbush.bush.patch @@ -0,0 +1,47 @@ +[ + [{ + "op": "test", + "path": "/shapes/0/base", + "value": "1.png" + },{ + "op": "replace", + "path": "/shapes/0/base", + "value": "base1.png" + }], + [{ + "op": "test", + "path": "/shapes/1/base", + "value": "2.png" + },{ + "op": "replace", + "path": "/shapes/1/base", + "value": "base2.png" + }], + [{ + "op": "test", + "path": "/shapes/2/base", + "value": "3.png" + },{ + "op": "replace", + "path": "/shapes/2/base", + "value": "base3.png" + }], + [{ + "op": "test", + "path": "/shapes/3/base", + "value": "4.png" + },{ + "op": "replace", + "path": "/shapes/3/base", + "value": "base4.png" + }], + [{ + "op": "test", + "path": "/shapes/4/base", + "value": "5.png" + },{ + "op": "replace", + "path": "/shapes/4/base", + "value": "base5.png" + }] +] \ No newline at end of file diff --git a/plants/bushes/ground/swampplant/swampplant.bush.patch b/plants/bushes/ground/swampplant/swampplant.bush.patch new file mode 100644 index 00000000..4f42d8f7 --- /dev/null +++ b/plants/bushes/ground/swampplant/swampplant.bush.patch @@ -0,0 +1,47 @@ +[ + [{ + "op": "test", + "path": "/shapes/0/base", + "value": "1.png" + },{ + "op": "replace", + "path": "/shapes/0/base", + "value": "base1.png" + }], + [{ + "op": "test", + "path": "/shapes/1/base", + "value": "2.png" + },{ + "op": "replace", + "path": "/shapes/1/base", + "value": "base2.png" + }], + [{ + "op": "test", + "path": "/shapes/2/base", + "value": "3.png" + },{ + "op": "replace", + "path": "/shapes/2/base", + "value": "base3.png" + }], + [{ + "op": "test", + "path": "/shapes/3/base", + "value": "4.png" + },{ + "op": "replace", + "path": "/shapes/3/base", + "value": "base4.png" + }], + [{ + "op": "test", + "path": "/shapes/4/base", + "value": "5.png" + },{ + "op": "replace", + "path": "/shapes/4/base", + "value": "base5.png" + }] +] \ No newline at end of file diff --git a/plants/bushes/ground/swampshrub/base2.png b/plants/bushes/ground/swampshrub/base2.png new file mode 100644 index 00000000..5ed2b347 Binary files /dev/null and b/plants/bushes/ground/swampshrub/base2.png differ diff --git a/plants/bushes/ground/swampshrub/swampshrub.bush.patch b/plants/bushes/ground/swampshrub/swampshrub.bush.patch new file mode 100644 index 00000000..da28756d --- /dev/null +++ b/plants/bushes/ground/swampshrub/swampshrub.bush.patch @@ -0,0 +1,56 @@ +[ + [{ + "op": "test", + "path": "/shapes/0/base", + "value": "1.png" + },{ + "op": "replace", + "path": "/shapes/0/base", + "value": "base1.png" + }], + [{ + "op": "test", + "path": "/shapes/1/base", + "value": "2.png" + },{ + "op": "replace", + "path": "/shapes/1/base", + "value": "base2.png" + }], + [{ + "op": "test", + "path": "/shapes/2/base", + "value": "3.png" + },{ + "op": "replace", + "path": "/shapes/2/base", + "value": "base3.png" + }], + [{ + "op": "test", + "path": "/shapes/3/base", + "value": "4.png" + },{ + "op": "replace", + "path": "/shapes/3/base", + "value": "base4.png" + }], + [{ + "op": "test", + "path": "/shapes/4/base", + "value": "5.png" + },{ + "op": "replace", + "path": "/shapes/4/base", + "value": "base5.png" + }], + [{ + "op": "test", + "path": "/shapes/5/base", + "value": "6.png" + },{ + "op": "replace", + "path": "/shapes/5/base", + "value": "base6.png" + }] +] \ No newline at end of file diff --git a/plants/trees/forest/foliage/greenleaves/greenleaves.modularfoliage.patch b/plants/trees/forest/foliage/greenleaves/greenleaves.modularfoliage.patch new file mode 100644 index 00000000..36340bde --- /dev/null +++ b/plants/trees/forest/foliage/greenleaves/greenleaves.modularfoliage.patch @@ -0,0 +1 @@ +[[{"op":"test","path":"/dropConfig","inverse":true},{"op":"add","path":"/dropConfig","value":{"drops":[[]]}}],[{"op":"add","path":"/dropConfig/drops/0/-","value":{"item":"sb_fruitTreeHarvest","count":1}}],[{"op":"add","path":"/dropConfig/drops/0/-","value":{"item":"sb_fruitTreeHarvest","count":2}}]] \ No newline at end of file diff --git a/plants/trees/sb_crystalline/foliage/crystalline/crown1.png b/plants/trees/sb_crystalline/foliage/crystalline/crown1.png index 91fe5be0..37c88088 100644 Binary files a/plants/trees/sb_crystalline/foliage/crystalline/crown1.png and b/plants/trees/sb_crystalline/foliage/crystalline/crown1.png differ diff --git a/plants/trees/sb_crystalline/foliage/crystalline/crown2.png b/plants/trees/sb_crystalline/foliage/crystalline/crown2.png index 91fe5be0..37c88088 100644 Binary files a/plants/trees/sb_crystalline/foliage/crystalline/crown2.png and b/plants/trees/sb_crystalline/foliage/crystalline/crown2.png differ diff --git a/plants/trees/sb_crystalline/foliage/crystalline/crown3.png b/plants/trees/sb_crystalline/foliage/crystalline/crown3.png index 91fe5be0..37c88088 100644 Binary files a/plants/trees/sb_crystalline/foliage/crystalline/crown3.png and b/plants/trees/sb_crystalline/foliage/crystalline/crown3.png differ diff --git a/plants/trees/sb_crystalline/stem/base1.png b/plants/trees/sb_crystalline/stem/base1.png index 7c01c25b..7bfedcc4 100644 Binary files a/plants/trees/sb_crystalline/stem/base1.png and b/plants/trees/sb_crystalline/stem/base1.png differ diff --git a/plants/trees/sb_crystalline/stem/base2.png b/plants/trees/sb_crystalline/stem/base2.png index 44c080b2..281228ca 100644 Binary files a/plants/trees/sb_crystalline/stem/base2.png and b/plants/trees/sb_crystalline/stem/base2.png differ diff --git a/plants/trees/sb_crystalline/stem/base3.png b/plants/trees/sb_crystalline/stem/base3.png index 361859b9..279da579 100644 Binary files a/plants/trees/sb_crystalline/stem/base3.png and b/plants/trees/sb_crystalline/stem/base3.png differ diff --git a/plants/trees/sb_crystalline/stem/crown1.png b/plants/trees/sb_crystalline/stem/crown1.png index b067d9b3..aba63645 100644 Binary files a/plants/trees/sb_crystalline/stem/crown1.png and b/plants/trees/sb_crystalline/stem/crown1.png differ diff --git a/plants/trees/sb_crystalline/stem/crown2.png b/plants/trees/sb_crystalline/stem/crown2.png index 4b43d942..7d315a80 100644 Binary files a/plants/trees/sb_crystalline/stem/crown2.png and b/plants/trees/sb_crystalline/stem/crown2.png differ diff --git a/plants/trees/sb_crystalline/stem/crown3.png b/plants/trees/sb_crystalline/stem/crown3.png index 9c449bd5..8a6b0cb8 100644 Binary files a/plants/trees/sb_crystalline/stem/crown3.png and b/plants/trees/sb_crystalline/stem/crown3.png differ diff --git a/plants/trees/sb_crystalline/stem/middle1.png b/plants/trees/sb_crystalline/stem/middle1.png index 0f33b40e..c11b7ac1 100644 Binary files a/plants/trees/sb_crystalline/stem/middle1.png and b/plants/trees/sb_crystalline/stem/middle1.png differ diff --git a/plants/trees/sb_crystalline/stem/middle2.png b/plants/trees/sb_crystalline/stem/middle2.png index 105e8407..61949bc7 100644 Binary files a/plants/trees/sb_crystalline/stem/middle2.png and b/plants/trees/sb_crystalline/stem/middle2.png differ diff --git a/plants/trees/sb_crystalline/stem/middle3.png b/plants/trees/sb_crystalline/stem/middle3.png index 84fa7f55..ccf7beed 100644 Binary files a/plants/trees/sb_crystalline/stem/middle3.png and b/plants/trees/sb_crystalline/stem/middle3.png differ diff --git a/plants/trees/sb_crystalline/stem/middle4.png b/plants/trees/sb_crystalline/stem/middle4.png index 6c61b0c8..ff50db12 100644 Binary files a/plants/trees/sb_crystalline/stem/middle4.png and b/plants/trees/sb_crystalline/stem/middle4.png differ diff --git a/plants/trees/sb_crystalline/stem/saplingicon.png b/plants/trees/sb_crystalline/stem/saplingicon.png index 5134a767..5b427d64 100644 Binary files a/plants/trees/sb_crystalline/stem/saplingicon.png and b/plants/trees/sb_crystalline/stem/saplingicon.png differ diff --git a/player.config.patch b/player.config.patch index ec151256..53e763a8 100644 --- a/player.config.patch +++ b/player.config.patch @@ -1,5 +1,4 @@ [ - //stats [{"op":"test","path":"/statusControllerSettings/stats/foodDelta/baseValue","value":-0.0583},{"op":"replace","path":"/statusControllerSettings/stats/foodDelta/baseValue","value":-0.0425}], //-51 food over 20 minutes [{"op":"test","path":"/statusControllerSettings/resources/food/maxValue","value":70},{"op":"replace","path":"/statusControllerSettings/resources/food/maxValue","value":100}], @@ -24,7 +23,6 @@ [{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"wiretool"}], [{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"paintingbeamtool"}], [{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"inspectiontool"}], -[{"op":"add","path":"/inventoryFilters/autoAddToCustomBar/typeWhitelist/-","value":"sb_partypopper"}], //reagent [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"coalore"}}], @@ -36,6 +34,8 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"polymer"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"leather"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"glasscoffeemug"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"thread"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_liquidcoffee"}}], //throwing [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_handgrenade"}}], @@ -45,7 +45,6 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_smokegrenade"}}], //skyrails -[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_skyrailtable"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"skyrail_asc"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"skyrail_desc"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"skyrail_diodeL"}}], @@ -119,6 +118,8 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_ladderdeployer"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_gps"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_healthmonitor"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_flashfreeze"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_partypopper"}}], //upgrades [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"upgrademodule"}}], @@ -146,6 +147,7 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"snowinfantrypants"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"winterscarfhead"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"eyepatchhead"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_shirtshort1chest"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_shirtlong1chest"}}], @@ -266,6 +268,7 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_slingshot"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_huntingknife"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_brainextractor"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":["sb_firebow",1,{"seed":1,"level":3}]}], //you cant do this kind of recipe in learnBlueprintsOnPickup [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_aegisaltpistol"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_aegisaltrifle"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_aegisaltshotgun"}}], @@ -325,6 +328,7 @@ [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"steeldrum"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"trumpet"}}], [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"violin"}}], +[{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"overdriveguitar"}}], //revolvers [{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_novatier1revolver"}}], @@ -380,7 +384,6 @@ //end [{"op":"add","path":"/genericScriptContexts/sb_main","value":"/scripts/player/sb_main.lua"}], -[{"op":"add","path":"/deploymentConfig/scripts/-","value":"/xrc/deployment/unlock/0018.lua"}], [{"op":"add","path":"/deploymentConfig/scripts/-","value":"/xrc/deployment/versioning/tech.lua"}], [{"op":"add","path":"/deploymentConfig/scripts/-","value":"/xrc/deployment/versioning/0018z.lua"}], [{"op":"add","path":"/genericScriptContexts/sb_blueprints","value":"/scripts/player/sb_blueprints.lua"}], diff --git a/player/playereffects.animation.patch b/player/playereffects.animation.patch deleted file mode 100644 index 5e4c344c..00000000 --- a/player/playereffects.animation.patch +++ /dev/null @@ -1,3 +0,0 @@ -[ -[{"op":"add","path":"/particleEmitters/sb_gatebeamBurst","value":{"particles":[]}},{"op":"add","path":"/particleEmitters/sb_classicbeamBurst","value":{"particles":[]}},{"op":"add","path":"/animatedParts/parts/base/partStates/teleport/sb_gatebeamIn","value":{"properties":{"image":"/animations/teleport/layerwarpin.png:"}}},{"op":"add","path":"/animatedParts/parts/base/partStates/teleport/sb_classicbeamIn","value":{"properties":{"image":"/animations/teleport/playerwarpin.png:"}}},{"op":"add","path":"/animatedParts/parts/base/partStates/teleport/sb_gatebeamOut","value":{"properties":{"image":"/animations/teleport/playerwarpout.png:"}}},{"op":"add","path":"/animatedParts/parts/base/partStates/teleport/sb_classicbeamOut","value":{"properties":{"image":"/animations/teleport/playerwarpout.png:"}}},{"op":"add","path":"/animatedParts/parts/sb_gatebeam","value":{"properties":{"fullbright":true,"centered":true,"offset":[0,30],"transformationGroups":["flip"]},"partStates":{"teleport":{"sb_gatebeamIn":{"properties":{"image":"/animations/teleport/playerwarpinbeam.png:?scalenearest=1;60;"}},"sb_gatebeamOut":{"properties":{"image":"/animations/teleport/playerwarpoutbeam.png:?scalenearest=1;60;"}}}}}},{"op":"add","path":"/animatedParts/parts/sb_classicbeam","value":{"properties":{"fullbright":true,"centered":true,"offset":[0,30],"transformationGroups":["flip"]},"partStates":{"teleport":{"sb_classicbeamIn":{"properties":{"image":"/animations/teleport/playerwarpinbeam.png:?scalenearest=1;60;"}},"sb_classicbeamOut":{"properties":{"image":"/animations/teleport/playerwarpoutbeam.png:?scalenearest=1;60;"}}}}}},{"op":"add","path":"/animatedParts/stateTypes/teleport/states/sb_gatebeamIn","value":{"frames":16,"cycle":1,"mode":"transition","transition":"none","properties":{"immediateSound":"/sfx/tools/teleport_down.ogg"}}},{"op":"add","path":"/animatedParts/stateTypes/teleport/states/sb_classicbeamIn","value":{"frames":16,"cycle":1,"mode":"transition","transition":"none","properties":{"immediateSound":"/sfx/tools/teleport_down.ogg"}}},{"op":"add","path":"/animatedParts/stateTypes/teleport/states/sb_gatebeamOut","value":{"frames":12,"cycle":0.75,"mode":"transition","transition":"none","properties":{"immediateSound":"/sfx/tools/teleport_up.ogg"}}},{"op":"add","path":"/animatedParts/stateTypes/teleport/states/sb_classicbeamOut","value":{"frames":12,"cycle":0.75,"mode":"transition","transition":"none","properties":{"immediateSound":"/sfx/tools/teleport_up.ogg"}}},{"op":"add","path":"/globalTagDefaults/sb_classicEffectDirectives","value":"?replace;9bd4ff=ff7059;31a6ff=be1b00"},{"op":"add","path":"/globalTagDefaults/sb_gateEffectDirectives","value":"?replace;feffff=000;9bd4ff=050040;31a6ff=03316e"}] -] \ No newline at end of file diff --git a/player/stat_primary.animation.patch b/player/stat_primary.animation.patch index 2c5988a9..44cf3030 100644 --- a/player/stat_primary.animation.patch +++ b/player/stat_primary.animation.patch @@ -25,10 +25,7 @@ "properties": { "fullbright": true, "centered": true, - "offset": [ - 0, - 0 - ], + "offset": [0,0], "zLevel": -1 }, "partStates": { diff --git a/professions/miner/recipe/bars/sb_ceruliumcompound.recipe b/professions/miner/recipe/bars/sb_ceruliumcompound.recipe deleted file mode 100644 index bdbe9e7f..00000000 --- a/professions/miner/recipe/bars/sb_ceruliumcompound.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["sb_ceruliumore",3]], - "output" : ["sb_ceruliumcompound",2], - "duration" : 0.15, - "groups" : ["ivrpgminerstation","bars","all","nouncrafting"] -} \ No newline at end of file diff --git a/projectiles/events/sb_spacepod/spacepod.png b/projectiles/events/sb_spacepod/spacepod.png index 202e7dd2..cfe90553 100644 Binary files a/projectiles/events/sb_spacepod/spacepod.png and b/projectiles/events/sb_spacepod/spacepod.png differ diff --git a/projectiles/explosions/giganticsnowballexplosion/giganticsnowballexplosion.projectile.patch b/projectiles/explosions/giganticsnowballexplosion/giganticsnowballexplosion.projectile.patch new file mode 100644 index 00000000..f903880e --- /dev/null +++ b/projectiles/explosions/giganticsnowballexplosion/giganticsnowballexplosion.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/projectiles/explosions/snowballexplosion/snowballexplosion.projectile.patch b/projectiles/explosions/snowballexplosion/snowballexplosion.projectile.patch new file mode 100644 index 00000000..e848244b --- /dev/null +++ b/projectiles/explosions/snowballexplosion/snowballexplosion.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"tarball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/projectiles/guns/arrows/sb_aegisaltarrow/aegisaltarrow.png b/projectiles/guns/arrows/sb_aegisaltarrow/aegisaltarrow.png index 24f2002e..de4cb888 100644 Binary files a/projectiles/guns/arrows/sb_aegisaltarrow/aegisaltarrow.png and b/projectiles/guns/arrows/sb_aegisaltarrow/aegisaltarrow.png differ diff --git a/projectiles/guns/arrows/sb_aegisaltarrow/chargedaegisaltarrow.png b/projectiles/guns/arrows/sb_aegisaltarrow/chargedaegisaltarrow.png index 488788dc..75cf07b9 100644 Binary files a/projectiles/guns/arrows/sb_aegisaltarrow/chargedaegisaltarrow.png and b/projectiles/guns/arrows/sb_aegisaltarrow/chargedaegisaltarrow.png differ diff --git a/projectiles/guns/arrows/sb_frozenfirearrow/chargedfrozenflamearrow.png b/projectiles/guns/arrows/sb_frozenfirearrow/chargedfrozenflamearrow.png index 9471285c..6584c2e9 100644 Binary files a/projectiles/guns/arrows/sb_frozenfirearrow/chargedfrozenflamearrow.png and b/projectiles/guns/arrows/sb_frozenfirearrow/chargedfrozenflamearrow.png differ diff --git a/projectiles/guns/arrows/sb_frozenfirearrow/frozenflamearrow.png b/projectiles/guns/arrows/sb_frozenfirearrow/frozenflamearrow.png index 33556e0a..81391ccf 100644 Binary files a/projectiles/guns/arrows/sb_frozenfirearrow/frozenflamearrow.png and b/projectiles/guns/arrows/sb_frozenfirearrow/frozenflamearrow.png differ diff --git a/projectiles/guns/arrows/sb_heckarrow/heckarrow.png b/projectiles/guns/arrows/sb_heckarrow/heckarrow.png index 35a5cf76..7f115c8d 100644 Binary files a/projectiles/guns/arrows/sb_heckarrow/heckarrow.png and b/projectiles/guns/arrows/sb_heckarrow/heckarrow.png differ diff --git a/projectiles/guns/arrows/sb_slingshot/slingshot.png b/projectiles/guns/arrows/sb_slingshot/slingshot.png index 99a6f5fa..1be4ed2d 100644 Binary files a/projectiles/guns/arrows/sb_slingshot/slingshot.png and b/projectiles/guns/arrows/sb_slingshot/slingshot.png differ diff --git a/projectiles/guns/bullets/sb_homingbullet/default.frames b/projectiles/guns/bullets/sb_homingbullet/default.frames new file mode 100644 index 00000000..a6573658 --- /dev/null +++ b/projectiles/guns/bullets/sb_homingbullet/default.frames @@ -0,0 +1,9 @@ +{ + "frameGrid": { + "size": [9, 3], + "dimensions": [1, 1], + "names": [ + ["0"] + ] + } +} diff --git a/projectiles/guns/bullets/sb_homingbullet/homingbullet.png b/projectiles/guns/bullets/sb_homingbullet/homingbullet.png new file mode 100644 index 00000000..7dbd1a11 Binary files /dev/null and b/projectiles/guns/bullets/sb_homingbullet/homingbullet.png differ diff --git a/projectiles/guns/bullets/sb_homingbullet/homingbullet.projectile b/projectiles/guns/bullets/sb_homingbullet/homingbullet.projectile new file mode 100644 index 00000000..7c753234 --- /dev/null +++ b/projectiles/guns/bullets/sb_homingbullet/homingbullet.projectile @@ -0,0 +1,17 @@ +{ + "projectileName": "sb_homingbullet", + "image": "homingbullet.png", + "animationCycle": 0.25, + "frameNumber": 1, + "speed": 30, + "acceleration": 30, + "physics": "rocket", + "emitters": ["rocketsmoke"], + "pointLight": false, + "power": 5, + "damageKind": "default", + "scripts": ["/scripts/projectiles/homingprojectile.lua"], + "scriptDelta": 3, + "rotationRate": 4, + "trackingLimit": 2 +} diff --git a/projectiles/guns/unsorted/reed/reed.projectile.patch b/projectiles/guns/unsorted/reed/reed.projectile.patch new file mode 100644 index 00000000..a4cedd63 --- /dev/null +++ b/projectiles/guns/unsorted/reed/reed.projectile.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/emitters","inverse":true},{"op":"add","path":"/emitters","value":[]}], +[{"op":"add","path":"/emitters/-","value":"daggerblue"}] +] \ No newline at end of file diff --git a/projectiles/guns/unsorted/shuriken/shuriken.projectile.patch b/projectiles/guns/unsorted/shuriken/shuriken.projectile.patch new file mode 100644 index 00000000..319a8515 --- /dev/null +++ b/projectiles/guns/unsorted/shuriken/shuriken.projectile.patch @@ -0,0 +1,6 @@ +[ +[{"op":"test","path":"/physics","value":"hover"},{"op":"replace","path":"/physics","value":"bullet"}], +[{"op":"test","path":"/piercing","inverse":true},{"op":"add","path":"/piercing","value":true}], +[{"op":"test","path":"/speed","value":30},{"op":"replace","path":"/speed","value":180}], +[{"op":"test","path":"/lightColor","value":[255,180,0]},{"op":"replace","path":"/lightColor","value":[255,0,0]}] +] \ No newline at end of file diff --git a/projectiles/material/sb_icematerial.png b/projectiles/material/sb_icematerial.png index f55a8beb..6dcef5a7 100644 Binary files a/projectiles/material/sb_icematerial.png and b/projectiles/material/sb_icematerial.png differ diff --git a/projectiles/npcs/fireswirl/sb_fireswirl.projectile b/projectiles/npcs/fireswirl/sb_fireswirl.projectile index 31fdfa9e..9126c8b0 100644 --- a/projectiles/npcs/fireswirl/sb_fireswirl.projectile +++ b/projectiles/npcs/fireswirl/sb_fireswirl.projectile @@ -1,15 +1,23 @@ { - "projectileName" : "sb_fireswirl", - "image" : "fireswirl.png", - "animationCycle" : 1, - "frameNumber" : 23, - "physics" : "laser", - "timeToLive" : 1, - "bounces" : 1, - "emitters" : [ "fireplasma", "flames" ], - "lightColor" : [84, 47, 26], - "actionOnReap" : [{"action":"config","file" : "/projectiles/explosions/bulletexplosion/bulletexplosion.config"} ], - "statusEffects" : [{"effect" : "burning", "duration" : 0.5 }], - "damagePoly" : [ [-9, 0], [-6, -6], [0, -9], [6, -6], [9, 0], [6, 6], [0, 9], [-6, 6] ], - "damageKind" : "fireplasma" -} \ No newline at end of file + "projectileName": "sb_fireswirl", + "image": "fireswirl.png", + "animationCycle": 1, + "frameNumber": 23, + "physics": "laser", + "timeToLive": 1, + "bounces": 1, + "emitters": ["fireplasma", "flames"], + "lightColor": [84, 47, 26], + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/bulletexplosion/bulletexplosion.config" + } + ], + "statusEffects": [{ + "effect": "burning", + "duration": 0.5 + } + ], + "damagePoly": [[-9, 0], [-6, -6], [0, -9], [6, -6], [9, 0], [6, 6], [0, 9], [-6, 6]], + "damageKind": "fireplasma" +} diff --git a/projectiles/npcs/flame/sb_fastflame.projectile b/projectiles/npcs/flame/sb_fastflame.projectile new file mode 100644 index 00000000..b556d869 --- /dev/null +++ b/projectiles/npcs/flame/sb_fastflame.projectile @@ -0,0 +1,21 @@ +{ + "projectileName": "sb_fastflame", + "image": "flame.png", + "physics": "flame", + "animationCycle": 1.05, + "animationLoops": false, + "damageKindImage": "/interface/statuses/fire.png", + "frameNumber": 12, + "power": 50, + "speed": 45, + "timeToLive": 1, + "bounces": 4, + "piercing": false, + "damagePoly": [[-9, 0], [-6, -6], [0, -9], [6, -6], [9, 0], [6, 6], [0, 9], [-6, 6]], + "lightColor": [255, 180, 0], + "damageKind": "fire", + "statusEffects": [ + "burning" + ], + "hydrophobic": true +} diff --git a/projectiles/sb_boss/jelly/icon.png b/projectiles/sb_boss/jelly/icon.png index cea8b1fa..347d4646 100644 Binary files a/projectiles/sb_boss/jelly/icon.png and b/projectiles/sb_boss/jelly/icon.png differ diff --git a/projectiles/sb_boss/jelly/jellybossgoosplash.png b/projectiles/sb_boss/jelly/jellybossgoosplash.png index a6449601..d1325a14 100644 Binary files a/projectiles/sb_boss/jelly/jellybossgoosplash.png and b/projectiles/sb_boss/jelly/jellybossgoosplash.png differ diff --git a/projectiles/sb_boss/penguin/dreadwreckage.png b/projectiles/sb_boss/penguin/dreadwreckage.png index 43b169e0..1ef69bac 100644 Binary files a/projectiles/sb_boss/penguin/dreadwreckage.png and b/projectiles/sb_boss/penguin/dreadwreckage.png differ diff --git a/projectiles/sb_boss/penguin/dreadwreckage.projectile b/projectiles/sb_boss/penguin/dreadwreckage.projectile index 57b3270d..ac41788f 100644 --- a/projectiles/sb_boss/penguin/dreadwreckage.projectile +++ b/projectiles/sb_boss/penguin/dreadwreckage.projectile @@ -1,20 +1,19 @@ { - "projectileName" : "sb_dreadwreckage", - "speed" : 35, - "bounces" : 0, - "timeToLive" : 30, - "physics" : "grenade", - "image" : "dreadwreckage.png", - "frameNumber" : 1, - "damageKind" : "default", - "power" : 0.1, - "clientEntityMode" : "ClientSlaveOnly", - "actionOnReap" : [ - { - "action" : "item", - "name" : "sb_dreadwreckage" + "projectileName": "sb_dreadwreckage", + "speed": 35, + "bounces": 0, + "timeToLive": 30, + "physics": "grenade", + "image": "dreadwreckage.png", + "frameNumber": 1, + "damageKind": "default", + "power": 0.1, + "clientEntityMode": "ClientSlaveOnly", + "actionOnReap": [{ + "action": "item", + "name": "sb_dreadwreckage" } ], - "damagePoly" : [ [-7.5, 0], [-5, -5], [0, -7.5], [5, -5], [7.5, 0], [5, 5], [0, 7.5], [-5, 5] ], - "emitters" : [ "flames","sparks","fireplasma","rocketsmoke" ] + "damagePoly": [[-7.5, 0], [-5, -5], [0, -7.5], [5, -5], [7.5, 0], [5, 5], [0, 7.5], [-5, 5]], + "emitters": ["flames", "sparks", "fireplasma", "rocketsmoke"] } diff --git a/projectiles/sb_minibiomelegendaries/cell/cellblastx.png b/projectiles/sb_minibiomelegendaries/cell/cellblastx.png index e7145040..0ff1e365 100644 Binary files a/projectiles/sb_minibiomelegendaries/cell/cellblastx.png and b/projectiles/sb_minibiomelegendaries/cell/cellblastx.png differ diff --git a/projectiles/sb_minibiomelegendaries/eye/bloodcloud.png b/projectiles/sb_minibiomelegendaries/eye/bloodcloud.png index 43454dec..fb0c0234 100644 Binary files a/projectiles/sb_minibiomelegendaries/eye/bloodcloud.png and b/projectiles/sb_minibiomelegendaries/eye/bloodcloud.png differ diff --git a/projectiles/sb_minibiomelegendaries/heck/blood/heckblood.png b/projectiles/sb_minibiomelegendaries/heck/blood/heckblood.png index de0729fe..8e11ac9e 100644 Binary files a/projectiles/sb_minibiomelegendaries/heck/blood/heckblood.png and b/projectiles/sb_minibiomelegendaries/heck/blood/heckblood.png differ diff --git a/projectiles/sb_minibiomelegendaries/heck/blood/heckbloodx.png b/projectiles/sb_minibiomelegendaries/heck/blood/heckbloodx.png index a1ed3b57..e2fbb1ad 100644 Binary files a/projectiles/sb_minibiomelegendaries/heck/blood/heckbloodx.png and b/projectiles/sb_minibiomelegendaries/heck/blood/heckbloodx.png differ diff --git a/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.png b/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.png index 62a56aea..751504dc 100644 Binary files a/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.png and b/projectiles/sb_minibiomelegendaries/slime/blob/slimeblob.png differ diff --git a/projectiles/sb_minibiomelegendaries/starcleaverboom.png b/projectiles/sb_minibiomelegendaries/starcleaverboom.png index 135ba4e9..e1833844 100644 Binary files a/projectiles/sb_minibiomelegendaries/starcleaverboom.png and b/projectiles/sb_minibiomelegendaries/starcleaverboom.png differ diff --git a/projectiles/sb_minibiomelegendaries/wilderness/leaforb.png b/projectiles/sb_minibiomelegendaries/wilderness/leaforb.png index 39ba2008..c88b7266 100644 Binary files a/projectiles/sb_minibiomelegendaries/wilderness/leaforb.png and b/projectiles/sb_minibiomelegendaries/wilderness/leaforb.png differ diff --git a/projectiles/sb_minibiomelegendaries/wilderness/leaforbx.png b/projectiles/sb_minibiomelegendaries/wilderness/leaforbx.png index 3e5429d2..7310cbcf 100644 Binary files a/projectiles/sb_minibiomelegendaries/wilderness/leaforbx.png and b/projectiles/sb_minibiomelegendaries/wilderness/leaforbx.png differ diff --git a/projectiles/sb_minibiomelegendaries/wilderness/uraniumorb.png b/projectiles/sb_minibiomelegendaries/wilderness/uraniumorb.png index 88565475..5920fcd0 100644 Binary files a/projectiles/sb_minibiomelegendaries/wilderness/uraniumorb.png and b/projectiles/sb_minibiomelegendaries/wilderness/uraniumorb.png differ diff --git a/projectiles/sb_staves/biolightball.png b/projectiles/sb_staves/biolightball.png index a5805675..c75556c7 100644 Binary files a/projectiles/sb_staves/biolightball.png and b/projectiles/sb_staves/biolightball.png differ diff --git a/projectiles/sb_staves/biolightball.projectile b/projectiles/sb_staves/biolightball.projectile index 7007ef44..e444142c 100644 --- a/projectiles/sb_staves/biolightball.projectile +++ b/projectiles/sb_staves/biolightball.projectile @@ -1,18 +1,18 @@ { - "projectileName" : "sb_biolightball", - "image" : "biolightball.png", - "physics" : "laser", - "animationCycle" : 0.3, - "frameNumber" : 6, - "power" : 50, - "speed" : 0, - "timeToLive" : 3.3, - "pointLight" : true, - "bounces" : 2, - "damagePoly" : [ [-18, 0], [-12, -12], [0, -18], [12, -12], [18, 0], [12, 12], [0, 18], [-12, 12] ], - "piercing" : true, - "damageKind" : "default", - - "lightColor" : [230, 213, 187], - "statusEffects" : ["glow"] + "projectileName": "sb_biolightball", + "image": "biolightball.png", + "physics": "laser", + "animationCycle": 0.3, + "frameNumber": 6, + "power": 50, + "speed": 0, + "timeToLive": 3.3, + "pointLight": true, + "bounces": 2, + "damagePoly": [[-18, 0], [-12, -12], [0, -18], [12, -12], [18, 0], [12, 12], [0, 18], [-12, 12]], + "piercing": true, + "damageKind": "default", + + "lightColor": [230, 213, 187], + "statusEffects": ["glow"] } diff --git a/projectiles/sb_staves/fleshseed1.png b/projectiles/sb_staves/fleshseed1.png index b59e261f..c1d364ca 100644 Binary files a/projectiles/sb_staves/fleshseed1.png and b/projectiles/sb_staves/fleshseed1.png differ diff --git a/projectiles/sb_staves/fleshseed1.projectile b/projectiles/sb_staves/fleshseed1.projectile index 2ac69ff6..ee249c5b 100644 --- a/projectiles/sb_staves/fleshseed1.projectile +++ b/projectiles/sb_staves/fleshseed1.projectile @@ -1,30 +1,28 @@ { - "projectileName" : "sb_fleshseed1", - "physics" : "grenade", - "bounces" : -1, - "timeToLive" : 1.5, - "image" : "fleshseed1.png", - "damageKindImage" : "icon.png", - "onlyHitTerrain" : false, - "actionOnReap" : [ - { - "action" : "option", - "options" : [ - { - "action" : "projectile", - "type" : "sb_fleshsplosion", - "fuzzAngle" : 0, - "inheritDamageFactor" : 2, - "inheritSpeedFactor" : 0 + "projectileName": "sb_fleshseed1", + "physics": "grenade", + "bounces": -1, + "timeToLive": 1.5, + "image": "fleshseed1.png", + "damageKindImage": "icon.png", + "onlyHitTerrain": false, + "actionOnReap": [{ + "action": "option", + "options": [{ + "action": "projectile", + "type": "sb_fleshsplosion", + "fuzzAngle": 0, + "inheritDamageFactor": 2, + "inheritSpeedFactor": 0 } ] } ], - "damagePoly" : [ [-6, 3], [-3, 6], [3, 6], [6, 3], [6, -3], [3, -6], [-3, -6], [-6, -3] ], - "animationCycle" : 0.3, - "frameNumber" : 4, - "speed" : 19, - "power" : 0, - "damageKind" : "default", - "emitters" : [ "defaultorange" ] + "damagePoly": [[-6, 3], [-3, 6], [3, 6], [6, 3], [6, -3], [3, -6], [-3, -6], [-6, -3]], + "animationCycle": 0.3, + "frameNumber": 4, + "speed": 19, + "power": 0, + "damageKind": "default", + "emitters": ["defaultorange"] } diff --git a/projectiles/sb_staves/fleshseedspawn.projectile b/projectiles/sb_staves/fleshseedspawn.projectile index a0102816..0a97d3e3 100644 --- a/projectiles/sb_staves/fleshseedspawn.projectile +++ b/projectiles/sb_staves/fleshseedspawn.projectile @@ -1,35 +1,32 @@ { - "projectileName" : "sb_fleshseedspawn", - "image" : "fleshseedspawn.png", - "animationCycle" : 1, - "frameNumber" : 1, - "timeToLive" : 0.01, - "physics" : "grenade", - "damageKindImage" : "icon.png", - "pointLight" : false, - "onlyHitTerrain" : true, - "actionOnReap" : [ - { - "action" : "option", - "options" : [ - { - "action" : "projectile", - "type" : "sb_fleshseed1", - "fuzzAngle" : 50, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 1 - }, - { - "action" : "projectile", - "type" : "sb_fleshseed1", - "fuzzAngle" : 20, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 1 + "projectileName": "sb_fleshseedspawn", + "image": "fleshseedspawn.png", + "animationCycle": 1, + "frameNumber": 1, + "timeToLive": 0.01, + "physics": "grenade", + "damageKindImage": "icon.png", + "pointLight": false, + "onlyHitTerrain": true, + "actionOnReap": [{ + "action": "option", + "options": [{ + "action": "projectile", + "type": "sb_fleshseed1", + "fuzzAngle": 50, + "inheritDamageFactor": 1, + "inheritSpeedFactor": 1 + }, { + "action": "projectile", + "type": "sb_fleshseed1", + "fuzzAngle": 20, + "inheritDamageFactor": 1, + "inheritSpeedFactor": 1 } ] } ], - "damagePoly" : [ ], - "power" : 0, - "damageKind" : "default" -} \ No newline at end of file + "damagePoly": [], + "power": 0, + "damageKind": "default" +} diff --git a/projectiles/sb_staves/fleshsplosion.png b/projectiles/sb_staves/fleshsplosion.png index 55a6778a..8ee6fdf8 100644 Binary files a/projectiles/sb_staves/fleshsplosion.png and b/projectiles/sb_staves/fleshsplosion.png differ diff --git a/projectiles/sb_staves/fleshsplosion.projectile b/projectiles/sb_staves/fleshsplosion.projectile index bf78cab6..f889e66a 100644 --- a/projectiles/sb_staves/fleshsplosion.projectile +++ b/projectiles/sb_staves/fleshsplosion.projectile @@ -1,16 +1,16 @@ { - "projectileName" : "sb_fleshsplosion", - "timeToLive" : 1, - "image" : "fleshsplosion.png", - "damageKindImage" : "icon.png", - "onlyHitTerrain" : false, - "damagePoly" : [ [-24, 0], [-16, -16], [0, -24], [16, -16], [24, 0], [16, 16], [0, 24], [-16, 16] ], - "animationLoops" : false, - "animationCycle" : 1, - "frameNumber" : 19, - "speed" : 0, - "power" : 40, - "piercing" : true, - "flippable" : true, - "damageKind" : "default" + "projectileName": "sb_fleshsplosion", + "timeToLive": 1, + "image": "fleshsplosion.png", + "damageKindImage": "icon.png", + "onlyHitTerrain": false, + "damagePoly": [[-24, 0], [-16, -16], [0, -24], [16, -16], [24, 0], [16, 16], [0, 24], [-16, 16]], + "animationLoops": false, + "animationCycle": 1, + "frameNumber": 19, + "speed": 0, + "power": 40, + "piercing": true, + "flippable": true, + "damageKind": "default" } diff --git a/projectiles/sb_staves/racialstaves/aqua/splashdrop1.projectile b/projectiles/sb_staves/racialstaves/aqua/splashdrop1.projectile index dde3b76c..66ca5147 100644 --- a/projectiles/sb_staves/racialstaves/aqua/splashdrop1.projectile +++ b/projectiles/sb_staves/racialstaves/aqua/splashdrop1.projectile @@ -1,21 +1,22 @@ { - "projectileName" : "sb_splashdrop1", - "image" : "splashdrop1.png", - "animationCycle" : 0.25, - "physics" : "highgravgrenade", - "frameNumber" : 2, - "pointLight" : false, - "animationLoops" : false, - "speed" : 70, - "timeToLive" : 1.5, - "orientationLocked" : false, - "flippable" : true, - "power" : 1.0, - "damagePoly" : [ [-2, 2], [-2, -2], [2, -2], [2, 2] ], - "damageKind" : "default", - "emitters" : [ "daggerblue","defaultblue" ], - "statusEffects" : [{"effect" : "wet", "duration" : 0.6 }], - "damageTeam" : { "type" : "indiscriminate" } + "projectileName": "sb_splashdrop1", + "image": "splashdrop1.png", + "animationCycle": 0.25, + "physics": "highgravgrenade", + "frameNumber": 2, + "pointLight": false, + "animationLoops": false, + "speed": 70, + "timeToLive": 1.5, + "orientationLocked": false, + "flippable": true, + "power": 1.0, + "damagePoly": [[-2, 2], [-2, -2], [2, -2], [2, 2]], + "damageKind": "default", + "emitters": ["daggerblue", "defaultblue"], + "statusEffects": [{ + "effect": "wet", + "duration": 0.6 + } + ] } - - diff --git a/projectiles/sb_staves/racialstaves/aqua/splashdrop2.png b/projectiles/sb_staves/racialstaves/aqua/splashdrop2.png index 19a4628a..5ecfb07b 100644 Binary files a/projectiles/sb_staves/racialstaves/aqua/splashdrop2.png and b/projectiles/sb_staves/racialstaves/aqua/splashdrop2.png differ diff --git a/projectiles/sb_staves/racialstaves/aqua/splashdrop2.projectile b/projectiles/sb_staves/racialstaves/aqua/splashdrop2.projectile index 83c303d1..9ad1001b 100644 --- a/projectiles/sb_staves/racialstaves/aqua/splashdrop2.projectile +++ b/projectiles/sb_staves/racialstaves/aqua/splashdrop2.projectile @@ -1,47 +1,43 @@ { - "projectileName" : "sb_splashdrop2", - "image" : "splashdrop2.png", - "animationCycle" : 0.25, - "physics" : "highgravgrenade", - "frameNumber" : 2, - "pointLight" : false, - "animationLoops" : false, - "speed" : 10, - "timeToLive" : 0, - "orientationLocked" : true, - "flippable" : true, - "power" : 2.0, - "damagePoly" : [ [-2, 2], [-2, -2], [2, -2], [2, 2] ], - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_splashspawner1", - "fuzzAngle" : 180, - "inheritDamageFactor" : 1.0, - "inheritSpeedFactor" : 0.02 - }, - { - "action" : "projectile", - "type" : "watersprinkledroplet", - "fuzzAngle" : 0, - "inheritDamageFactor" : 0, - "inheritSpeedFactor" : 0 - }, - { - "action" : "projectile", - "type" : "watersprinkledroplet", - "fuzzAngle" : 40, - "inheritDamageFactor" : 0, - "inheritSpeedFactor" : 0 - }, - { - "action" : "projectile", - "type" : "watersprinkledroplet", - "fuzzAngle" : -40, - "inheritDamageFactor" : 0, - "inheritSpeedFactor" : 0 + "projectileName": "sb_splashdrop2", + "image": "splashdrop2.png", + "animationCycle": 0.25, + "physics": "highgravgrenade", + "frameNumber": 2, + "pointLight": false, + "animationLoops": false, + "speed": 10, + "timeToLive": 0, + "orientationLocked": true, + "flippable": true, + "power": 2.0, + "damagePoly": [[-2, 2], [-2, -2], [2, -2], [2, 2]], + "actionOnReap": [{ + "action": "projectile", + "type": "sb_splashspawner1", + "fuzzAngle": 180, + "inheritDamageFactor": 1.0, + "inheritSpeedFactor": 0.02 + }, { + "action": "projectile", + "type": "watersprinkledroplet", + "fuzzAngle": 0, + "inheritDamageFactor": 0, + "inheritSpeedFactor": 0 + }, { + "action": "projectile", + "type": "watersprinkledroplet", + "fuzzAngle": 40, + "inheritDamageFactor": 0, + "inheritSpeedFactor": 0 + }, { + "action": "projectile", + "type": "watersprinkledroplet", + "fuzzAngle": -40, + "inheritDamageFactor": 0, + "inheritSpeedFactor": 0 } ], - "damageKind" : "default", - "emitters" : [ "daggerblue" ] -} \ No newline at end of file + "damageKind": "default", + "emitters": ["daggerblue"] +} diff --git a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile b/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile index 38a48b36..2e0f0df8 100644 --- a/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile +++ b/projectiles/sb_staves/racialstaves/aqua/splashspawner1.projectile @@ -1,68 +1,60 @@ { - "projectileName" : "sb_splashspawner1", - "image" : "splashspawner1.png", - "physics" : "gas", - "animationCycle" : 0.1, - "frameNumber" : 8, - "speed" : 1, - "pointLight" : false, - "timeToLive" : 0, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/splashexplosion1/splashexplosion1.config" - }, - { - "action" : "projectile", - "type" : "sb_splashdrop1", - "fuzzAngle" : 0, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 600 - }, - { - "action" : "projectile", - "type" : "sb_splashdrop1", - "fuzzAngle" : 90, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 600 - }, - { - "action" : "projectile", - "type" : "sb_splashdrop1", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 600 - }, - { - "action" : "projectile", - "type" : "sb_splashdrop1", - "fuzzAngle" : 270, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 600 - }, - { - "action" : "projectile", - "type" : "sb_splashdrop1", - "fuzzAngle" : 360, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 600 - }, - { - "action" : "projectile", - "type" : "watersprinkle", - "fuzzAngle" : 0, - "inheritDamageFactor" : 0, - "inheritSpeedFactor" : 0.02 - }, - { - "action" : "projectile", - "type" : "watersprinkle", - "fuzzAngle" : 3, - "inheritDamageFactor" : 0, - "inheritSpeedFactor" : -0.2 + "projectileName": "sb_splashspawner1", + "image": "splashspawner1.png", + "physics": "gas", + "animationCycle": 0.1, + "frameNumber": 8, + "speed": 1, + "pointLight": false, + "timeToLive": 0, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/splashexplosion1/splashexplosion1.config" + }, { + "action": "projectile", + "type": "sb_splashdrop1", + "fuzzAngle": 0, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 600 + }, { + "action": "projectile", + "type": "sb_splashdrop1", + "fuzzAngle": 90, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 600 + }, { + "action": "projectile", + "type": "sb_splashdrop1", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 600 + }, { + "action": "projectile", + "type": "sb_splashdrop1", + "fuzzAngle": 270, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 600 + }, { + "action": "projectile", + "type": "sb_splashdrop1", + "fuzzAngle": 360, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 600 + }, { + "action": "projectile", + "type": "watersprinkle", + "fuzzAngle": 0, + "inheritDamageFactor": 0, + "inheritSpeedFactor": 0.02 + }, { + "action": "projectile", + "type": "watersprinkle", + "fuzzAngle": 3, + "inheritDamageFactor": 0, + "inheritSpeedFactor": -0.2 } ], - "power" : 25, - "damageType" : "NoDamage", - "damageKind" : "default" + "power": 25, + "damageType": "NoDamage", + "damageKind": "default" } diff --git a/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile b/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile index c2fcf827..e96dc2f9 100644 --- a/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile +++ b/projectiles/sb_staves/racialstaves/aqua/splashspawner2.projectile @@ -1,54 +1,52 @@ { - "projectileName" : "sb_splashspawner2", - "image" : "splashspawner1.png", - "physics" : "gas", - "animationCycle" : 0, - "frameNumber" : 8, - "speed" : 1, - "pointLight" : false, - "timeToLive" : 0, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/splashexplosion1/splashexplosion1.config" - }, - { - "action" : "projectile", - "type" : "sb_splashdrop2", - "fuzzAngle" : 0, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 2000 + "projectileName": "sb_splashspawner2", + "image": "splashspawner1.png", + "physics": "gas", + "animationCycle": 0, + "frameNumber": 8, + "speed": 1, + "pointLight": false, + "timeToLive": 0, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/splashexplosion1/splashexplosion1.config" + }, { + "action": "projectile", + "type": "sb_splashdrop2", + "fuzzAngle": 0, + "inheritDamageFactor": 1, + "inheritSpeedFactor": 2000 }, -/* { - "action" : "projectile", - "type" : "sb_splashdrop2", - "fuzzAngle" : 60, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 2000 + /* { + "action" : "projectile", + "type" : "sb_splashdrop2", + "fuzzAngle" : 60, + "inheritDamageFactor" : 1, + "inheritSpeedFactor" : 2000 },*/ { - "action" : "projectile", - "type" : "sb_splashdrop2", - "fuzzAngle" : 120, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 2000 + "action": "projectile", + "type": "sb_splashdrop2", + "fuzzAngle": 120, + "inheritDamageFactor": 1, + "inheritSpeedFactor": 2000 }, -/* { - "action" : "projectile", - "type" : "sb_splashdrop2", - "fuzzAngle" : 180, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 2000 + /* { + "action" : "projectile", + "type" : "sb_splashdrop2", + "fuzzAngle" : 180, + "inheritDamageFactor" : 1, + "inheritSpeedFactor" : 2000 },*/ { - "action" : "projectile", - "type" : "sb_splashdrop2", - "fuzzAngle" : 240, - "inheritDamageFactor" : 1, - "inheritSpeedFactor" : 2000 + "action": "projectile", + "type": "sb_splashdrop2", + "fuzzAngle": 240, + "inheritDamageFactor": 1, + "inheritSpeedFactor": 2000 } ], - "power" : 25, - "damageType" : "NoDamage", - "damageKind" : "default" + "power": 25, + "damageType": "NoDamage", + "damageKind": "default" } diff --git a/projectiles/sb_staves/racialstaves/crystal/cardinalschalcedony/cardinalscalcedony.projectile b/projectiles/sb_staves/racialstaves/crystal/cardinalschalcedony/cardinalscalcedony.projectile index b9e9eefa..d65ae9c1 100644 --- a/projectiles/sb_staves/racialstaves/crystal/cardinalschalcedony/cardinalscalcedony.projectile +++ b/projectiles/sb_staves/racialstaves/crystal/cardinalschalcedony/cardinalscalcedony.projectile @@ -1,113 +1,103 @@ { - "projectileName" : "sb_cardinalschalcedony", - "physics" : "gas", - "bounces" : -1, - "speed" : 25, - "timeToLive" : 4, - "lightColor" : [120, 0, 40], - "pointLight" : true, - "piercing" : true, - "image" : "cardinalschalcedony.png", - "animationCycle" : 0.6, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 12, - "power" : 50, - "damagePoly" : [ [-5, 5], [-5, -5], [5, -5], [5, 5] ], - "supportsProcessing" : true, - "onlyHitTerrain" : true, - "periodicActions" : [ - { - "action" : "sound", - "options" : ["/sfx/projectiles/sb_crystalhum.ogg"], - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 120, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 150, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 180, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "regularexplosionuniversal", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 210, - "time" : 0, - "repeat" : false + "projectileName": "sb_cardinalschalcedony", + "physics": "gas", + "bounces": -1, + "speed": 25, + "timeToLive": 4, + "lightColor": [120, 0, 40], + "pointLight": true, + "piercing": true, + "image": "cardinalschalcedony.png", + "animationCycle": 0.6, + "orientationLocked": true, + "flippable": true, + "frameNumber": 12, + "power": 50, + "damagePoly": [[-5, 5], [-5, -5], [5, -5], [5, 5]], + "supportsProcessing": true, + "onlyHitTerrain": true, + "periodicActions": [{ + "action": "sound", + "options": ["/sfx/projectiles/sb_crystalhum.ogg"], + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 120, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 150, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 180, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "regularexplosionuniversal", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 210, + "time": 0, + "repeat": false } ], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/globeexplosions/redglobeexplosion/redglobeexplosion.config" + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/globeexplosions/redglobeexplosion/redglobeexplosion.config" } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzchunk.projectile b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzchunk.projectile index 8c2e117b..aa2819ff 100644 --- a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzchunk.projectile +++ b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzchunk.projectile @@ -1,15 +1,15 @@ { - "projectileName" : "sb_quartzchunk", - "physics" : "highgravgrenade", - "bounces" : -1, - "timeToLive" : 0.8, - "lightColor" : [50, 0, 35], - "image" : "quartzchunk.png", - "animationLoops" : false, - "animationCycle" : 0.8, - "frameNumber" : 8, - "speed" : 10, - "power" : 76, - "onlyHitTerrain" : true, - "damageKind" : "default" + "projectileName": "sb_quartzchunk", + "physics": "highgravgrenade", + "bounces": -1, + "timeToLive": 0.8, + "lightColor": [50, 0, 35], + "image": "quartzchunk.png", + "animationLoops": false, + "animationCycle": 0.8, + "frameNumber": 8, + "speed": 10, + "power": 76, + "onlyHitTerrain": true, + "damageKind": "default" } diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.png b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.png index ae64a33b..c144ce70 100644 Binary files a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.png and b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.png differ diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.projectile b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.projectile index 8bbbe134..97d3f8ee 100644 --- a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.projectile +++ b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzpulse.projectile @@ -1,13 +1,12 @@ { - "projectileName" : "sb_quartzpulse", - "image" : "quartzpulse.png", - "animationCycle" : 0.2, - "frameNumber" : 6, - "speed" : 0, - "damagePoly" : [ [-72, 0], [-48, -48], [0, -72], [48, -48], [72, 0], [48, 48], [0, 72], [-48, 48] ], - "animationLoops" : false, - "piercing" : true, - "flippable" : true, - "damageTeam" : { "type" : "indiscriminate" }, - "damageKind" : "default" + "projectileName": "sb_quartzpulse", + "image": "quartzpulse.png", + "animationCycle": 0.2, + "frameNumber": 6, + "speed": 0, + "damagePoly": [[-72, 0], [-48, -48], [0, -72], [48, -48], [72, 0], [48, 48], [0, 72], [-48, 48]], + "animationLoops": false, + "piercing": true, + "flippable": true, + "damageKind": "default" } diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.png b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.png index d4d04daf..f3d05e73 100644 Binary files a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.png and b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.png differ diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.projectile b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.projectile index 268095ce..ff5e6ef5 100644 --- a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.projectile +++ b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quartzshard.projectile @@ -1,15 +1,15 @@ { - "projectileName" : "sb_quartzshard", - "physics" : "highgravgrenade", - "bounces" : 3, - "timeToLive" : 3.5, - "lightColor" : [50, 0, 35], - "image" : "quartzshard.png", - "animationLoops" : false, - "animationCycle" : 0.5, - "frameNumber" : 4, - "speed" : 40, - "power" : 76, - "onlyHitTerrain" : true, - "damageKind" : "default" + "projectileName": "sb_quartzshard", + "physics": "highgravgrenade", + "bounces": 3, + "timeToLive": 3.5, + "lightColor": [50, 0, 35], + "image": "quartzshard.png", + "animationLoops": false, + "animationCycle": 0.5, + "frameNumber": 4, + "speed": 40, + "power": 76, + "onlyHitTerrain": true, + "damageKind": "default" } diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.png b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.png index 51623cd3..86bc91fc 100644 Binary files a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.png and b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.png differ diff --git a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.projectile b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.projectile index 7df85ebc..0c272048 100644 --- a/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.projectile +++ b/projectiles/sb_staves/racialstaves/crystal/quetzalcoatlsquartz/quetzalcoatlsquartz.projectile @@ -1,198 +1,174 @@ { - "projectileName" : "sb_quetzalcoatlsquartz", - "physics" : "gas", - "bounces" : -1, - "speed" : 25, - "timeToLive" : 4, - "lightColor" : [160, 10, 55], - "pointLight" : true, - "piercing" : true, - "image" : "quetzalcoatlsquartz.png", - "animationCycle" : 0.6, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 12, - "power" : 50, - "damagePoly" : [ [-5, 5], [-5, -5], [5, -5], [5, 5] ], - "supportsProcessing" : true, - "onlyHitTerrain" : true, - "periodicActions" : [ - { - "action" : "sound", - "options" : ["/sfx/projectiles/sb_crystalhum.ogg"], - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 120, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 150, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 180, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_quartzpulse", - "fuzzAngle" : 180, - "inheritSpeedFactor" : 0.1, - "inheritDamageFactor" : 0.25, - "delaySteps" : 210, - "time" : 0, - "repeat" : false + "projectileName": "sb_quetzalcoatlsquartz", + "physics": "gas", + "bounces": -1, + "speed": 25, + "timeToLive": 4, + "lightColor": [160, 10, 55], + "pointLight": true, + "piercing": true, + "image": "quetzalcoatlsquartz.png", + "animationCycle": 0.6, + "orientationLocked": true, + "flippable": true, + "frameNumber": 12, + "power": 50, + "damagePoly": [[-5, 5], [-5, -5], [5, -5], [5, 5]], + "supportsProcessing": true, + "onlyHitTerrain": true, + "periodicActions": [{ + "action": "sound", + "options": ["/sfx/projectiles/sb_crystalhum.ogg"], + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 120, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 150, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 180, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_quartzpulse", + "fuzzAngle": 180, + "inheritSpeedFactor": 0.1, + "inheritDamageFactor": 0.25, + "delaySteps": 210, + "time": 0, + "repeat": false } ], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/vlightblockexplosion/vlightblockexplosion.config" - }, - { - "action" : "projectile", - "type" : "sb_quartzchunk", - "fuzzAngle" : 10, - "angleAdjust" : 45, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_quartzchunk", - "fuzzAngle" : 10, - "angleAdjust" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_quartzchunk", - "fuzzAngle" : 10, - "angleAdjust" : -45, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "sound", - "options" : [ "/sfx/melee/sword_parry.ogg" ] - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 - }, - { - "action" : "projectile", - "type" : "sb_quartzshard", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.025 + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/vlightblockexplosion/vlightblockexplosion.config" + }, { + "action": "projectile", + "type": "sb_quartzchunk", + "fuzzAngle": 10, + "angleAdjust": 45, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_quartzchunk", + "fuzzAngle": 10, + "angleAdjust": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_quartzchunk", + "fuzzAngle": 10, + "angleAdjust": -45, + "inheritDamageFactor": 0.25 + }, { + "action": "sound", + "options": ["/sfx/melee/sword_parry.ogg"] + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 + }, { + "action": "projectile", + "type": "sb_quartzshard", + "fuzzAngle": 180, + "inheritDamageFactor": 0.025 } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.png b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.png index 4272b4a8..c217417f 100644 Binary files a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.png and b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.png differ diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.projectile b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.projectile index fd398f86..e43a8db2 100644 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakerscratch.projectile @@ -1,69 +1,62 @@ { - "projectileName" : "sb_gamebreakerscratch", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 0.2, - "lightColor" : [45, 70, 110], - "piercing" : true, - "image" : "gamebreakerscratch.png", - "animationCycle" : 0.2, - "animationLoops" : false, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 8, - "power" : 50, - "damagePoly" : [ [-12, 12], [12, -12] ], - "onlyHitTerrain" : true, - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_gamebreakertear", - "inheritDamageFactor" : 0.5, - "inheritSpeedFactor" : 0.1, - "angleAdjust" : 0 - }, - { - "action" : "sound", - "options" : [ "/sfx/projectiles/glitchtear.ogg" ] - }, - { - "action" : "projectile", - "type" : "sb_glitchsword", - "fuzzAngle" : 45, - "inheritDamageFactor" : 0.1, - "delaySteps" : 30 - }, - { - "action" : "projectile", - "type" : "sb_glitchsword", - "fuzzAngle" : 45, - "inheritDamageFactor" : 0.1, - "delaySteps" : 40 - }, - { - "action" : "projectile", - "type" : "sb_glitchsword", - "fuzzAngle" : 45, - "inheritDamageFactor" : 0.1, - "delaySteps" : 50 - }, - { - "action" : "projectile", - "type" : "sb_glitchsword", - "fuzzAngle" : 45, - "inheritDamageFactor" : 0.1, - "delaySteps" : 60 - }, - { - "action" : "projectile", - "type" : "sb_glitchsword", - "fuzzAngle" : 45, - "inheritDamageFactor" : 0.1, - "delaySteps" : 70 + "projectileName": "sb_gamebreakerscratch", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 0.2, + "lightColor": [45, 70, 110], + "piercing": true, + "image": "gamebreakerscratch.png", + "animationCycle": 0.2, + "animationLoops": false, + "orientationLocked": true, + "flippable": true, + "frameNumber": 8, + "power": 50, + "damagePoly": [[-12, 12], [12, -12]], + "onlyHitTerrain": true, + "supportsProcessing": true, + "actionOnReap": [{ + "action": "projectile", + "type": "sb_gamebreakertear", + "inheritDamageFactor": 0.5, + "inheritSpeedFactor": 0.1, + "angleAdjust": 0 + }, { + "action": "sound", + "options": ["/sfx/projectiles/glitchtear.ogg"] + }, { + "action": "projectile", + "type": "sb_glitchsword", + "fuzzAngle": 45, + "inheritDamageFactor": 0.1, + "delaySteps": 30 + }, { + "action": "projectile", + "type": "sb_glitchsword", + "fuzzAngle": 45, + "inheritDamageFactor": 0.1, + "delaySteps": 40 + }, { + "action": "projectile", + "type": "sb_glitchsword", + "fuzzAngle": 45, + "inheritDamageFactor": 0.1, + "delaySteps": 50 + }, { + "action": "projectile", + "type": "sb_glitchsword", + "fuzzAngle": 45, + "inheritDamageFactor": 0.1, + "delaySteps": 60 + }, { + "action": "projectile", + "type": "sb_glitchsword", + "fuzzAngle": 45, + "inheritDamageFactor": 0.1, + "delaySteps": 70 } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.png b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.png index 05ca91c6..beba0ecb 100644 Binary files a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.png and b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.png differ diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile index 85e845ab..3f32e089 100644 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/gamebreakertear.projectile @@ -1,34 +1,30 @@ { - "projectileName" : "sb_gamebreakertear", - "physics" : "hover", - "bounces" : -1, - "speed" : 25, - "timeToLive" : 2, - "lightColor" : [40, 85, 100], - "pointLight" : true, - "piercing" : true, - "image" : "gamebreakertear.png", - "animationCycle" : 0.6, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 8, - "power" : 10, - "damagePoly" : [ [-16, 16], [-8, -8], [16, -16], [8, 8] ], - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "sound", - "options" : [ "/sfx/melee/tesla_shock_kill.ogg" ] - }, - { - "action" : "config", - "file" : "/projectiles/explosions/glitchexplosion/glitchexplosion.config" + "projectileName": "sb_gamebreakertear", + "physics": "hover", + "bounces": -1, + "speed": 25, + "timeToLive": 2, + "lightColor": [40, 85, 100], + "pointLight": true, + "piercing": true, + "image": "gamebreakertear.png", + "animationCycle": 0.6, + "orientationLocked": true, + "flippable": true, + "frameNumber": 8, + "power": 10, + "damagePoly": [[-16, 16], [-8, -8], [16, -16], [8, 8]], + "supportsProcessing": true, + "actionOnReap": [{ + "action": "sound", + "options": ["/sfx/melee/tesla_shock_kill.ogg"] + }, { + "action": "config", + "file": "/projectiles/explosions/glitchexplosion/glitchexplosion.config" } ], - - "statusEffects" : [ + "statusEffects": [ "crash" ], - - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.png b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.png index e1ebb526..049c2060 100644 Binary files a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.png and b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.png differ diff --git a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile index fe23ee8b..3d497c6c 100644 --- a/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/gamebreaker/glitchsword.projectile @@ -1,25 +1,23 @@ { - "projectileName" : "sb_glitchsword", - "physics" : "stickybomb", - "image" : "glitchsword.png", - "animationCycle" : 0.2, - "bounces" : -1, - "timeToLive" : 2.5, - "frameNumber" : 6, - "speed" : 70, - "damagePoly" : [ [-20, 5.5], [14, 5.5], [14, -5.5], [-20, -5.5] ], - "animationLoops" : true, - "piercing" : false, - "flippable" : true, - "actionOnReap" : [ - { - "action" : "sound", - "options" : [ "/sfx/melee/tesla_shock_kill.ogg" ] - }, - { - "action" : "config", - "file" : "/projectiles/explosions/glitchexplosion/glitchexplosion.config" + "projectileName": "sb_glitchsword", + "physics": "stickybomb", + "image": "glitchsword.png", + "animationCycle": 0.2, + "bounces": -1, + "timeToLive": 2.5, + "frameNumber": 6, + "speed": 70, + "damagePoly": [[-20, 5.5], [14, 5.5], [14, -5.5], [-20, -5.5]], + "animationLoops": true, + "piercing": false, + "flippable": true, + "actionOnReap": [{ + "action": "sound", + "options": ["/sfx/melee/tesla_shock_kill.ogg"] + }, { + "action": "config", + "file": "/projectiles/explosions/glitchexplosion/glitchexplosion.config" } ], - "damageKind" : "retro" + "damageKind": "retro" } diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.png b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.png index caa8e949..012290df 100644 Binary files a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.png and b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.png differ diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.projectile b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.projectile index 51d2ea84..ef27f207 100644 --- a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchscratch.projectile @@ -1,34 +1,32 @@ { - "projectileName" : "sb_glitchscratch", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 0.2, - "lightColor" : [45, 70, 110], - "piercing" : true, - "image" : "glitchscratch.png", - "animationCycle" : 0.2, - "animationLoops" : false, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 8, - "power" : 50, - "damagePoly" : [ [-12, 12], [12, -12] ], - "onlyHitTerrain" : true, - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_glitchtear", - "inheritDamageFactor" : 0.5, - "inheritSpeedFactor" : 0.1, - "angleAdjust" : 0 - }, - { - "action" : "sound", - "options" : [ "/sfx/projectiles/glitchtear.ogg" ] + "projectileName": "sb_glitchscratch", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 0.2, + "lightColor": [45, 70, 110], + "piercing": true, + "image": "glitchscratch.png", + "animationCycle": 0.2, + "animationLoops": false, + "orientationLocked": true, + "flippable": true, + "frameNumber": 8, + "power": 50, + "damagePoly": [[-12, 12], [12, -12]], + "onlyHitTerrain": true, + "supportsProcessing": true, + "actionOnReap": [{ + "action": "projectile", + "type": "sb_glitchtear", + "inheritDamageFactor": 0.5, + "inheritSpeedFactor": 0.1, + "angleAdjust": 0 + }, { + "action": "sound", + "options": ["/sfx/projectiles/glitchtear.ogg"] } ], - - "damageKind" : "plasma" + + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.png b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.png index 75b1da22..7b4e72ec 100644 Binary files a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.png and b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.png differ diff --git a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile index 71db6ad9..218aa08b 100644 --- a/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile +++ b/projectiles/sb_staves/racialstaves/glitch/glitchartifact/glitchtear.projectile @@ -1,30 +1,29 @@ { - "projectileName" : "sb_glitchtear", - "physics" : "hover", - "bounces" : -1, - "speed" : 25, - "timeToLive" : 2, - "lightColor" : [40, 85, 100], - "pointLight" : true, - "piercing" : true, - "image" : "glitchtear.png", - "animationCycle" : 0.6, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 8, - "power" : 10, - "damagePoly" : [ [-16, 16], [-8, -8], [16, -16], [8, 8] ], - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/glitchexplosion/glitchexplosion.config" + "projectileName": "sb_glitchtear", + "physics": "hover", + "bounces": -1, + "speed": 25, + "timeToLive": 2, + "lightColor": [40, 85, 100], + "pointLight": true, + "piercing": true, + "image": "glitchtear.png", + "animationCycle": 0.6, + "orientationLocked": true, + "flippable": true, + "frameNumber": 8, + "power": 10, + "damagePoly": [[-16, 16], [-8, -8], [16, -16], [8, 8]], + "supportsProcessing": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/glitchexplosion/glitchexplosion.config" } ], - - "statusEffects" : [ + + "statusEffects": [ "crash" ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile b/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile index 025f8147..a1e8dba2 100644 --- a/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile +++ b/projectiles/sb_staves/racialstaves/leaf/cutterpetal.projectile @@ -1,26 +1,22 @@ { - "projectileName" : "sb_cutterpetal", - "image" : "cutterpetal.png", - "animationCycle" : 0.25, - "physics" : "gravitybullet", - "frameNumber" : 2, - "pointLight" : false, - "speed" : 40, - "lightColor" : [80, 24, 64], - "timeToLive" : 2.5, - "orientationLocked" : true, - "flippable" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/leafexplosion/leafexplosion.config" + "projectileName": "sb_cutterpetal", + "image": "cutterpetal.png", + "animationCycle": 0.25, + "physics": "gravitybullet", + "frameNumber": 2, + "pointLight": false, + "speed": 40, + "lightColor": [80, 24, 64], + "timeToLive": 2.5, + "orientationLocked": true, + "flippable": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/leafexplosion/leafexplosion.config" } ], - "power" : 1.0, - "damagePoly" : [ [-2, 2], [-2, -2], [2, -2], [2, 2] ], - "damageKind" : "default", - "damageTeam" : { "type" : "indiscriminate" }, - "emitters" : [ "lighttrailfast" ] + "power": 1.0, + "damagePoly": [[-2, 2], [-2, -2], [2, -2], [2, 2]], + "damageKind": "default", + "emitters": ["lighttrailfast"] } - - diff --git a/projectiles/sb_staves/racialstaves/leaf/leafcloud.png b/projectiles/sb_staves/racialstaves/leaf/leafcloud.png index 9e9bf11f..56c0b1c9 100644 Binary files a/projectiles/sb_staves/racialstaves/leaf/leafcloud.png and b/projectiles/sb_staves/racialstaves/leaf/leafcloud.png differ diff --git a/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile b/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile index e7272bc0..fcfe5363 100644 --- a/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile +++ b/projectiles/sb_staves/racialstaves/leaf/leafcloud.projectile @@ -1,208 +1,188 @@ { - "projectileName" : "sb_leafcloud", - "image" : "leafcloud.png", - "animationCycle" : 0.3, - "frameNumber" : 4, - "power" : 2, - "timeToLive" : 2.5, - "physics" : "gas", - "piercing" : true, - "periodicActions" : [ - { - "action" : "sound", - "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"] - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 15, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 20, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 25, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 35, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 40, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 45, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 50, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 55, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 65, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 70, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 75, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 80, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 85, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 95, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterleaf", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 350, - "delaySteps" : 100, - "time" : 0, - "repeat" : false + "projectileName": "sb_leafcloud", + "image": "leafcloud.png", + "animationCycle": 0.3, + "frameNumber": 4, + "power": 2, + "timeToLive": 2.5, + "physics": "gas", + "piercing": true, + "periodicActions": [{ + "action": "sound", + "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"] + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 15, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 20, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 25, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 35, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 40, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 45, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 50, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 55, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 65, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 70, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 75, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 80, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 85, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 95, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterleaf", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 350, + "delaySteps": 100, + "time": 0, + "repeat": false } ], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/leafexplosion/leafexplosion.config" + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/leafexplosion/leafexplosion.config" } ], - "lightColor" : [10, 50, 15], - "damageKind" : "poison" -} \ No newline at end of file + "lightColor": [10, 50, 15], + "damageKind": "poison" +} diff --git a/projectiles/sb_staves/racialstaves/leaf/petalcloud.png b/projectiles/sb_staves/racialstaves/leaf/petalcloud.png index 64876ce3..ed4f1f63 100644 Binary files a/projectiles/sb_staves/racialstaves/leaf/petalcloud.png and b/projectiles/sb_staves/racialstaves/leaf/petalcloud.png differ diff --git a/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile b/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile index 9f4f353c..9d53d54d 100644 --- a/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile +++ b/projectiles/sb_staves/racialstaves/leaf/petalcloud.projectile @@ -1,389 +1,350 @@ { - "projectileName" : "sb_petalcloud", - "image" : "petalcloud.png", - "animationCycle" : 0.3, - "frameNumber" : 4, - "power" : 5, - "speed" : 0, - "physics" : "gas", - "piercing" : true, - "timeToLive" : 2.5, - "periodicActions" : [ - { - "action" : "sound", - "delaySteps" : 15, - "options" : [ "/sfx/sb/npc/unique/gustchime1.ogg", "/sfx/sb/npc/unique/gustchime2.ogg", "/sfx/sb/npc/unique/gustchime3.ogg" ], - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 15, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 20, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 25, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 35, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 40, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 45, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 50, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 55, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 65, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 70, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 75, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 80, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 85, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 95, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 100, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 15, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 20, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 25, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 35, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 40, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 45, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 50, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 55, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 65, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 70, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 75, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 80, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 85, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 95, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_cutterpetal", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "speed" : 350, - "delaySteps" : 100, - "time" : 0, - "repeat" : false + "projectileName": "sb_petalcloud", + "image": "petalcloud.png", + "animationCycle": 0.3, + "frameNumber": 4, + "power": 5, + "speed": 0, + "physics": "gas", + "piercing": true, + "timeToLive": 2.5, + "periodicActions": [{ + "action": "sound", + "delaySteps": 15, + "options": ["/sfx/sb/npc/unique/gustchime1.ogg", "/sfx/sb/npc/unique/gustchime2.ogg", "/sfx/sb/npc/unique/gustchime3.ogg"], + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 15, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 20, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 25, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 35, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 40, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 45, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 50, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 55, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 65, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 70, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 75, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 80, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 85, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 95, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 100, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 15, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 20, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 25, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 35, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 40, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 45, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 50, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 55, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 65, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 70, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 75, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 80, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 85, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 95, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_cutterpetal", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "speed": 350, + "delaySteps": 100, + "time": 0, + "repeat": false } ], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/leafexplosion/leafexplosion.config" + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/leafexplosion/leafexplosion.config" } ], - - "lightColor" : [120, 55, 80], - "damageKind" : "poison" + "lightColor": [120, 55, 80], + "damageKind": "poison" } diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.png b/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.png index 9cd24ff3..34feb874 100644 Binary files a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.png and b/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.png differ diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.projectile b/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.projectile index 946b149f..5c061103 100644 --- a/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.projectile +++ b/projectiles/sb_staves/racialstaves/light/redgiant/redgiant.projectile @@ -1,165 +1,154 @@ { - "projectileName" : "sb_redgiant", - "physics" : "hover", - "bounces" : -1, - "speed" : 25, - "timeToLive" : 8, - "lightColor" : [255, 85, 10], - "pointLight" : true, - "piercing" : true, - "image" : "redgiant.png", - "animationCycle" : 0.6, - "frameNumber" : 6, - "power" : 2, - "damagePoly" : [ [-15, 0], [-10, -10], [0, -15], [10, -10], [15, 0], [10, 10], [0, 15], [-10, 10] ], - "supportsProcessing" : true, - "orientationLocked" : true, - "flippable" : true, - "periodicActions" : [ - { - "action" : "sound", - "options" : [ "/sfx/projectiles/redgiant.ogg" ], - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.01, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.02, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.03, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.04, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 120, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 150, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.06, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 180, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.07, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 210, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.08, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 240, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.09, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 270, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 300, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 330, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 360, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_sunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 420, - "time" : 0, - "repeat" : false + "projectileName": "sb_redgiant", + "physics": "hover", + "bounces": -1, + "speed": 25, + "timeToLive": 8, + "lightColor": [255, 85, 10], + "pointLight": true, + "piercing": true, + "image": "redgiant.png", + "animationCycle": 0.6, + "frameNumber": 6, + "power": 2, + "damagePoly": [[-15, 0], [-10, -10], [0, -15], [10, -10], [15, 0], [10, 10], [0, 15], [-10, 10]], + "supportsProcessing": true, + "orientationLocked": true, + "flippable": true, + "periodicActions": [{ + "action": "sound", + "options": ["/sfx/projectiles/redgiant.ogg"], + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.01, + "inheritSpeedFactor": 0.1, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.02, + "inheritSpeedFactor": 0.1, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.03, + "inheritSpeedFactor": 0.1, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.04, + "inheritSpeedFactor": 0.1, + "delaySteps": 120, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 0.1, + "delaySteps": 150, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.06, + "inheritSpeedFactor": 0.1, + "delaySteps": 180, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.07, + "inheritSpeedFactor": 0.1, + "delaySteps": 210, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.08, + "inheritSpeedFactor": 0.1, + "delaySteps": 240, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.09, + "inheritSpeedFactor": 0.1, + "delaySteps": 270, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 300, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 330, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 360, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_sunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 420, + "time": 0, + "repeat": false } ], - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/globeexplosions/orangeglobeexplosion/orangeglobeexplosion.config" + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/globeexplosions/orangeglobeexplosion/orangeglobeexplosion.config" } ], - "damageKind" : "plasma", - "statusEffects" : [{"effect":"burning","duration":3}], - "emitters" : ["defaultorange","fireflames","firesparks"] + "damageKind": "plasma", + "statusEffects": [{ + "effect": "burning", + "duration": 3 + } + ], + "emitters": ["defaultorange", "fireflames", "firesparks"] } diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.png b/projectiles/sb_staves/racialstaves/light/redgiant/sunray.png index 670aa696..007eac52 100644 Binary files a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.png and b/projectiles/sb_staves/racialstaves/light/redgiant/sunray.png differ diff --git a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile b/projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile index 7e4311c9..261e0d64 100644 --- a/projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile +++ b/projectiles/sb_staves/racialstaves/light/redgiant/sunray.projectile @@ -1,16 +1,20 @@ { - "projectileName" : "sb_sunray", - "physics" : "hover", - "bounces" : -1, - "speed" : 10, - "timeToLive" : 1.0, - "lightColor" : [165, 25, 0], - "piercing" : true, - "image" : "sunray.png", - "animationCycle" : 1.0, - "frameNumber" : 5, - "power" : 0, - "statusEffects" : [{"effect" : "burning", "duration" : 0.5 }], - "damagePoly" : [ [15, 5], [60, 10], [60, -10], [15, -5] ], - "damageKind" : "plasma" + "projectileName": "sb_sunray", + "physics": "hover", + "bounces": -1, + "speed": 10, + "timeToLive": 1.0, + "lightColor": [165, 25, 0], + "piercing": true, + "image": "sunray.png", + "animationCycle": 1, + "frameNumber": 5, + "power": 0, + "statusEffects": [{ + "effect": "burning", + "duration": 0.5 + } + ], + "damagePoly": [[15, 5], [60, 10], [60, -10], [15, -5]], + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/icon.png b/projectiles/sb_staves/racialstaves/light/supergiant/icon.png index cdbf62f5..73439c55 100644 Binary files a/projectiles/sb_staves/racialstaves/light/supergiant/icon.png and b/projectiles/sb_staves/racialstaves/light/supergiant/icon.png differ diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.png b/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.png index 92c7e594..f404405f 100644 Binary files a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.png and b/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.png differ diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.projectile b/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.projectile index 43c215b9..71cd7d2c 100644 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.projectile +++ b/projectiles/sb_staves/racialstaves/light/supergiant/supergiant.projectile @@ -1,350 +1,313 @@ { - "projectileName" : "sb_supergiant", - "physics" : "hover", - "bounces" : -1, - "speed" : 25, - "timeToLive" : 8, - "lightColor" : [185, 255, 255], - "pointLight" : true, - "piercing" : true, - "image" : "supergiant.png", - "animationCycle" : 0.6, - "frameNumber" : 6, - "power" : 9, - "damagePoly" : [ [-15, 0], [-10, -10], [0, -15], [10, -10], [15, 0], [10, 10], [0, 15], [-10, 10] ], - "supportsProcessing" : true, - "orientationLocked" : true, - "flippable" : true, - "periodicActions" : [ - { - "action" : "sound", - "options" : [ "/sfx/projectiles/redgiant.ogg" ], - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.01, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 30, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.02, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 60, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.03, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 90, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.04, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 120, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.05, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 150, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.06, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 180, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.07, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 210, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.08, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 240, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.09, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 270, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 300, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 330, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 360, - "time" : 0, - "repeat" : false - }, - { - "action" : "projectile", - "type" : "sb_supersunray", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.1, - "inheritSpeedFactor" : 0.1, - "delaySteps" : 420, - "time" : 0, - "repeat" : false + "projectileName": "sb_supergiant", + "physics": "hover", + "bounces": -1, + "speed": 25, + "timeToLive": 8, + "lightColor": [185, 255, 255], + "pointLight": true, + "piercing": true, + "image": "supergiant.png", + "animationCycle": 0.6, + "frameNumber": 6, + "power": 9, + "damagePoly": [[-15, 0], [-10, -10], [0, -15], [10, -10], [15, 0], [10, 10], [0, 15], [-10, 10]], + "supportsProcessing": true, + "orientationLocked": true, + "flippable": true, + "periodicActions": [{ + "action": "sound", + "options": ["/sfx/projectiles/redgiant.ogg"], + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.01, + "inheritSpeedFactor": 0.1, + "delaySteps": 30, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.02, + "inheritSpeedFactor": 0.1, + "delaySteps": 60, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.03, + "inheritSpeedFactor": 0.1, + "delaySteps": 90, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.04, + "inheritSpeedFactor": 0.1, + "delaySteps": 120, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.05, + "inheritSpeedFactor": 0.1, + "delaySteps": 150, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.06, + "inheritSpeedFactor": 0.1, + "delaySteps": 180, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.07, + "inheritSpeedFactor": 0.1, + "delaySteps": 210, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.08, + "inheritSpeedFactor": 0.1, + "delaySteps": 240, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.09, + "inheritSpeedFactor": 0.1, + "delaySteps": 270, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 300, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 330, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 360, + "time": 0, + "repeat": false + }, { + "action": "projectile", + "type": "sb_supersunray", + "fuzzAngle": 180, + "inheritDamageFactor": 0.1, + "inheritSpeedFactor": 0.1, + "delaySteps": 420, + "time": 0, + "repeat": false } ], - "actionOnReap" : [ - { - "action" : "sound", - "options" : [ "/sfx/projectiles/firework_explode1.ogg" ] - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 0 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 22 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 45 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 68 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 90 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 112 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 135 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 158 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 180 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 202 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 225 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 248 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 270 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 292 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 315 - }, - { - "action" : "projectile", - "type" : "fireworkblue3", - "inheritDamageFactor" : 0.001, - "fuzzAngle" : 5, - "angle" : 338 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 - }, - { - "action" : "projectile", - "type" : "sb_supergiantember", - "fuzzAngle" : 180, - "inheritDamageFactor" : 0.25 + "actionOnReap": [{ + "action": "sound", + "options": ["/sfx/projectiles/firework_explode1.ogg"] + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 0 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 22 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 45 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 68 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 90 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 112 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 135 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 158 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 180 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 202 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 225 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 248 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 270 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 292 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 315 + }, { + "action": "projectile", + "type": "fireworkblue3", + "inheritDamageFactor": 0.001, + "fuzzAngle": 5, + "angle": 338 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 + }, { + "action": "projectile", + "type": "sb_supergiantember", + "fuzzAngle": 180, + "inheritDamageFactor": 0.25 } ], - "damageKind" : "plasma", - "statusEffects" : [{"effect" : "burning", "duration" : 8 },{"effect" : "glow", "duration" : 8 }], - "damageTeam" : { "type" : "indiscriminate" }, - "emitters" : [ "defaultblue" ] + "damageKind": "plasma", + "statusEffects": [{ + "effect": "burning", + "duration": 8 + }, { + "effect": "glow", + "duration": 8 + } + ], + "emitters": ["defaultblue"] } diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.png b/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.png index 130e6a2b..87fe0f41 100644 Binary files a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.png and b/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.png differ diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.projectile b/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.projectile index 6618e340..cfbb1987 100644 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.projectile +++ b/projectiles/sb_staves/racialstaves/light/supergiant/supergiantember.projectile @@ -1,28 +1,24 @@ { - "projectileName" : "sb_supergiantember", - "image" : "supergiantember.png", - "animationCycle" : 0.25, - "physics" : "grenade", - "frameNumber" : 2, - "lightColor" : [0, 50, 100], - "animationLoops" : true, - "speed" : 20, - "timeToLive" : 2.5, - "power" : 0.04, - "damagePoly" : [ [-2, 2], [-2, -2], [2, -2], [2, 2] ], - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "fireworkblue4", - "inheritDamageFactor" : 0.5, - "fuzzAngle" : 5, - "angle" : 0 + "projectileName": "sb_supergiantember", + "image": "supergiantember.png", + "animationCycle": 0.25, + "physics": "grenade", + "frameNumber": 2, + "lightColor": [0, 50, 100], + "animationLoops": true, + "speed": 20, + "timeToLive": 2.5, + "power": 0.04, + "damagePoly": [[-2, 2], [-2, -2], [2, -2], [2, 2]], + "actionOnReap": [{ + "action": "projectile", + "type": "fireworkblue4", + "inheritDamageFactor": 0.5, + "fuzzAngle": 5, + "angle": 0 } ], - "damageKind" : "default", - "damageTeam" : { "type" : "indiscriminate" }, - "emitters" : [ "defaultblue" ], - "hydrophobic" : true + "damageKind": "default", + "emitters": ["defaultblue"], + "hydrophobic": true } - - diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.png b/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.png index a45ece46..d7c97f45 100644 Binary files a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.png and b/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.png differ diff --git a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile b/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile index 4214f295..124dd481 100644 --- a/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile +++ b/projectiles/sb_staves/racialstaves/light/supergiant/supersunray.projectile @@ -1,17 +1,20 @@ { - "projectileName" : "sb_supersunray", - "physics" : "hover", - "bounces" : -1, - "speed" : 10, - "timeToLive" : 1.0, - "lightColor" : [25, 100, 180], - "piercing" : true, - "image" : "supersunray.png", - "animationCycle" : 1.0, - "frameNumber" : 5, - "statusEffects" : [{"effect" : "burning", "duration" : 0.4}], - "damageTeam" : { "type" : "indiscriminate" }, - "power" : 0, - "damagePoly" : [ [15, 5], [60, 10], [60, -10], [15, -5] ], - "damageKind" : "plasma" + "projectileName": "sb_supersunray", + "physics": "hover", + "bounces": -1, + "speed": 10, + "timeToLive": 1.0, + "lightColor": [25, 100, 180], + "piercing": true, + "image": "supersunray.png", + "animationCycle": 1, + "frameNumber": 5, + "statusEffects": [{ + "effect": "burning", + "duration": 0.4 + } + ], + "power": 0, + "damagePoly": [[15, 5], [60, 10], [60, -10], [15, -5]], + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/plasma/boomblast.png b/projectiles/sb_staves/racialstaves/plasma/boomblast.png index 35b36369..37c323e5 100644 Binary files a/projectiles/sb_staves/racialstaves/plasma/boomblast.png and b/projectiles/sb_staves/racialstaves/plasma/boomblast.png differ diff --git a/projectiles/sb_staves/racialstaves/plasma/boomblast.projectile b/projectiles/sb_staves/racialstaves/plasma/boomblast.projectile index 8da48048..5a822483 100644 --- a/projectiles/sb_staves/racialstaves/plasma/boomblast.projectile +++ b/projectiles/sb_staves/racialstaves/plasma/boomblast.projectile @@ -1,22 +1,21 @@ { - "projectileName" : "sb_boomblast", - "physics" : "laser", - "bounces" : 0, - "image" : "boomblast.png", - "animationCycle" : 0.5, - "timeToLive" : 3, - "frameNumber" : 4, - "power" : 66, - "speed" : 100, - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/lightblockexplosion/lightblockexplosion.config" + "projectileName": "sb_boomblast", + "physics": "laser", + "bounces": 0, + "image": "boomblast.png", + "animationCycle": 0.5, + "timeToLive": 3, + "frameNumber": 4, + "power": 66, + "speed": 100, + "supportsProcessing": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/lightblockexplosion/lightblockexplosion.config" } ], - "lightColor" : [255, 50, 150], - "damagePoly" : [ [-2, 5], [-2, -5], [10, -5], [10, 5] ], - "damageKind" : "plasma", - "emitters" : [ "defaultmagenta" ] + "lightColor": [255, 50, 150], + "damagePoly": [[-2, 5], [-2, -5], [10, -5], [10, 5]], + "damageKind": "plasma", + "emitters": ["defaultmagenta"] } diff --git a/projectiles/sb_staves/racialstaves/plasma/plasmapulse.png b/projectiles/sb_staves/racialstaves/plasma/plasmapulse.png index ead73f82..eb0d81c8 100644 Binary files a/projectiles/sb_staves/racialstaves/plasma/plasmapulse.png and b/projectiles/sb_staves/racialstaves/plasma/plasmapulse.png differ diff --git a/projectiles/sb_staves/racialstaves/plasma/plasmapulse.projectile b/projectiles/sb_staves/racialstaves/plasma/plasmapulse.projectile index badefb0a..7d99dca2 100644 --- a/projectiles/sb_staves/racialstaves/plasma/plasmapulse.projectile +++ b/projectiles/sb_staves/racialstaves/plasma/plasmapulse.projectile @@ -1,22 +1,21 @@ { - "projectileName" : "sb_plasmapulse", - "physics" : "laser", - "bounces" : 0, - "image" : "plasmapulse.png", - "animationCycle" : 0.5, - "timeToLive" : 3, - "frameNumber" : 4, - "power" : 66, - "speed" : 35, - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/globeexplosions/magentaglobeexplosion/magentaglobeexplosion.config" + "projectileName": "sb_plasmapulse", + "physics": "laser", + "bounces": 0, + "image": "plasmapulse.png", + "animationCycle": 0.5, + "timeToLive": 3, + "frameNumber": 4, + "power": 66, + "speed": 35, + "supportsProcessing": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/globeexplosions/magentaglobeexplosion/magentaglobeexplosion.config" } ], - "lightColor" : [180, 50, 180], - "damagePoly" : [ [-2, 5], [-2, -5], [10, -5], [10, 5] ], - "damageKind" : "plasma", - "emitters" : [ "defaultmagenta" ] + "lightColor": [180, 50, 180], + "damagePoly": [[-2, 5], [-2, -5], [10, -5], [10, 5]], + "damageKind": "plasma", + "emitters": ["defaultmagenta"] } diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.png b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.png index 72c7221d..8371bd09 100644 Binary files a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.png and b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.png differ diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.projectile b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.projectile index d8628303..42e8824b 100644 --- a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.projectile +++ b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadbolt.projectile @@ -1,25 +1,24 @@ { - "projectileName" : "sb_deadbolt", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 3.5, - "lightColor" : [150, 100, 15], - "piercing" : true, - "image" : "deadbolt.png", - "animationCycle" : 0.5, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 4, - "power" : 0, - "damagePoly" : [ [-3, 3], [-3, -3], [3, -3], [3, 3] ], - "supportsProcessing" : true, - "onlyHitTerrain" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/vsmallregularexplosion/vsmallregularexplosionknockback.config" + "projectileName": "sb_deadbolt", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 3.5, + "lightColor": [150, 100, 15], + "piercing": true, + "image": "deadbolt.png", + "animationCycle": 0.5, + "orientationLocked": true, + "flippable": true, + "frameNumber": 4, + "power": 0, + "damagePoly": [[-3, 3], [-3, -3], [3, -3], [3, 3]], + "supportsProcessing": true, + "onlyHitTerrain": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/vsmallregularexplosion/vsmallregularexplosionknockback.config" } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.png b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.png index bcb9c45f..201e2753 100644 Binary files a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.png and b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.png differ diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.projectile b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.projectile index bfbe59be..35b4f450 100644 --- a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.projectile +++ b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltlaser.projectile @@ -1,20 +1,19 @@ { - "projectileName" : "sb_deadboltlaser", - "physics" : "laser", - "bounces" : 0, - "image" : "deadboltlaser.png", - "animationCycle" : 0.2, - "timeToLive" : 3.0, - "animationLoops" : false, - "frameNumber" : 4, - "power" : 50, - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/plasmabulletexplosion/plasmabulletexplosion.config" + "projectileName": "sb_deadboltlaser", + "physics": "laser", + "bounces": 0, + "image": "deadboltlaser.png", + "animationCycle": 0.2, + "timeToLive": 3.0, + "animationLoops": false, + "frameNumber": 4, + "power": 50, + "supportsProcessing": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/plasmabulletexplosion/plasmabulletexplosion.config" } ], - "lightColor" : [225, 150, 50], - "damageKind" : "plasma" + "lightColor": [225, 150, 50], + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.projectile b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.projectile index 054fac31..55882470 100644 --- a/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.projectile +++ b/projectiles/sb_staves/racialstaves/steel/deadbolt/deadboltteleportin.projectile @@ -1,145 +1,129 @@ { - "projectileName" : "sb_deadboltteleportin", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 0.5, - "lightColor" : [150, 100, 15], - "piercing" : true, - "image" : "deadboltteleportin.png", - "animationCycle" : 0.5, - "animationLoops" : false, - "orientationLocked" : true, - "flippable" : true, - "frameNumber" : 7, - "power" : 0, - "damagePoly" : [ [-3, 3], [-3, -3], [3, -3], [3, 3] ], - "supportsProcessing" : true, - "onlyHitTerrain" : true, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_deadbolt", - "inheritDamageFactor" : 0.0, - "speed" : 0, - "angleAdjust" : 0 - }, - { - "action" : "sound", - "options" : [ "/sfx/tech/mech_jump1.ogg" ] - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 30 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 40 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 50 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 60 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 70 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 80 - }, - { - "action" : "projectile", - "type" : "rocket", - "fuzzAngle" : 0, - "inheritDamageFactor" : 0.2, - "speed" : 10000, - "delaySteps" : 90 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 100 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 110 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 120 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 130 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 140 - }, - { - "action" : "projectile", - "type" : "sb_deadboltlaser", - "fuzzAngle" : 8, - "inheritDamageFactor" : 0.133, - "speed" : 9000, - "delaySteps" : 150 - }, - { - "action" : "projectile", - "type" : "rocket", - "fuzzAngle" : 0, - "inheritDamageFactor" : 0.2, - "speed" : 10000, - "delaySteps" : 160 + "projectileName": "sb_deadboltteleportin", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 0.5, + "lightColor": [150, 100, 15], + "piercing": true, + "image": "deadboltteleportin.png", + "animationCycle": 0.5, + "animationLoops": false, + "orientationLocked": true, + "flippable": true, + "frameNumber": 7, + "power": 0, + "damagePoly": [[-3, 3], [-3, -3], [3, -3], [3, 3]], + "supportsProcessing": true, + "onlyHitTerrain": true, + "actionOnReap": [{ + "action": "projectile", + "type": "sb_deadbolt", + "inheritDamageFactor": 0.0, + "speed": 0, + "angleAdjust": 0 + }, { + "action": "sound", + "options": ["/sfx/tech/mech_jump1.ogg"] + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 30 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 40 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 50 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 60 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 70 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 80 + }, { + "action": "projectile", + "type": "rocket", + "fuzzAngle": 0, + "inheritDamageFactor": 0.2, + "speed": 10000, + "delaySteps": 90 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 100 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 110 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 120 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 130 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 140 + }, { + "action": "projectile", + "type": "sb_deadboltlaser", + "fuzzAngle": 8, + "inheritDamageFactor": 0.133, + "speed": 9000, + "delaySteps": 150 + }, { + "action": "projectile", + "type": "rocket", + "fuzzAngle": 0, + "inheritDamageFactor": 0.2, + "speed": 10000, + "delaySteps": 160 } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.png b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.png index 78875516..46fb5c45 100644 Binary files a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.png and b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.png differ diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.projectile b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.projectile index 6f18fb99..42fd7bee 100644 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.projectile +++ b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynut.projectile @@ -1,32 +1,30 @@ { - "projectileName" : "sb_monkeynut", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 3.5, - "lightColor" : [150, 35, 15], - "piercing" : true, - "image" : "monkeynut.png", - "animationCycle" : 0.5, - "orientationLocked" : false, - "flippable" : true, - "frameNumber" : 4, - "power" : 0, - "damagePoly" : [ [-3, 3], [-3, -3], [3, -3], [3, 3] ], - "supportsProcessing" : true, - "onlyHitTerrain" : true, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_monkeynutteleportout", - "inheritDamageFactor" : 0.0, - "inheritSpeedFactor" : 1.0, - "angleAdjust" : 0 - }, - { - "action" : "sound", - "options" : [ "/sfx/tech/mech_powerdown2.ogg" ] + "projectileName": "sb_monkeynut", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 3.5, + "lightColor": [150, 35, 15], + "piercing": true, + "image": "monkeynut.png", + "animationCycle": 0.5, + "orientationLocked": false, + "flippable": true, + "frameNumber": 4, + "power": 0, + "damagePoly": [[-3, 3], [-3, -3], [3, -3], [3, 3]], + "supportsProcessing": true, + "onlyHitTerrain": true, + "actionOnReap": [{ + "action": "projectile", + "type": "sb_monkeynutteleportout", + "inheritDamageFactor": 0, + "inheritSpeedFactor": 1, + "angleAdjust": 0 + }, { + "action": "sound", + "options": ["/sfx/tech/mech_powerdown2.ogg"] } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.projectile b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.projectile index 18a1d413..4a8f34d8 100644 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.projectile +++ b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutlaser.projectile @@ -1,23 +1,22 @@ { - "projectileName" : "sb_monkeynutlaser", - "physics" : "laser", - "bounces" : 0, - "speed" : 25, - "image" : "monkeynutlaser.png", - "animationCycle" : 0.2, - "timeToLive" : 3.0, - "orientationLocked" : false, - "flippable" : true, - "animationLoops" : false, - "frameNumber" : 4, - "power" : 50, - "supportsProcessing" : true, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/plasmabulletexplosion/plasmabulletexplosion.config" + "projectileName": "sb_monkeynutlaser", + "physics": "laser", + "bounces": 0, + "speed": 25, + "image": "monkeynutlaser.png", + "animationCycle": 0.2, + "timeToLive": 3, + "orientationLocked": false, + "flippable": true, + "animationLoops": false, + "frameNumber": 4, + "power": 50, + "supportsProcessing": true, + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/plasmabulletexplosion/plasmabulletexplosion.config" } ], - "lightColor" : [255, 110, 20], - "damageKind" : "plasma" + "lightColor": [255, 110, 20], + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.png b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.png index 0ec54d8e..d3f667e3 100644 Binary files a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.png and b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.png differ diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.projectile b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.projectile index 5948a7bc..354b30a1 100644 --- a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.projectile +++ b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportin.projectile @@ -1,105 +1,94 @@ { - "projectileName" : "sb_monkeynutteleportin", - "physics" : "hover", - "bounces" : -1, - "speed" : 0, - "timeToLive" : 0.5, - "lightColor" : [150, 35, 15], - "piercing" : true, - "image" : "monkeynutteleportin.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, - "onlyHitTerrain" : true, - "actionOnReap" : [ - { - "action" : "projectile", - "type" : "sb_monkeynut", - "inheritDamageFactor" : 0.0, - "speed" : 0, - "angleAdjust" : 0 - }, - { - "action" : "sound", - "options" : [ "/sfx/tech/mech_jump1.ogg" ] - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 30 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 45 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 60 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 75 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 90 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 105 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 120 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 135 - }, - { - "action" : "projectile", - "type" : "sb_monkeynutlaser", - "fuzzAngle" : 2, - "inheritDamageFactor" : 0.222, - "speed" : 7000, - "delaySteps" : 150 + "projectileName": "sb_monkeynutteleportin", + "physics": "hover", + "bounces": -1, + "speed": 0, + "timeToLive": 0.5, + "lightColor": [150, 35, 15], + "piercing": true, + "image": "monkeynutteleportin.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, + "onlyHitTerrain": true, + "actionOnReap": [{ + "action": "projectile", + "type": "sb_monkeynut", + "inheritDamageFactor": 0, + "speed": 0, + "angleAdjust": 0 + }, { + "action": "sound", + "options": ["/sfx/tech/mech_jump1.ogg"] + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 30 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 45 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 60 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 75 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 90 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 105 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 120 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 135 + }, { + "action": "projectile", + "type": "sb_monkeynutlaser", + "fuzzAngle": 2, + "inheritDamageFactor": 0.222, + "speed": 7000, + "delaySteps": 150 } ], - "damageKind" : "plasma" + "damageKind": "plasma" } diff --git a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.png b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.png index 1b500e85..02fdadad 100644 Binary files a/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.png and b/projectiles/sb_staves/racialstaves/steel/monkeynut/monkeynutteleportout.png differ diff --git a/projectiles/sb_staves/uraniumorb.projectile b/projectiles/sb_staves/uraniumorb.projectile index 4486e172..d887c9a7 100644 --- a/projectiles/sb_staves/uraniumorb.projectile +++ b/projectiles/sb_staves/uraniumorb.projectile @@ -1,39 +1,37 @@ { - "projectileName" : "sb_uraniumorb", - "image" : "/projectiles/sb_minibiomelegendaries/wilderness/uraniumorb.png", - "physics" : "laser", - "animationCycle" : 0.3, - "frameNumber" : 4, - "power" : 30, - "speed" : 0, - "timeToLive" : 6, - "pointLight" : true, - "bounces" : -1, - "piercing" : true, - "damageKind" : "poison", + "projectileName": "sb_uraniumorb", + "image": "/projectiles/sb_minibiomelegendaries/wilderness/uraniumorb.png", + "physics": "laser", + "animationCycle": 0.3, + "frameNumber": 4, + "power": 30, + "speed": 0, + "timeToLive": 6, + "pointLight": true, + "bounces": -1, + "piercing": true, + "damageKind": "poison", - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/elementimpact/poisonimpact3.config" - }, - { - "action" : "sound", - "options" : ["/sfx/gun/lightningcoil1.ogg", "/sfx/gun/lightningcoil2.ogg", "/sfx/gun/lightningcoil3.ogg"] + "actionOnReap": [{ + "action": "config", + "file": "/projectiles/explosions/elementimpact/poisonimpact3.config" + }, { + "action": "sound", + "options": ["/sfx/gun/lightningcoil1.ogg", "/sfx/gun/lightningcoil2.ogg", "/sfx/gun/lightningcoil3.ogg"] } ], - - "lightColor" : [9, 186, 9], - "statusEffects" : ["weakpoison"], - "fullbright" : true, - "orientationLocked" : true, - "damagePoly" : [[-10, 0], [-7, -7], [0, -10], [7, -7], [10, 0], [7, 7], [0, 10], [-7, 7]], - "damageRepeatTimeout" : 0.25, - "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"], + "lightColor": [9, 186, 9], + "statusEffects": ["weakpoison"], + "fullbright": true, + "orientationLocked": true, + "damagePoly": [[-10, 0], [-7, -7], [0, -10], [7, -7], [10, 0], [7, 7], [0, 10], [-7, 7]], + "damageRepeatTimeout": 0.25, - "controlMovement" : { - "maxSpeed" : 60, - "controlForce" : 40 + "scripts": ["/projectiles/activeitems/staff/staffprojectile.lua"], + + "controlMovement": { + "maxSpeed": 60, + "controlForce": 40 } -} \ No newline at end of file +} diff --git a/projectiles/swoosh/sb_boneswoosh/boneswoosh.png b/projectiles/swoosh/sb_boneswoosh/boneswoosh.png index 5dd3f637..833cfe42 100644 Binary files a/projectiles/swoosh/sb_boneswoosh/boneswoosh.png and b/projectiles/swoosh/sb_boneswoosh/boneswoosh.png differ diff --git a/projectiles/swoosh/sb_coralshard/coralshard.png b/projectiles/swoosh/sb_coralshard/coralshard.png index 6ee5bdb8..8d7078f6 100644 Binary files a/projectiles/swoosh/sb_coralshard/coralshard.png and b/projectiles/swoosh/sb_coralshard/coralshard.png differ diff --git a/projectiles/swoosh/sb_coralshard/coralshardx.png b/projectiles/swoosh/sb_coralshard/coralshardx.png index aa7d94a3..009aef60 100644 Binary files a/projectiles/swoosh/sb_coralshard/coralshardx.png and b/projectiles/swoosh/sb_coralshard/coralshardx.png differ diff --git a/projectiles/swoosh/sb_hivebug/bug/hivebug.png b/projectiles/swoosh/sb_hivebug/bug/hivebug.png index 8fe16149..32a2939d 100644 Binary files a/projectiles/swoosh/sb_hivebug/bug/hivebug.png and b/projectiles/swoosh/sb_hivebug/bug/hivebug.png differ diff --git a/projectiles/swoosh/sb_hivebug/bug/hivebugx.png b/projectiles/swoosh/sb_hivebug/bug/hivebugx.png index 3ff3dc9f..37558ca6 100644 Binary files a/projectiles/swoosh/sb_hivebug/bug/hivebugx.png and b/projectiles/swoosh/sb_hivebug/bug/hivebugx.png differ diff --git a/projectiles/swoosh/sb_hivebug/gib/hivebuggib.png b/projectiles/swoosh/sb_hivebug/gib/hivebuggib.png index e32dbcaa..ff7d1518 100644 Binary files a/projectiles/swoosh/sb_hivebug/gib/hivebuggib.png and b/projectiles/swoosh/sb_hivebug/gib/hivebuggib.png differ diff --git a/projectiles/swoosh/sb_hivebug/xtermite.png b/projectiles/swoosh/sb_hivebug/xtermite.png index 5a94e3e2..399f99c3 100644 Binary files a/projectiles/swoosh/sb_hivebug/xtermite.png and b/projectiles/swoosh/sb_hivebug/xtermite.png differ diff --git a/projectiles/swoosh/sb_sporecloud/sporecloud.png b/projectiles/swoosh/sb_sporecloud/sporecloud.png index cdf9d245..d09c8738 100644 Binary files a/projectiles/swoosh/sb_sporecloud/sporecloud.png and b/projectiles/swoosh/sb_sporecloud/sporecloud.png differ diff --git a/projectiles/swoosh/sb_sporecloud/sporecloudx.png b/projectiles/swoosh/sb_sporecloud/sporecloudx.png index 3d3217f8..232401f3 100644 Binary files a/projectiles/swoosh/sb_sporecloud/sporecloudx.png and b/projectiles/swoosh/sb_sporecloud/sporecloudx.png differ diff --git a/projectiles/swoosh/sb_swordshot/swordshot.png b/projectiles/swoosh/sb_swordshot/swordshot.png index a7ce8dec..f3caa4ea 100644 Binary files a/projectiles/swoosh/sb_swordshot/swordshot.png and b/projectiles/swoosh/sb_swordshot/swordshot.png differ diff --git a/projectiles/swoosh/sb_twistedspear/twistedspearchain1.png b/projectiles/swoosh/sb_twistedspear/twistedspearchain1.png index 1190488f..5fec2ca6 100644 Binary files a/projectiles/swoosh/sb_twistedspear/twistedspearchain1.png and b/projectiles/swoosh/sb_twistedspear/twistedspearchain1.png differ diff --git a/projectiles/swoosh/sb_twistedspear/twistedspearchain2.png b/projectiles/swoosh/sb_twistedspear/twistedspearchain2.png index abe65887..c212c81f 100644 Binary files a/projectiles/swoosh/sb_twistedspear/twistedspearchain2.png and b/projectiles/swoosh/sb_twistedspear/twistedspearchain2.png differ diff --git a/projectiles/swoosh/sb_twistedspear/twistedspearchain3.png b/projectiles/swoosh/sb_twistedspear/twistedspearchain3.png index 3f92ff5a..0157f4de 100644 Binary files a/projectiles/swoosh/sb_twistedspear/twistedspearchain3.png and b/projectiles/swoosh/sb_twistedspear/twistedspearchain3.png differ diff --git a/projectiles/throwable/bowlingball/bowlingball.projectile.patch b/projectiles/throwable/bowlingball/bowlingball.projectile.patch new file mode 100644 index 00000000..d3b46b94 --- /dev/null +++ b/projectiles/throwable/bowlingball/bowlingball.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"hammer"}] +] \ No newline at end of file diff --git a/projectiles/throwable/sb_capturepod/capturepod.lua b/projectiles/throwable/sb_capturepod/capturepod.lua deleted file mode 100644 index 211cff57..00000000 --- a/projectiles/throwable/sb_capturepod/capturepod.lua +++ /dev/null @@ -1,99 +0,0 @@ -require "/scripts/util.lua" -require "/scripts/companions/capturable.lua" -require "/scripts/messageutil.lua" - -function update(dt) - promises:update() -end - -function hit(entityId) - if self.hit then return end - if world.isMonster(entityId) then - self.hit = true -self.id = entityId - - promises:add(world.sendEntityMessage(entityId, "betabound_pet.attemptCapture", 0.5), function (pet) - self.pet = pet - end) - end -end - -function shouldDestroy() - return projectile.timeToLive() <= 0 and promises:empty() -end - -function destroy() - if self.pet then - spawnFilledPod(self.pet) - else - spawnEmptyPod() - end -end - -function spawnEmptyPod() - world.spawnItem("sb_capturepod", mcontroller.position(), 1) -end - - -function spawnFilledPod(pet) -local pet = createFilledPod(pet) -pet2 = pet.parameters.pets[1] -local pod = {} -pod.parameters = {} -pod.parameters.statusSettings = {} -pod.parameters.statusSettings.stats = {} -pod.parameters.status = pet2.status -local statsA, statsB = pod.parameters.status.stats, pod.parameters.statusSettings.stats -for a,b in pairs(statsA) do ---if a ~= "health" and a~= "maxHealth" and not statsB[a] then statsB[a] = {baseValue=b} end -end -pod.parameters.statusSettings.stats = statsB -pod.parameters.aggressive = true -pod.parameters.damageTeamType = "friendly" -pod.parameters.wasRelocated = true -pod.config = {} -pod.config.seed = pet.parameters.pets[1].config.parameters.seed or 1 -pod.seed = pet.parameters.pets[1].config.parameters.seed or 1 -pod.parameters.seed = pet.parameters.pets[1].config.parameters.seed or 1 -pod.config.type = pet2.config.type or "punchy" -pod.parameters.persistent = true -pod.config.persistent = true -pod.config.uuid = pod.parameters.podUuid or sb.makeUuid() -pod.config.level = pet2.config.level or pet2.status.stats.sb_level or pet2.config.level or pet.parameters.pets[1].sb_level or 0 -pod.parameters.level = pet2.config.level or pet2.status.stats.sb_level or pet2.config.level or pet.parameters.pets[1].sb_level or 0 - -if pet.parameters.description == "Some indescribable horror" then pet.parameters.description = pet.parameters.description.."." end - - - -pod.parameters.level = pet2.level or pet2.status.stats.sb_level or pet2.config.level or pet.parameters.pets[1].sb_level or 0 - world.spawnItem("sb_filledcapturepod", mcontroller.position(), 1, { - description = pet.parameters.description, - tooltipFields = pet.parameters.tooltipFields, - projectileConfig = { - speed = 40, - level = 7, - actionOnReap = { - { - action = "spawnmonster", - offset = { 0, 0 }, - type = pod.config.type or "punchy", - arguments = pod.parameters, - seed = pet.parameters.pets[1].config.parameters.seed or 1, - level = (pod.parameters.level or pet2.config.level or 0) - }, - { - action = "item", - offset = { 0, 0 }, - name = "sb_capturepod" - }, - { - action = "projectile", - type = "sb_statusapplier", - config = {statusEffects = {"sb_capturedmonster"}} - } - } - } - }) - -end \ No newline at end of file diff --git a/projectiles/throwable/sb_capturepod/capturepod.png b/projectiles/throwable/sb_capturepod/capturepod.png deleted file mode 100644 index 013522cd..00000000 Binary files a/projectiles/throwable/sb_capturepod/capturepod.png and /dev/null differ diff --git a/projectiles/throwable/sb_capturepod/capturepod.projectile b/projectiles/throwable/sb_capturepod/capturepod.projectile deleted file mode 100644 index e3b5260c..00000000 --- a/projectiles/throwable/sb_capturepod/capturepod.projectile +++ /dev/null @@ -1,18 +0,0 @@ -{ - "projectileName" : "sb_capturepod", - "image" : "capturepod.png", - "animationCycle" : 0.5, //0.05, - "level" : 3, - "physics" : "grenadezbomb", - "frameNumber" : 4, - "pointLight" : false, - "speed" : 70, - "power" : -1, - "damageKind" : "capture", - "scripts" : ["capturepod.lua"], - "intangibleWindup" : true, - "piercing" : true, - "damageTeam" : {"type" : "indiscriminate"}, - "universalDamage" : true, - "emitters" : ["capturepodblue"] -} \ No newline at end of file diff --git a/projectiles/throwable/sb_capturepod/crittercapturepod.lua b/projectiles/throwable/sb_capturepod/crittercapturepod.lua deleted file mode 100644 index 2f8d89c7..00000000 --- a/projectiles/throwable/sb_capturepod/crittercapturepod.lua +++ /dev/null @@ -1,68 +0,0 @@ -require "/scripts/util.lua" -require "/scripts/companions/capturable.lua" -require "/scripts/messageutil.lua" - -function update(dt) - promises:update() -end - -function hit(entityId) - if self.hit then return end - if world.isMonster(entityId) then - self.hit = true - - -- If a monster doesn't implement pet.attemptCapture or its response is nil - -- then it isn't caught. - promises:add(world.sendEntityMessage(entityId, "betabound_pet.attemptCritterCapture", 9876543210), function (pet) - self.pet = pet - end) - end -end - -function shouldDestroy() - return projectile.timeToLive() <= 0 and promises:empty() -end - -function destroy() - if self.pet then - spawnFilledPod(self.pet) - else - spawnEmptyPod() - end -end - -function spawnEmptyPod() - world.spawnItem("sb_crittercapturepod", mcontroller.position(), 1) -end - -function spawnFilledPod(pet) - local pod = createFilledPod(pet) ---pod.name ---pod.parameters -if pod.parameters.description == "Some indescribable horror" then pod.parameters.description = "Throw it down to release the critter captured inside!" end -pod.parameters.pets[1].damageTeamType = "friendly" -pod.parameters.pets[1].persistent = true -pod.parameters.pets[1].wasRelocated = true - world.spawnItem("sb_filledcrittercapturepod", mcontroller.position(), pod.count, { - description = pod.parameters.description, - tooltipFields = pod.parameters.tooltipFields, - projectileConfig = { - speed = 40, - level = 7, - actionOnReap = { - { - action = "spawnmonster", - offset = { 0, 0 }, - type = pod.parameters.pets[1].config.type, - arguments = pod.parameters.pets[1], - level = pod.parameters.pets[1].level or 2 - }, - { - action = "item", - offset = { 0, 0 }, - name = "sb_crittercapturepod" - } - } - } - }) -end diff --git a/projectiles/throwable/sb_capturepod/crittercapturepod.png b/projectiles/throwable/sb_capturepod/crittercapturepod.png deleted file mode 100644 index bdd83c41..00000000 Binary files a/projectiles/throwable/sb_capturepod/crittercapturepod.png and /dev/null differ diff --git a/projectiles/throwable/sb_capturepod/crittercapturepod.projectile b/projectiles/throwable/sb_capturepod/crittercapturepod.projectile deleted file mode 100644 index f4a8e7bb..00000000 --- a/projectiles/throwable/sb_capturepod/crittercapturepod.projectile +++ /dev/null @@ -1,21 +0,0 @@ -{ - "projectileName" : "sb_crittercapturepod", - "image" : "crittercapturepod.png", - "animationCycle" : 0.25, - "physics" : "grenade", - "frameNumber" : 4, - "pointLight" : false, - "speed" : 30, - "power" : 0.0, - "damageKind" : "capture", - "intangibleWindup" : true, - "piercing" : true, - "windupTime" : 0.05, - "emitters" : ["capturepodblue"], - "damageTeam" : {"type" : "indiscriminate"}, -//"statusEffects" : [{"effect": "sb_crittercapturepod", "duration" : 15}], - "scripts" : ["crittercapturepod.lua"], - "capturableTypes" : [ - "critter" - ] -} \ No newline at end of file diff --git a/projectiles/throwable/sb_capturepod/default.frames b/projectiles/throwable/sb_capturepod/default.frames deleted file mode 100644 index 765e0ab5..00000000 --- a/projectiles/throwable/sb_capturepod/default.frames +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [4, 1], - "names" : [ - ["0", "1", "2", "3"] - ] - } -} \ No newline at end of file diff --git a/projectiles/throwable/sb_capturepod/filledcapturepod.png b/projectiles/throwable/sb_capturepod/filledcapturepod.png deleted file mode 100644 index a92a2dcf..00000000 Binary files a/projectiles/throwable/sb_capturepod/filledcapturepod.png and /dev/null differ diff --git a/projectiles/throwable/sb_capturepod/filledcapturepod.projectile b/projectiles/throwable/sb_capturepod/filledcapturepod.projectile index 55b20bd1..46521ee6 100644 --- a/projectiles/throwable/sb_capturepod/filledcapturepod.projectile +++ b/projectiles/throwable/sb_capturepod/filledcapturepod.projectile @@ -1,19 +1,17 @@ { "projectileName" : "sb_filledcapturepod", - "image" : "filledcapturepod.png", - "animationCycle" : 0.05, - "level" : 3, + "image" : "/projectiles/throwable/filledcapturepod/filledcapturepod.png", + "animationCycle" : 0.25, "physics" : "grenadezbomb", - "frameNumber" : 4, + "frameNumber" : 1, "pointLight" : false, "speed" : 70, "power" : 0.1, "damageKind" : "default", - "emitters" : ["daggerblue"], + "emitters" : ["capturepodred"], "pureArcDuration" : 1, "returnCollisionDuration" : 2, "orientationLocked" : true, -//"scripts" : ["filledcapturepodprojectile.lua"], "controlForce" : 80, "pickupDistance" : 1, "snapDistance" : 4, diff --git a/projectiles/throwable/sb_capturepod/filledcapturepodprojectile.lua b/projectiles/throwable/sb_capturepod/filledcapturepodprojectile.lua deleted file mode 100644 index 3dd135ad..00000000 --- a/projectiles/throwable/sb_capturepod/filledcapturepodprojectile.lua +++ /dev/null @@ -1,96 +0,0 @@ -require "/scripts/vec2.lua" -require "/scripts/util.lua" - -function init() - returns = config.getParameter("returns", true) - releaseOnHit = config.getParameter("releaseOnHit", true) - controlForce = config.getParameter("controlForce") - pickupDistance = config.getParameter("pickupDistance") - snapDistance = config.getParameter("snapDistance") - speed = config.getParameter("speed") - returnCollisionDuration = config.getParameter("returnCollisionDuration") - pureArcDuration = config.getParameter("pureArcDuration") - returnCollisionPoly = config.getParameter("returnCollisionPoly") - podUuid = config.getParameter("podUuid") - ownerId = projectile.sourceEntity() - - returnElapsed = 0 - returning = false -end - -function update(dt) - if not mcontroller.isColliding() then - preCollisionVelocity = mcontroller.velocity() - end - - if ownerId and world.entityExists(ownerId) then - - if not returning then - mcontroller.setRotation(0) - if mcontroller.isColliding() or vec2.mag(mcontroller.velocity()) < 0.1 then - releaseMonsters() - end - else - returnElapsed = returnElapsed + dt - - local toTarget = world.distance(world.entityPosition(ownerId), mcontroller.position()) - local targetDistance = vec2.mag(toTarget) - if targetDistance < pickupDistance then - projectile.die() - elseif returnElapsed > returnCollisionDuration or targetDistance < snapDistance then - mcontroller.applyParameters({collisionEnabled = false}) - mcontroller.approachVelocity(vec2.mul(vec2.norm(toTarget), speed), 500) - elseif returnElapsed > pureArcDuration then - mcontroller.approachVelocity(vec2.mul(vec2.norm(toTarget), speed), controlForce) - end - end - else - projectile.die() - end -end - -function hit(entityId) - if releaseOnHit and not returning then - releaseMonsters() - end -end - -function releaseMonsters() ---[[ if podUuid then - -- Player filledcapturepod - world.sendEntityMessage(ownerId, "pets.spawnFromPod", podUuid, mcontroller.position()) - world.spawnItem("sb_capturepod", mcontroller.position(), 1) - - if returns then - returning = true - mcontroller.applyParameters({ - collisionPoly = returnCollisionPoly - }) - mcontroller.setVelocity(vec2.mul(preCollisionVelocity or mcontroller.velocity(), -1)) - else - projectile.die() - end - else]]-- - -- NPC npcpetcapturepod - local monsterType = config.getParameter("monsterType","punchy") - local damageTeam = entity.damageTeam() - local entityId = world.spawnMonster(monsterType, mcontroller.position(), { - level = config.getParameter("monsterLevel", 1), - sb_killCount = config.getParameter("sb_killCount", 1), - damageTeam = damageTeam.team, - damageTeamType = damageTeam.type, - aggressive = true - }) - local position = world.callScriptedEntity(entityId, "findGroundPosition", world.entityPosition(entityId), -10, 10, false) - if position then - world.callScriptedEntity(entityId, "mcontroller.setPosition", position) - end - - projectile.die() - - end -end - -function monstersReleased() - return returning -end diff --git a/projectiles/throwable/sb_capturepod/filledcrittercapturepod.png b/projectiles/throwable/sb_capturepod/filledcrittercapturepod.png deleted file mode 100644 index 1dabf629..00000000 Binary files a/projectiles/throwable/sb_capturepod/filledcrittercapturepod.png and /dev/null differ diff --git a/projectiles/throwable/sb_capturepod/filledcrittercapturepod.projectile b/projectiles/throwable/sb_capturepod/filledcrittercapturepod.projectile index daffaa7c..19ed5756 100644 --- a/projectiles/throwable/sb_capturepod/filledcrittercapturepod.projectile +++ b/projectiles/throwable/sb_capturepod/filledcrittercapturepod.projectile @@ -1,9 +1,9 @@ { "projectileName" : "sb_filledcrittercapturepod", - "image" : "filledcrittercapturepod.png", + "image" : "/projectiles/throwable/filledcapturepod/filledcapturepod.png", "animationCycle" : 0.25, "physics" : "grenade", - "frameNumber" : 4, + "frameNumber" : 1, "pointLight" : false, "speed" : 40, "power" : 0.1, @@ -12,7 +12,6 @@ "pureArcDuration" : 1, "returnCollisionDuration" : 2, "orientationLocked" : true, -//"scripts" : ["filledcapturepodprojectile.lua"], "controlForce" : 80, "pickupDistance" : 1, "snapDistance" : 4, diff --git a/projectiles/throwable/sb_corrosivegrenade/corrosivegrenade.png b/projectiles/throwable/sb_corrosivegrenade/corrosivegrenade.png index d9f764c3..07177df6 100644 Binary files a/projectiles/throwable/sb_corrosivegrenade/corrosivegrenade.png and b/projectiles/throwable/sb_corrosivegrenade/corrosivegrenade.png differ diff --git a/projectiles/throwable/sb_corrosiveparticle/corrosiveparticle.png b/projectiles/throwable/sb_corrosiveparticle/corrosiveparticle.png index 5b731711..3d33a684 100644 Binary files a/projectiles/throwable/sb_corrosiveparticle/corrosiveparticle.png and b/projectiles/throwable/sb_corrosiveparticle/corrosiveparticle.png differ diff --git a/projectiles/throwable/sb_effectbomb/healbomb.png b/projectiles/throwable/sb_effectbomb/healbomb.png index 44e68f63..5ff36f18 100644 Binary files a/projectiles/throwable/sb_effectbomb/healbomb.png and b/projectiles/throwable/sb_effectbomb/healbomb.png differ diff --git a/projectiles/throwable/sb_effectbomb/jumpbomb.png b/projectiles/throwable/sb_effectbomb/jumpbomb.png index 3f81dc1b..14517e32 100644 Binary files a/projectiles/throwable/sb_effectbomb/jumpbomb.png and b/projectiles/throwable/sb_effectbomb/jumpbomb.png differ diff --git a/projectiles/throwable/sb_effectbomb/ragebomb.png b/projectiles/throwable/sb_effectbomb/ragebomb.png index 3fa9dde3..5700305b 100644 Binary files a/projectiles/throwable/sb_effectbomb/ragebomb.png and b/projectiles/throwable/sb_effectbomb/ragebomb.png differ diff --git a/projectiles/throwable/sb_effectbomb/runbomb.png b/projectiles/throwable/sb_effectbomb/runbomb.png index 16c127d3..3248f5fb 100644 Binary files a/projectiles/throwable/sb_effectbomb/runbomb.png and b/projectiles/throwable/sb_effectbomb/runbomb.png differ diff --git a/projectiles/throwable/sb_effectgas/healinggas.png b/projectiles/throwable/sb_effectgas/healinggas.png index 078a1caf..c565e50a 100644 Binary files a/projectiles/throwable/sb_effectgas/healinggas.png and b/projectiles/throwable/sb_effectgas/healinggas.png differ diff --git a/projectiles/throwable/sb_effectgas/protectiongas.png b/projectiles/throwable/sb_effectgas/protectiongas.png index 8aa99e9e..9408425a 100644 Binary files a/projectiles/throwable/sb_effectgas/protectiongas.png and b/projectiles/throwable/sb_effectgas/protectiongas.png differ diff --git a/projectiles/throwable/sb_electrogrenade/electrogrenade.png b/projectiles/throwable/sb_electrogrenade/electrogrenade.png index f3440bff..f2ff7708 100644 Binary files a/projectiles/throwable/sb_electrogrenade/electrogrenade.png and b/projectiles/throwable/sb_electrogrenade/electrogrenade.png differ diff --git a/projectiles/throwable/sb_fallingblock/fallingblock.png b/projectiles/throwable/sb_fallingblock/fallingblock.png index b974603f..34d47c96 100644 Binary files a/projectiles/throwable/sb_fallingblock/fallingblock.png and b/projectiles/throwable/sb_fallingblock/fallingblock.png differ diff --git a/projectiles/throwable/sb_fallingblock/fallingblock2.png b/projectiles/throwable/sb_fallingblock/fallingblock2.png index fd95c070..7794c506 100644 Binary files a/projectiles/throwable/sb_fallingblock/fallingblock2.png and b/projectiles/throwable/sb_fallingblock/fallingblock2.png differ diff --git a/projectiles/throwable/sb_fallingblock/fallingblock3.png b/projectiles/throwable/sb_fallingblock/fallingblock3.png index e6fee0c2..96670beb 100644 Binary files a/projectiles/throwable/sb_fallingblock/fallingblock3.png and b/projectiles/throwable/sb_fallingblock/fallingblock3.png differ diff --git a/projectiles/throwable/sb_gasgrenade/gasgrenade.png b/projectiles/throwable/sb_gasgrenade/gasgrenade.png index 87550fef..c0a577c1 100644 Binary files a/projectiles/throwable/sb_gasgrenade/gasgrenade.png and b/projectiles/throwable/sb_gasgrenade/gasgrenade.png differ diff --git a/projectiles/throwable/sb_handgrenade/handgrenade.png b/projectiles/throwable/sb_handgrenade/handgrenade.png index e6d08089..6a00cd16 100644 Binary files a/projectiles/throwable/sb_handgrenade/handgrenade.png and b/projectiles/throwable/sb_handgrenade/handgrenade.png differ diff --git a/projectiles/throwable/sb_phoenix/phoenix.png b/projectiles/throwable/sb_phoenix/phoenix.png index cdfe51cb..1ae62e42 100644 Binary files a/projectiles/throwable/sb_phoenix/phoenix.png and b/projectiles/throwable/sb_phoenix/phoenix.png differ diff --git a/projectiles/throwable/sb_plasmagrenade/plasmagrenade.png b/projectiles/throwable/sb_plasmagrenade/plasmagrenade.png index 5d052c11..fb06dd70 100644 Binary files a/projectiles/throwable/sb_plasmagrenade/plasmagrenade.png and b/projectiles/throwable/sb_plasmagrenade/plasmagrenade.png differ diff --git a/projectiles/throwable/sb_smokegrenade/smokegrenade.png b/projectiles/throwable/sb_smokegrenade/smokegrenade.png index da203052..ffed5ccf 100644 Binary files a/projectiles/throwable/sb_smokegrenade/smokegrenade.png and b/projectiles/throwable/sb_smokegrenade/smokegrenade.png differ diff --git a/projectiles/throwable/sb_throwingneedle/throwingneedle.frames b/projectiles/throwable/sb_throwingneedle/throwingneedle.frames deleted file mode 100644 index abe56092..00000000 --- a/projectiles/throwable/sb_throwingneedle/throwingneedle.frames +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameGrid" : { - "size" : [16, 16], - "dimensions" : [1, 1], - - "names" : [ - [ "0" ] - ] - } -} diff --git a/projectiles/throwable/sb_throwingneedle/throwingneedle.png b/projectiles/throwable/sb_throwingneedle/throwingneedle.png deleted file mode 100644 index 15d92487..00000000 Binary files a/projectiles/throwable/sb_throwingneedle/throwingneedle.png and /dev/null differ diff --git a/projectiles/throwable/sb_throwingneedle/throwingneedle.projectile b/projectiles/throwable/sb_throwingneedle/throwingneedle.projectile deleted file mode 100644 index 900d5387..00000000 --- a/projectiles/throwable/sb_throwingneedle/throwingneedle.projectile +++ /dev/null @@ -1,19 +0,0 @@ -{ - "projectileName" : "sb_throwingneedle", - "frames" : "throwingneedle.png", - "image" : "throwingneedle.png", - "animationCycle" : 0.25, - "physics" : "bullet", - "frameNumber" : 1, - "pointLight" : false, - "speed" : 300, - "actionOnReap" : [ - { - "action" : "config", - "file" : "/projectiles/explosions/bulletexplosion/bulletexplosion.config" - } - ], - "power" : 7, - "damageKind" : "default", - "emitters" : [ "daggerblue" ] -} \ No newline at end of file diff --git a/projectiles/throwable/sb_toxicbarrel/default.frames b/projectiles/throwable/sb_toxicbarrel/default.frames new file mode 100644 index 00000000..7f7e08a5 --- /dev/null +++ b/projectiles/throwable/sb_toxicbarrel/default.frames @@ -0,0 +1,10 @@ +{ + "frameGrid" : { + "size" : [16, 16], + "dimensions" : [4, 1], + + "names" : [ + [ "0", "1", "2", "3" ] + ] + } +} diff --git a/projectiles/throwable/sb_toxicbarrel/toxicbarrel.png b/projectiles/throwable/sb_toxicbarrel/toxicbarrel.png new file mode 100644 index 00000000..cb6f6e0d Binary files /dev/null and b/projectiles/throwable/sb_toxicbarrel/toxicbarrel.png differ diff --git a/projectiles/throwable/sb_toxicbarrel/toxicbarrel.projectile b/projectiles/throwable/sb_toxicbarrel/toxicbarrel.projectile new file mode 100644 index 00000000..49100edf --- /dev/null +++ b/projectiles/throwable/sb_toxicbarrel/toxicbarrel.projectile @@ -0,0 +1,18 @@ +{ + "projectileName": "sb_toxicbarrel", + "image": "toxicbarrel.png", + "animationCycle": 0.25, + "physics": "grenade", + "frameNumber": 4, + "pointLight": false, + "speed": 15, + "actionOnReap": [{ + "action": "projectile", + "type": "poisonbarrel", + "fuzzAngle": 0, + "inheritDamageFactor": 1 + } + ], + "power": 20, + "damageKind": "default" +} diff --git a/projectiles/throwable/snowball/icecrabcanosnowball.projectile.patch b/projectiles/throwable/snowball/icecrabcanosnowball.projectile.patch new file mode 100644 index 00000000..f903880e --- /dev/null +++ b/projectiles/throwable/snowball/icecrabcanosnowball.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/projectiles/throwable/snowball/snowball.projectile.patch b/projectiles/throwable/snowball/snowball.projectile.patch new file mode 100644 index 00000000..f903880e --- /dev/null +++ b/projectiles/throwable/snowball/snowball.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/projectiles/throwable/snowballgigantic/giganticsnowball.projectile.patch b/projectiles/throwable/snowballgigantic/giganticsnowball.projectile.patch new file mode 100644 index 00000000..f903880e --- /dev/null +++ b/projectiles/throwable/snowballgigantic/giganticsnowball.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/projectiles/throwable/snowballlarge/largesnowball.projectile.patch b/projectiles/throwable/snowballlarge/largesnowball.projectile.patch new file mode 100644 index 00000000..f903880e --- /dev/null +++ b/projectiles/throwable/snowballlarge/largesnowball.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/projectiles/throwable/snowballmedium/mediumsnowball.projectile.patch b/projectiles/throwable/snowballmedium/mediumsnowball.projectile.patch new file mode 100644 index 00000000..f903880e --- /dev/null +++ b/projectiles/throwable/snowballmedium/mediumsnowball.projectile.patch @@ -0,0 +1,3 @@ +[ +[{"op":"test","path":"/damageKind","value":"snowball"},{"op":"replace","path":"/damageKind","value":"sb_snowball"}] +] \ No newline at end of file diff --git a/quests/generated/locations.config.patch b/quests/generated/locations.config.patch index a255e9e1..57fce053 100644 --- a/quests/generated/locations.config.patch +++ b/quests/generated/locations.config.patch @@ -1,15 +1,44 @@ [ -[{"op":"add","path":"/sb","value":{}}], -[{"op":"add", -"path":"/sb/glitchtransport", -"value":{"name":"cultist caravan", -"tags":["generic","friendly","largespace"]}}], -[{"op":"add", -"path":"/sb/farm", -"value":{"name":"abandoned farm", -"tags":["generic","friendly","largespace"]}}], -[{"op":"add", -"path":"/sb/miningcamp", -"value":{"name":"abandoned mining camp", -"tags":["generic","friendly","largespace"]}}] -] \ No newline at end of file + [{ + "op": "add", + "path": "/sb", + "value": {} + } + ], + [{ + "op": "add", + "path": "/sb/glitchtransport", + "value": { + "name": "cultist caravan", + "tags": ["generic", "friendly", "largespace"] + } + } + ], + [{ + "op": "add", + "path": "/sb/farm", + "value": { + "name": "abandoned farm", + "tags": ["generic", "friendly", "largespace"] + } + } + ], + [{ + "op": "add", + "path": "/sb/glitchhouse", + "value": { + "name": "executioner slaughterhouse", + "tags": ["generic", "friendly", "largespace"] + } + } + ], + [{ + "op": "add", + "path": "/sb/miningcamp", + "value": { + "name": "abandoned mining camp", + "tags": ["generic", "friendly", "largespace"] + } + } + ] +] diff --git a/quests/generated/pools/cookedfood.config.patch b/quests/generated/pools/cookedfood.config.patch index 6e2f3389..5d1a740a 100644 --- a/quests/generated/pools/cookedfood.config.patch +++ b/quests/generated/pools/cookedfood.config.patch @@ -1,6 +1,89 @@ [ -{"op":"add","path":"/0/1/-","value":"sb_crystaljam"}, -{"op":"add","path":"/0/1/-","value":"sb_crystaltart"}, -{"op":"add","path":"/0/1/-","value":"sb_crystalpie"}, -{"op":"add","path":"/0/1/-","value":"sb_thornjam"} +//meat +{"op":"add","path":"/0/1/-","value":"sb_cookedfleshlump"} +,{"op":"add","path":"/0/1/-","value":"sb_meatchunks"} +,{"op":"add","path":"/0/1/-","value":"sb_offal"} + +//shop +,{"op":"add","path":"/0/1/-","value":"sb_candy"} + +//condiments +,{"op":"add","path":"/0/1/-","value":"sb_crystaljam"} +,{"op":"add","path":"/0/1/-","value":"sb_orangejam"} +,{"op":"add","path":"/0/1/-","value":"sb_thornjam"} + +//deserts +,{"op":"add","path":"/0/1/-","value":"sb_applepie"} +,{"op":"add","path":"/0/1/-","value":"sb_bananabread"} +,{"op":"add","path":"/0/1/-","value":"sb_blackcurrentcrumble"} +,{"op":"add","path":"/0/1/-","value":"sb_brineapple"} +,{"op":"add","path":"/0/1/-","value":"sb_burningeyeballs"} +,{"op":"add","path":"/0/1/-","value":"sb_butter"} +,{"op":"add","path":"/0/1/-","value":"sb_cake"} +,{"op":"add","path":"/0/1/-","value":"sb_candiedpearlpeas"} +,{"op":"add","path":"/0/1/-","value":"sb_carrotcake"} +,{"op":"add","path":"/0/1/-","value":"sb_chocolate"} +,{"op":"add","path":"/0/1/-","value":"sb_chocolatecoffeebeans"} +,{"op":"add","path":"/0/1/-","value":"sb_copperkeypie"} +,{"op":"add","path":"/0/1/-","value":"sb_crowncake"} +,{"op":"add","path":"/0/1/-","value":"sb_crystalcandy"} +,{"op":"add","path":"/0/1/-","value":"sb_crystalpie"} +,{"op":"add","path":"/0/1/-","value":"sb_crystaltart"} +,{"op":"add","path":"/0/1/-","value":"sb_icecream"} +//no jelly +,{"op":"add","path":"/0/1/-","value":"sb_lollypop"} +,{"op":"add","path":"/0/1/-","value":"sb_orangepie"} +,{"op":"add","path":"/0/1/-","value":"sb_orangetart"} +,{"op":"add","path":"/0/1/-","value":"sb_peanutbutterjar"} +,{"op":"add","path":"/0/1/-","value":"sb_pussplumpie"} +,{"op":"add","path":"/0/1/-","value":"sb_sweettime"} +,{"op":"add","path":"/0/1/-","value":"sb_toffee"} +,{"op":"add","path":"/0/1/-","value":"sb_toffeeapple"} + +//drinks +,{"op":"add","path":"/0/1/-","value":"sb_batteryacid"} +,{"op":"add","path":"/0/1/-","value":"sb_boltedmilk"} +,{"op":"add","path":"/0/1/-","value":"sb_cordialbottle"} +,{"op":"add","path":"/0/1/-","value":"sb_cordialglass"} +,{"op":"add","path":"/0/1/-","value":"sb_dirtea"} +,{"op":"add","path":"/0/1/-","value":"sb_liquifiedcrystal"} +,{"op":"add","path":"/0/1/-","value":"sb_meatjuice"} +,{"op":"add","path":"/0/1/-","value":"sb_meatwine"} +,{"op":"add","path":"/0/1/-","value":"sb_oculemonade"} +,{"op":"add","path":"/0/1/-","value":"sb_orangejuice"} +,{"op":"add","path":"/0/1/-","value":"sb_orangenergyglass"} +,{"op":"add","path":"/0/1/-","value":"sb_ricevinegar"} +,{"op":"add","path":"/0/1/-","value":"sb_ricewine"} +,{"op":"add","path":"/0/1/-","value":"sb_rootpopflask"} +,{"op":"add","path":"/0/1/-","value":"sb_rootpopbottle"} +,{"op":"add","path":"/0/1/-","value":"sb_wartjuice"} +,{"op":"add","path":"/0/1/-","value":"sb_weyene"} +,{"op":"add","path":"/0/1/-","value":"sb_whiskeyflask"} +,{"op":"add","path":"/0/1/-","value":"sb_whiskeybottle"} +,{"op":"add","path":"/0/1/-","value":"sb_winebottle"} +,{"op":"add","path":"/0/1/-","value":"sb_wineglass"} + +//entrees +,{"op":"add","path":"/0/1/-","value":"sb_alienburger"} +,{"op":"add","path":"/0/1/-","value":"sb_automatostew"} +,{"op":"add","path":"/0/1/-","value":"sb_burrito"} +,{"op":"add","path":"/0/1/-","value":"sb_chilistew"} +,{"op":"add","path":"/0/1/-","value":"sb_crystalnachos"} +,{"op":"add","path":"/0/1/-","value":"sb_curriedbeakseed"} +,{"op":"add","path":"/0/1/-","value":"sb_hamsandwich"} +,{"op":"add","path":"/0/1/-","value":"sb_meatandmarrow"} +,{"op":"add","path":"/0/1/-","value":"sb_meatwich"} +,{"op":"add","path":"/0/1/-","value":"sb_poachedavesmingo"} +,{"op":"add","path":"/0/1/-","value":"sb_roastpoultry"} +,{"op":"add","path":"/0/1/-","value":"sb_thespecial"} +,{"op":"add","path":"/0/1/-","value":"sb_vegetablesoup"} + +//sides +,{"op":"add","path":"/0/1/-","value":"sb_boneboomarrow"} +,{"op":"add","path":"/0/1/-","value":"sb_cornontheblob"} +,{"op":"add","path":"/0/1/-","value":"sb_corntent"} +,{"op":"add","path":"/0/1/-","value":"sb_crystalchips"} +,{"op":"add","path":"/0/1/-","value":"sb_eggfriedrice"} +,{"op":"add","path":"/0/1/-","value":"sb_roastbanana"} +,{"op":"add","path":"/0/1/-","value":"sb_roastcacti"} ] \ No newline at end of file diff --git a/quests/phase2optional/sb_glitchsilenttype2.questtemplate b/quests/phase2optional/sb_glitchsilenttype2.questtemplate index 61ed1774..5a54670b 100644 --- a/quests/phase2optional/sb_glitchsilenttype2.questtemplate +++ b/quests/phase2optional/sb_glitchsilenttype2.questtemplate @@ -1,27 +1,28 @@ { - "id" : "sb_glitchsilenttype2.gearup", - "prerequisites" : [ "floran_mission1", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup" ], - "title" : "^green;....", - "text" : "....", - "completionText" : "....", - "speaker" : "questGiver", - "moneyRange" : [0, 0], -// "rewards" : [[["helpme",1]]], - "showFailDialog" : false, - "showCompleteDialog" : false, + "id": "sb_glitchsilenttype2.gearup", + "prerequisites": ["floran_mission1", "sb_floranfan1.gearup", "sb_hylotlperformer1.gearup"], + "title": "^green;....", + "text": "....", + "completionText": "....", + "speaker": "questGiver", + "moneyRange": [0, 0], + "showFailDialog": false, + "showCompleteDialog": false, - "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"}, - "acceptItems" : ["helpme"], - "requireTurnIn" : false, -// "turnInDescription" : "Speak to ^orange;the human survivor^reset; at the ^orange;outpost^reset;", - "conditions" : [] + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "acceptItems": ["helpme"], + "requireTurnIn": false, + "conditions": [] } -} \ No newline at end of file +} diff --git a/quests/phase3optional/sb_glitchsilenttype3.questtemplate b/quests/phase3optional/sb_glitchsilenttype3.questtemplate index 4238ba32..76d8c19a 100644 --- a/quests/phase3optional/sb_glitchsilenttype3.questtemplate +++ b/quests/phase3optional/sb_glitchsilenttype3.questtemplate @@ -2,7 +2,7 @@ "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 guy isn't talking. ^green;He has given me a drawing though, ^orange;perhaps this is something he wants.)", + "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], diff --git a/quests/sb_coffee0.questtemplate b/quests/sb_coffee0.questtemplate index 1c5d3567..24df2a72 100644 --- a/quests/sb_coffee0.questtemplate +++ b/quests/sb_coffee0.questtemplate @@ -18,7 +18,7 @@ "updateDelta" : 10, "script" : "/quests/scripts/main.lua", "scriptConfig" : { - "acceptItems" : ["sb_coffeemachine"], //she stole the coffee machine when beta ended. + "acceptItems" : ["coffeemachine"], //she stole the coffee machine when beta ended. "portraits" : {"default" : "questGiver"}, "requireTurnIn" : true, "turnInDescription" : "Speak to ^orange;the human survivor^reset; at the ^orange;outpost^reset;", diff --git a/quests/sb_coldskin3.questtemplate b/quests/sb_coldskin3.questtemplate index e0a341f4..b00c06f8 100644 --- a/quests/sb_coldskin3.questtemplate +++ b/quests/sb_coldskin3.questtemplate @@ -21,7 +21,7 @@ "scriptConfig" : {"portraits" : {"default" : "questGiver"}, "sb_genderedItem" : "sb_cinema_cold%s", "requireTurnIn": false, - "acceptItems" : [["sb_tech",1,{"techModule":"sb_coldprotection"}],"sb_techstation"], + "acceptItems" : [["sb_tech",1,{"techModule":"sb_coldprotection"}]], "turnInDescription": "Speak to the ^orange;mysterious trader^reset; at the ^orange;outpost^reset;", "conditions" : [] } diff --git a/quests/sb_heatskin2.questtemplate b/quests/sb_heatskin2.questtemplate index c863c4d4..2fadf755 100644 --- a/quests/sb_heatskin2.questtemplate +++ b/quests/sb_heatskin2.questtemplate @@ -22,7 +22,7 @@ "script": "/quests/scripts/sb_main.lua", "scriptConfig": {"portraits" : {"default" : "questGiver"}, "sb_genderedItem" : "sb_cinema_heat%s", - "acceptItems" : [["sb_tech",1,{"techModule":"sb_heatprotection"}],"sb_techstation_glitch"], + "acceptItems" : [["sb_tech",1,{"techModule":"sb_heatprotection"}]], "requireTurnIn": false, "turnInDescription": "Speak to the ^orange;mysterious trader^reset; at the ^orange;outpost^reset;", "conditions" : [] diff --git a/quests/sb_outpost0.questtemplate b/quests/sb_outpost0.questtemplate index 00d7ee4f..99cb2e6c 100644 --- a/quests/sb_outpost0.questtemplate +++ b/quests/sb_outpost0.questtemplate @@ -1,34 +1,36 @@ { - "id" : "sb_outpost0.gearup", - "prerequisites" : [],//"gaterepair" - "title" : "^orange;Gear Up", - "text" : "If you're serious about exploring the universe, you're going to need better equipment. Tell you what, ^#0f0;if you bring me a ^orange;wooden tool table,^reset; I'll upgrade it to an ^orange;iron tool table ^reset;and ^#0f0;show you how to make one yourself!^reset; Head to the teleporter shop and use their teleporter to help you go get it faster.", - "completionText" : "Great! Here's the iron tool table - And now you can make your own!",// If you're interested, I have another task you might be able to help with.", - "speaker" : "questGiver", - "moneyRange" : [0, 0], - "rewards" : [["sb_ironcraftingtable",["ironbar",5],"rewardbag"]], - "canBeAbandoned" : true, - "questGiverIndicator" : "sb_mainquestgiver", - "questReceiverIndicator" : "sb_mainquestreceiver", + "id": "sb_outpost0.gearup", + "prerequisites": [], //"gaterepair" + "title": "^orange;Gear Up", + "text": "If you're serious about exploring the universe, you're going to need better equipment. Tell you what, ^#0f0;if you bring me a ^orange;wooden tool table,^reset; I'll upgrade it to an ^orange;iron tool table ^reset;and ^#0f0;show you how to make one yourself!^reset; Head to the teleporter shop and use their teleporter to help you go get it faster.", + "completionText": "Great! Here's the iron tool table - And now you can make your own!", // If you're interested, I have another task you might be able to help with.", + "speaker": "questGiver", + "moneyRange": [0, 0], + "rewards": [["sb_ironcraftingtable", ["ironbar", 5], "rewardbag"]], + "canBeAbandoned": true, + "questGiverIndicator": "sb_mainquestgiver", + "questReceiverIndicator": "sb_mainquestreceiver", - "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 human scientist^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "sb_woodencraftingtable", - "count" : 1, - "consume" : true + "updateDelta": 10, + "script": "/quests/scripts/main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the human scientist^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherItem", + "itemName": "sb_woodencraftingtable", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/sb_outpost1.questtemplate b/quests/sb_outpost1.questtemplate index 86112a60..7f8ab1f4 100644 --- a/quests/sb_outpost1.questtemplate +++ b/quests/sb_outpost1.questtemplate @@ -1,33 +1,34 @@ { - "id" : "sb_outpost1.gearup", - "prerequisites" : [ ], - "title" : "^green;Rent Well Spent", - "text" : "My Landlord is a jerk! He's going to kick me out of my place if I don't get him a bar of ^orange;chocolate.^reset; ^#0f0;They sell them at Infinity Express,^reset; but I haven't got any pixels! Can you help me out?", - "completionText" : "Thank you so much! Maybe it is time I found a better place to live. You seem like a nice person - If you head to the ^#0f0;Frogg Furnishing^reset; store, ^orange;you can become a Landlord yourself!^reset; I will tell the others here of your kindness.", - "speaker" : "questGiver", - "moneyRange" : [300, 300], - "rewards" : [["colonydeed","colonymanual-codex","rewardbag"]], - "canBeAbandoned" : true, + "id": "sb_outpost1.gearup", + "prerequisites": [], + "title": "^green;Rent Well Spent", + "text": "My Landlord is a jerk! He's going to kick me out of my place if I don't get him a bar of ^orange;chocolate.^reset; ^#0f0;They sell them at Infinity Express,^reset; but I haven't got any pixels! Can you help me out?", + "completionText": "Thank you so much! Maybe it is time I found a better place to live. You seem like a nice person - If you head to the ^#0f0;Frogg Furnishing^reset; store, ^orange;you can become a Landlord yourself!^reset; I will tell the others here of your kindness.", + "speaker": "questGiver", + "moneyRange": [300, 300], + "rewards": [["colonydeed", "colonymanual-codex", "rewardbag"]], + "canBeAbandoned": true, - "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 human survivor^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "chocolate", - "count" : 1, - "consume" : true + "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 } ] } -} \ No newline at end of file +} diff --git a/quests/sb_outpost2.questtemplate b/quests/sb_outpost2.questtemplate index 862336e9..9bebc7aa 100644 --- a/quests/sb_outpost2.questtemplate +++ b/quests/sb_outpost2.questtemplate @@ -1,39 +1,39 @@ { - "id" : "sb_outpost2.gearup", - "prerequisites" : ["sb_outpost1.gearup"], - "title" : "^#0f0;A Healthy Trade", - "text" : "Nice to see a friendly face again! I found a better place to live but to tell you the truth, we're really hurting for food supplies at the moment. If you bring me ^#0f0;some steak and some wheat^reset;, I can give you an ^#0f0;Air Pocket Generator.^reset; They create breathable air in the empty space around you. ^orange;They won't work in liquids,^reset; but they're very useful for exploring airless environments.", - "completionText" : "Thanks, you're a lifesaver! Here's your reward, as promised.", - "speaker" : "questGiver", - "moneyRange" : [600, 600], - "rewards" : [["sb_airpocketback","rewardbag"]], - "canBeAbandoned" : true, + "id": "sb_outpost2.gearup", + "prerequisites": ["sb_outpost1.gearup"], + "title": "^#0f0;A Healthy Trade", + "text": "Nice to see a friendly face again! I found a better place to live but to tell you the truth, we're really hurting for food supplies at the moment. If you bring me ^#0f0;some steak and some wheat^reset;, I can give you an ^#0f0;Air Pocket Generator.^reset; They create breathable air in the empty space around you. ^orange;They won't work in liquids,^reset; but they're very useful for exploring airless environments.", + "completionText": "Thanks, you're a lifesaver! Here's your reward, as promised.", + "speaker": "questGiver", + "moneyRange": [600, 600], + "rewards": [["sb_airpocketback", "rewardbag"]], + "canBeAbandoned": true, - "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 human survivor^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherItem", - "itemName" : "alienmeat", - "count" : 1, - "consume" : true - }, - { - "type" : "gatherItem", - "itemName" : "wheat", - "count" : 1, - "consume" : true + "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": "alienmeat", + "count": 1, + "consume": true + }, { + "type": "gatherItem", + "itemName": "wheat", + "count": 1, + "consume": true } ] } -} \ No newline at end of file +} diff --git a/quests/sb_outpostskin.questtemplate b/quests/sb_outpostskin.questtemplate index e6d7c42f..fbe63e8e 100644 --- a/quests/sb_outpostskin.questtemplate +++ b/quests/sb_outpostskin.questtemplate @@ -1,36 +1,50 @@ { - "id" : "sb_outpostSkin.gearup", - "prerequisites" : ["sb_outpost0.gearup", "human_mission1"], - "title" : "^orange;Help! I need somebody!", - "text" : "I've received a distress signal from a nearby lunar mining facility. If you wish to investigate it, you should make yourself any set of ^orange;armour made from iron.^reset; Craft it by using an ^orange;anvil.^green; Come back when you're equipped,^reset; and I'll give you a ^green;nano-suit^reset; that allows you to breathe when no oxygen is present.", - "completionText" : "You're all equipped! In that case, get the ^green;coordinates^reset; from ^orange;Penguin Pete^reset; and take this ^green;respiratory nano-suit.^reset; Good luck-- Wait, ^orange;you've already done it?^reset; ...That's good to know.", - "speaker" : "questGiver", - "moneyRange" : [0, 0], - "rewards" : [[["sb_tech",1,{"techModule":"sb_breathprotection"}],"sb_techstation_human",["rewardbag",1,{"treasure":{"level":2}}]]], - "canBeAbandoned" : true, - "questGiverIndicator" : "sb_mainquestgiver", - "questReceiverIndicator" : "sb_mainquestreceiver", + "id": "sb_outpostSkin.gearup", + "prerequisites": ["sb_outpost0.gearup", "human_mission1"], + "title": "^orange;Help! I need somebody!", + "text": "I've received a distress signal from a nearby lunar mining facility. If you wish to investigate it, you should make yourself any set of ^orange;armour made from iron.^reset; Craft it by using an ^orange;anvil.^green; Come back when you're equipped,^reset; and I'll give you a ^green;nano-suit^reset; that allows you to breathe when no oxygen is present.", + "completionText": "You're all equipped! In that case, get the ^green;coordinates^reset; from ^orange;Penguin Pete^reset; and take this ^green;respiratory nano-suit.^reset; Good luck-- Wait, ^orange;you've already done it?^reset; ...That's good to know.", + "speaker": "questGiver", + "moneyRange": [0, 0], + "rewards": [[ + ["sb_tech",1,{"techModule":"sb_breathprotection"}], + ["rewardbag",1,{"treasure":{"level":2}}]] + ], + "canBeAbandoned": true, + "questGiverIndicator": "sb_mainquestgiver", + "questReceiverIndicator": "sb_mainquestreceiver", - "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/sb_main.lua", - "scriptConfig" : {"portraits" : {"default" : "questGiver"}, - "sb_genderedCompletionItem" : "sb_cinema_air%s", - "requireTurnIn" : true, - "turnInDescription" : "Speak to ^orange;the human scientist^reset; at the ^orange;outpost^reset;", - "conditions" : [ - { - "type" : "gatherTag", - "tag" : "tier1armour", - "count" : 3, - "description" : "Obtain a ^orange;full set^reset; of ^orange;armour made from copper or iron^reset;", - "consume" : false + "updateDelta": 10, + "script": "/quests/scripts/sb_main.lua", + "scriptConfig": { + "portraits": { + "default": "questGiver" + }, + "sb_genderedCompletionItem": "sb_cinema_air%s", + "sb_giveSpeciesItems": { + "default" : ["sb_techstation_human"], + "hylotl" : ["sb_techstation_hylotl"], + "novakid" : ["sb_techstation_novakid"], + "floran" : ["sb_techstation_floran"], + "glitch" : ["sb_techstation_glitch"], + "apex" : ["sb_techstation"], + "avian" : ["sb_techstation_avian"] + }, + "requireTurnIn": true, + "turnInDescription": "Speak to ^orange;the human scientist^reset; at the ^orange;outpost^reset;", + "conditions": [{ + "type": "gatherTag", + "tag": "tier1armour", + "count": 3, + "description": "Obtain a ^orange;full set^reset; of ^orange;armour made from iron^reset;", + "consume": false } ] } -} \ No newline at end of file +} diff --git a/quests/scripts/sb_main.lua b/quests/scripts/sb_main.lua index 42d5cc88..03746c2d 100644 --- a/quests/scripts/sb_main.lua +++ b/quests/scripts/sb_main.lua @@ -1,10 +1,10 @@ require "/scripts/util.lua" require "/quests/scripts/questutil.lua" -require("/quests/scripts/portraits.lua") -require('/quests/scripts/conditions/gather.lua') -require('/quests/scripts/conditions/ship.lua') -require('/quests/scripts/conditions/scanning.lua') -require('/quests/scripts/messages.lua') +require "/quests/scripts/portraits.lua" +require "/quests/scripts/conditions/gather.lua" +require "/quests/scripts/conditions/ship.lua" +require "/quests/scripts/conditions/scanning.lua" +require "/quests/scripts/messages.lua" function init() cinematic = config.getParameter("sb_completionCinema") @@ -97,6 +97,17 @@ function questComplete() if sb_genderedItem then player.giveItem(string.format(sb_genderedItem,player.gender()=="male" and "m" or "f")) end + + local giveSpeciesItems = config.getParameter("sb_giveSpeciesItems") + if giveSpeciesItems then + local items = giveSpeciesItems[player.species()] or giveSpeciesItems["default"] + if items then + for _,item in ipairs(items) do + player.giveItem(item) + end + end + end + setPortraits() for _, condition in pairs(self.conditions) do @@ -137,7 +148,7 @@ function update(dt) else quest.complete() if cinematic then - player.playCinematic(cinematic) + player.playCinematic(cinematic) end end else diff --git a/quests/scripts/story/sb_destroyruin.lua b/quests/scripts/story/sb_destroyruin.lua index 0d8d88c1..627df60e 100644 --- a/quests/scripts/story/sb_destroyruin.lua +++ b/quests/scripts/story/sb_destroyruin.lua @@ -31,9 +31,9 @@ function update(dt) script.setUpdateDelta(0) end if self.waitTime < 0 then - self.state:update(dt) + self.state:update(dt) else - self.waitTime = self.waitTime - dt + self.waitTime = self.waitTime - dt end end @@ -47,10 +47,18 @@ function destroyRuin() while not findBoss() do coroutine.yield() end - if player.hasQuest("destroyruin") and not storage.gotQuestItem then player.giveItem("sb_beamaxe2") storage.gotQuestItem = true end sb_radioMessage() --Esther sb_radioMessage() --Lana + + while entity.position()[2] > config.getParameter("mmMessageHeight",480) do + coroutine.yield() + end + if player.hasQuest("destroyruin") and not storage.gotQuestItem then + player.giveItem("sb_beamaxe2") + storage.gotQuestItem = true + player.radioMessage("sb_tentaclemission-artifact") + end while entity.position()[2] > config.getParameter("brainMessageHeight",380) do coroutine.yield() diff --git a/quests/scripts/story/sb_techunlocks.lua b/quests/scripts/story/sb_techunlocks.lua index 07addbb0..3ab7b809 100644 --- a/quests/scripts/story/sb_techunlocks.lua +++ b/quests/scripts/story/sb_techunlocks.lua @@ -1,13 +1,12 @@ require "/scripts/util.lua" function init() + skipMessage = config.getParameter("skipTechUnlockMessages", root.assetJson("/quests/story/apex_mission2.questtemplate:script") == "/quests/scripts/sdisabler_autocomplete.lua") local quests = config.getParameter("quests") for i = 1, #quests do if player.hasCompletedQuest(quests[i]) then unlockTech(i) end end ---if player.hasCompletedQuest(config.getParameter("completionQuest",quest.templateId())) then --- quest.fail() ---end + message.setHandler("objectScanned", function(_, a, _, id) if a == false then return end if id == nil then return end @@ -24,7 +23,7 @@ function unlockTech(tier) local techs, suits = techTiers[tier], 0 techs, suits = techs[1], techs[2] local newTechs = {} - local unlockMessage = config.getParameter("radioMessage") + local unlockMessage = config.getParameter("radioMessages") for i = 1, #techs do if root.hasTech(techs[i]) and not ownsTech(techs[i]) then newTechs[#newTechs+1] = techs[i] player.makeTechAvailable(techs[i]) end @@ -33,12 +32,12 @@ function unlockTech(tier) if root.hasTech(suits[i]) and not ownsSuit(suits[i]) then newTechs[#newTechs+1] = suits[i] player_makeSuitAvailable(suits[i]) end end - if #newTechs == 0 then return end - local adjectives = config.getParameter("adjectives")[#newTechs==1 and 1 or 2] + if skipMessage or #newTechs == 0 then return end + local msg = #newTechs == 1 and 1 or 2 local a = "" for i = 1, #newTechs do a = a..root.techConfig(newTechs[i]).shortDescription..(i~=#newTechs and ", " or ".") end newTechs = a - player.radioMessage({messageId=sb.makeUuid(),unique=false,text=string.format(unlockMessage,adjectives[1],adjectives[2],newTechs)}) + player.radioMessage({messageId=sb.makeUuid(),unique=false,text=string.format(unlockMessage[msg],newTechs)}) end function player_makeSuitAvailable(suit) diff --git a/quests/story/sb_destroyruin.questtemplate b/quests/story/sb_destroyruin.questtemplate index c2008c10..28ce2014 100644 --- a/quests/story/sb_destroyruin.questtemplate +++ b/quests/story/sb_destroyruin.questtemplate @@ -1,30 +1,30 @@ { - "id" : "sb_destroyruin", - "prerequisites" : [], - "showAcceptDialog" : false, - "showCompleteDialog" : false, - "showFailDialog" : false, - "showInLog" : false, - "canBeAbandoned" : false, - "title" : "", - "text" : "", - "completionText" : "", - "moneyRange" : [0, 0], - "rewards" : [], - "questGiverIndicator" : "mainquestgiver", - "questReceiverIndicator" : "mainquestreceiver", + "id": "sb_destroyruin", + "prerequisites": [], + "showAcceptDialog": false, + "showCompleteDialog": false, + "showFailDialog": false, + "showInLog": false, + "canBeAbandoned": false, + "title": "", + "text": "", + "completionText": "", + "moneyRange": [0, 0], + "rewards": [], + "questGiverIndicator": "mainquestgiver", + "questReceiverIndicator": "mainquestreceiver", - "updateDelta" : 20, - "script" : "/quests/scripts/story/sb_destroyruin.lua", - "scriptConfig" : { - "portraits" : {}, - "descriptions" : {}, - "radioMessages" : ["tentaclemission-arrived2","tentaclemission-arrived3","tentaclemission-bottom2","sb_tentaclemission-brain","tentaclemission-bossroom2"], - "skipRadioMessages" : [false,false,false,false,false], - "completionQuest" : "destroyruin", - "instanceWorld" : "InstanceWorld:tentaclemission", - "bossUid" : "eyeboss", - "brainMessageHeight" : 380, - "onBrainMessageHeight" : 267 + "updateDelta": 20, + "script": "/quests/scripts/story/sb_destroyruin.lua", + "scriptConfig": { + "portraits": {}, + "descriptions": {}, + "radioMessages": ["tentaclemission-arrived2", "tentaclemission-arrived3", "tentaclemission-bottom2", "sb_tentaclemission-brain", "tentaclemission-bossroom2"], + "skipRadioMessages": [false, false, false, false, false], + "completionQuest": "destroyruin", + "instanceWorld": "InstanceWorld:tentaclemission", + "bossUid": "eyeboss", + "brainMessageHeight": 380, + "onBrainMessageHeight": 267 } } diff --git a/quests/story/sb_techunlocks.questtemplate b/quests/story/sb_techunlocks.questtemplate index 8990a4b4..4c66d9db 100644 --- a/quests/story/sb_techunlocks.questtemplate +++ b/quests/story/sb_techunlocks.questtemplate @@ -1,35 +1,36 @@ { - "id" : "sb_techunlocks", - "prerequisites" : [], - "showAcceptDialog" : false, - "showCompleteDialog" : false, - "showFailDialog" : false, - "showInLog" : false, - "canBeAbandoned" : false, - "title" : "", - "text" : "", - "completionText" : "", - "moneyRange" : [0, 0], - "rewards" : [], - "questGiverIndicator" : "mainquestgiver", - "questReceiverIndicator" : "mainquestreceiver", + "id": "sb_techunlocks", + "prerequisites": [], + "showAcceptDialog": false, + "showCompleteDialog": false, + "showFailDialog": false, + "showInLog": false, + "canBeAbandoned": false, + "title": "", + "text": "", + "completionText": "", + "moneyRange": [0, 0], + "rewards": [], + "questGiverIndicator": "mainquestgiver", + "questReceiverIndicator": "mainquestreceiver", - "updateDelta" : 0, - "script" : "/quests/scripts/story/sb_techunlocks.lua", - "scriptConfig" : { - "portraits" : {}, - "descriptions" : {}, - "radioMessage" : "The following tech%s ha%s been made available:\n%s\nYou can purchase tech at a tech console using tech cards.", - "adjectives" : [["","s"],["s","ve"]], - "quests" : ["human_mission1","floran_mission2","hylotl_mission2","avian_mission2","apex_mission2","glitch_mission2"], - "techTiers" : [ - [["sb_doublejump","sb_dash","sb_bounce"],[]], - [["sb_groundsmash","sb_rocketjump","sb_boat"],[]], - [["sb_morphball","sb_gravitybubble","sb_lightrig","skyrail"],[]], - [["sb_targetblink","sb_ftlboost","sb_rocketboots"],[]], - [["sb_bubbleboost"],["sb_energyregen","sb_shield"]], - [["sb_humanmech_NOTNOW","sb_particlethrust"],["sb_regeneration"]] + "updateDelta": 0, + "script": "/quests/scripts/story/sb_techunlocks.lua", + "scriptConfig": { + "portraits": {}, + "descriptions": {}, + "radioMessages": [ + "The following tech has been made available:\n%s\nYou can purchase tech at a tech console using tech cards.", + "The following techs have been made available:\n%s\nYou can purchase tech at a tech console using tech cards." + ], + "quests": ["human_mission1", "floran_mission2", "hylotl_mission2", "avian_mission2", "apex_mission2", "glitch_mission2"], + "techTiers": [ + [["sb_doublejump", "sb_dash", "sb_bounce"], []], + [["sb_groundsmash", "sb_rocketjump", "sb_boat"], []], + [["sb_morphball", "sb_gravitybubble", "sb_lightrig", "skyrail"], []], + [["sb_targetblink", "sb_ftlboost", "sb_rocketboots"], []], + [["sb_bubbleboost"], ["sb_energyregen", "sb_shield"]], + [["sb_humanmech_NOTNOW", "sb_particlethrust"], ["sb_regeneration"]] ] -// "completionQuest" : "destroyruin" } -} \ No newline at end of file +} diff --git a/radiomessages/sb_missions.radiomessages b/radiomessages/sb_missions.radiomessages index eb390477..a177a07f 100644 --- a/radiomessages/sb_missions.radiomessages +++ b/radiomessages/sb_missions.radiomessages @@ -1,9 +1,14 @@ { - "sb_tentaclemission-brain" : { - "unique" : false, - "type" : "mission", - "senderName" : "The Baron", - "portraitImage" : "/interface/chatbubbles/baron.png:", - "text" : "Impressed. A novel descent!" + "sb_tentaclemission-brain": { + "unique": false, + "type": "mission", + "senderName": "The Baron", + "portraitImage": "/interface/chatbubbles/baron.png:", + "text": "Impressed. A novel descent!" + }, + "sb_tentaclemission-artifact": { + "unique": false, + "type": "mission", + "text": "I have detected nearby energy readings from the ^orange;Master Manipulator^reset;." } -} \ No newline at end of file +} diff --git a/radiomessages/sb_tutorial.radiomessages b/radiomessages/sb_tutorial.radiomessages index 77ece0ec..53230737 100644 --- a/radiomessages/sb_tutorial.radiomessages +++ b/radiomessages/sb_tutorial.radiomessages @@ -6,7 +6,7 @@ "sb_pickuptechstation": { "type": "tutorial", - "text": "I see that you have obtained a wall-mounted tech station! Using it, you can create unique tech cards which can be used to share or equip techs." + "text": "I see that you have obtained a tech binding station! Using it, you can create unique tech cards which can be used equip techs on-the-go." }, "sb_pickuptechconsole": { @@ -49,10 +49,6 @@ "type": "tutorial", "text": "You've obtained a mining tool. Although you can access it after placing it in the action bar, you can also place it in your Matter Manipulator slot from the access panel on the right-hand toolbar." }, - "sb_pickuppreservatives": { - "type": "tutorial", - "text": "I see you've acquired some preservatives! With a ^#71f2f6;right-click,^reset; you can use it to prevent a perishable from rotting. Be warned that this will render the item unsuitable for use in cooking or crafting." - }, "sb_pickupammo": { "type": "tutorial", "text": "I see you've acquired some ammunition! Certain firearms gain a ^green;20%^reset; damage boost when using any type of ammo. If your ammo reserves are depleted or ^#71f2f6;SHIFT^reset; is held, the gun will instead use energy." diff --git a/recipeCrafterMFM/coffeeMFMRecipes.config.patch b/recipeCrafterMFM/coffeeMFMRecipes.config.patch new file mode 100644 index 00000000..db5227ad --- /dev/null +++ b/recipeCrafterMFM/coffeeMFMRecipes.config.patch @@ -0,0 +1,56 @@ +[ + //So I need to specify the ingredients used in the recipe, the name, ID, and icon of the ingredients, the fact that, yes, the station CAN craft this item (groups), yes, the station CAN craft this item (possibleOutput), yes, the station CAN craft this item (recipesCraftFrom), and, yes, the station CAN craft this item (methods) + [{ + "op": "add", + "path": "/possibleOutput/-", + "value": "sb_liquidcoffee" + } + ], [{ + "op": "test", + "path": "/recipesCraftFrom/coffeebeans", + "inverse": true + }, { + "op": "add", + "path": "/recipesCraftFrom/coffeebeans", + "value": [] + } + ], [{ + "op": "add", + "path": "/recipesCraftFrom/coffeebeans/-", + "value": "sb_liquidcoffee" + } + ], [{ + "op": "add", + "path": "/recipesToCraft/sb_liquidcoffee", + "value": { + "recipes": [{ + "output": { + "name": "sb_liquidcoffee", + "count": 2 + }, + "displayMethods": " (COFFEE)", + "input": { + "coffeebeans": { + "displayName": "Coffee Beans", + "count": 1, + "icon": "coffeebeans.png", + "id": "coffeebeans" + } + }, + "excludeFromRecipeBook": false, + "methods": { + "coffeeMFM": "COFFEE" + }, + "groups": ["coffeeMFM"] + } + ], + "displayName": "Liquid Coffee", + "methods": { + "coffeeMFM": "COFFEE" + }, + "displayNameWithMethods": "Liquid Coffee (COFFEE)", + "icon": "sb_liquidcoffee.png" + } + } + ] +] diff --git a/recipes/biome/colourful/paintgungreen.recipe.patch b/recipes/biome/colourful/paintgungreen.recipe.patch index c030af82..ed4b3e3e 100644 --- a/recipes/biome/colourful/paintgungreen.recipe.patch +++ b/recipes/biome/colourful/paintgungreen.recipe.patch @@ -1,6 +1,8 @@ -[[ -{"op":"test","path":"/input/0/count","value":6}, -{"op":"test","path":"/input/0/item","value":"titaniumbar"}, -{"op":"replace","path":"/input/0/count","value":30}, -{"op":"replace","path":"/input/0/item","value":"rainbowwood"} -]] \ No newline at end of file +[ + [ + {"op":"test","path":"/input/0/count","value":6}, + {"op":"test","path":"/input/0/item","value":"titaniumbar"}, + {"op":"replace","path":"/input/0/count","value":30}, + {"op":"replace","path":"/input/0/item","value":"rainbowwood"} + ] +] \ No newline at end of file diff --git a/recipes/biome/colourful/paintgunorange.recipe.patch b/recipes/biome/colourful/paintgunorange.recipe.patch index c030af82..ed4b3e3e 100644 --- a/recipes/biome/colourful/paintgunorange.recipe.patch +++ b/recipes/biome/colourful/paintgunorange.recipe.patch @@ -1,6 +1,8 @@ -[[ -{"op":"test","path":"/input/0/count","value":6}, -{"op":"test","path":"/input/0/item","value":"titaniumbar"}, -{"op":"replace","path":"/input/0/count","value":30}, -{"op":"replace","path":"/input/0/item","value":"rainbowwood"} -]] \ No newline at end of file +[ + [ + {"op":"test","path":"/input/0/count","value":6}, + {"op":"test","path":"/input/0/item","value":"titaniumbar"}, + {"op":"replace","path":"/input/0/count","value":30}, + {"op":"replace","path":"/input/0/item","value":"rainbowwood"} + ] +] \ No newline at end of file diff --git a/recipes/biome/colourful/paintgunpurple.recipe.patch b/recipes/biome/colourful/paintgunpurple.recipe.patch index c030af82..ed4b3e3e 100644 --- a/recipes/biome/colourful/paintgunpurple.recipe.patch +++ b/recipes/biome/colourful/paintgunpurple.recipe.patch @@ -1,6 +1,8 @@ -[[ -{"op":"test","path":"/input/0/count","value":6}, -{"op":"test","path":"/input/0/item","value":"titaniumbar"}, -{"op":"replace","path":"/input/0/count","value":30}, -{"op":"replace","path":"/input/0/item","value":"rainbowwood"} -]] \ No newline at end of file +[ + [ + {"op":"test","path":"/input/0/count","value":6}, + {"op":"test","path":"/input/0/item","value":"titaniumbar"}, + {"op":"replace","path":"/input/0/count","value":30}, + {"op":"replace","path":"/input/0/item","value":"rainbowwood"} + ] +] \ No newline at end of file diff --git a/recipes/biome/colourful/paintgunred.recipe.patch b/recipes/biome/colourful/paintgunred.recipe.patch index c030af82..ed4b3e3e 100644 --- a/recipes/biome/colourful/paintgunred.recipe.patch +++ b/recipes/biome/colourful/paintgunred.recipe.patch @@ -1,6 +1,8 @@ -[[ -{"op":"test","path":"/input/0/count","value":6}, -{"op":"test","path":"/input/0/item","value":"titaniumbar"}, -{"op":"replace","path":"/input/0/count","value":30}, -{"op":"replace","path":"/input/0/item","value":"rainbowwood"} -]] \ No newline at end of file +[ + [ + {"op":"test","path":"/input/0/count","value":6}, + {"op":"test","path":"/input/0/item","value":"titaniumbar"}, + {"op":"replace","path":"/input/0/count","value":30}, + {"op":"replace","path":"/input/0/item","value":"rainbowwood"} + ] +] \ No newline at end of file diff --git a/recipes/biome/colourful/paintgunyellow.recipe.patch b/recipes/biome/colourful/paintgunyellow.recipe.patch index c030af82..ed4b3e3e 100644 --- a/recipes/biome/colourful/paintgunyellow.recipe.patch +++ b/recipes/biome/colourful/paintgunyellow.recipe.patch @@ -1,6 +1,8 @@ -[[ -{"op":"test","path":"/input/0/count","value":6}, -{"op":"test","path":"/input/0/item","value":"titaniumbar"}, -{"op":"replace","path":"/input/0/count","value":30}, -{"op":"replace","path":"/input/0/item","value":"rainbowwood"} -]] \ No newline at end of file +[ + [ + {"op":"test","path":"/input/0/count","value":6}, + {"op":"test","path":"/input/0/item","value":"titaniumbar"}, + {"op":"replace","path":"/input/0/count","value":30}, + {"op":"replace","path":"/input/0/item","value":"rainbowwood"} + ] +] \ No newline at end of file diff --git a/recipes/biome/scorchedcity/scorchedcitytv.recipe.patch b/recipes/biome/scorchedcity/scorchedcitytv.recipe.patch index 4adff290..3968e03c 100644 --- a/recipes/biome/scorchedcity/scorchedcitytv.recipe.patch +++ b/recipes/biome/scorchedcity/scorchedcitytv.recipe.patch @@ -1,6 +1,6 @@ [ [ - {"op":"test","path":"/input/0/item","value":"glassmaterial"}, - {"op":"replace","path":"/input/0/item","value":"glass"} + {"op":"test","path":"/input/0/item","value":"glassmaterial"}, + {"op":"replace","path":"/input/0/item","value":"glass"} ] ] \ No newline at end of file diff --git a/recipes/biome/snow/fancysnowman.recipe.patch b/recipes/biome/snow/fancysnowman.recipe.patch index db2c760c..57b14168 100644 --- a/recipes/biome/snow/fancysnowman.recipe.patch +++ b/recipes/biome/snow/fancysnowman.recipe.patch @@ -1,3 +1 @@ -[ - {"op":"add","path":"/groups/-","value":"plain"} -] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"plain"}] \ No newline at end of file diff --git a/recipes/biome/snow/snowman.recipe.patch b/recipes/biome/snow/snowman.recipe.patch index db2c760c..57b14168 100644 --- a/recipes/biome/snow/snowman.recipe.patch +++ b/recipes/biome/snow/snowman.recipe.patch @@ -1,3 +1 @@ -[ - {"op":"add","path":"/groups/-","value":"plain"} -] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"plain"}] \ No newline at end of file diff --git a/recipes/biome/tar/tarman.recipe.patch b/recipes/biome/tar/tarman.recipe.patch index db2c760c..57b14168 100644 --- a/recipes/biome/tar/tarman.recipe.patch +++ b/recipes/biome/tar/tarman.recipe.patch @@ -1,3 +1 @@ -[ - {"op":"add","path":"/groups/-","value":"plain"} -] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"plain"}] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/beakseedjam.recipe.patch b/recipes/cookingtable1/condiments/beakseedjam.recipe.patch index 68598362..5f2196ce 100644 --- a/recipes/cookingtable1/condiments/beakseedjam.recipe.patch +++ b/recipes/cookingtable1/condiments/beakseedjam.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/desertsalsa.recipe.patch b/recipes/cookingtable1/condiments/desertsalsa.recipe.patch index 4146d71d..638d090c 100644 --- a/recipes/cookingtable1/condiments/desertsalsa.recipe.patch +++ b/recipes/cookingtable1/condiments/desertsalsa.recipe.patch @@ -1,5 +1,7 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_energy"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, +{"op":"add","path":"/groups/-","value":"sb_electrified"}, {"op":"add","path":"/groups/-","value":"sb_thorns"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/feathercrownjam.recipe.patch b/recipes/cookingtable1/condiments/feathercrownjam.recipe.patch index 68598362..5f2196ce 100644 --- a/recipes/cookingtable1/condiments/feathercrownjam.recipe.patch +++ b/recipes/cookingtable1/condiments/feathercrownjam.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/kiwijam.recipe.patch b/recipes/cookingtable1/condiments/kiwijam.recipe.patch index 68598362..5f2196ce 100644 --- a/recipes/cookingtable1/condiments/kiwijam.recipe.patch +++ b/recipes/cookingtable1/condiments/kiwijam.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/neonmelonjam.recipe.patch b/recipes/cookingtable1/condiments/neonmelonjam.recipe.patch index 68598362..9f58be2c 100644 --- a/recipes/cookingtable1/condiments/neonmelonjam.recipe.patch +++ b/recipes/cookingtable1/condiments/neonmelonjam.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/oceansalsa.recipe.patch b/recipes/cookingtable1/condiments/oceansalsa.recipe.patch index 53a0504e..4e5c3162 100644 --- a/recipes/cookingtable1/condiments/oceansalsa.recipe.patch +++ b/recipes/cookingtable1/condiments/oceansalsa.recipe.patch @@ -2,6 +2,7 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, +{"op":"add","path":"/groups/-","value":"sb_energyregen"}, {"op":"add","path":"/groups/-","value":"sb_swimboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/pineapplejam.recipe.patch b/recipes/cookingtable1/condiments/pineapplejam.recipe.patch index 68598362..9f58be2c 100644 --- a/recipes/cookingtable1/condiments/pineapplejam.recipe.patch +++ b/recipes/cookingtable1/condiments/pineapplejam.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/pussplumjam.recipe.patch b/recipes/cookingtable1/condiments/pussplumjam.recipe.patch index bd6a0d75..032bbd44 100644 --- a/recipes/cookingtable1/condiments/pussplumjam.recipe.patch +++ b/recipes/cookingtable1/condiments/pussplumjam.recipe.patch @@ -1,7 +1,7 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_bouncy"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/condiments/volcanicsalsa.recipe.patch b/recipes/cookingtable1/condiments/volcanicsalsa.recipe.patch index 19f0ea6e..07587057 100644 --- a/recipes/cookingtable1/condiments/volcanicsalsa.recipe.patch +++ b/recipes/cookingtable1/condiments/volcanicsalsa.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_nova"}, {"op":"add","path":"/groups/-","value":"sb_other"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/apegrapes.recipe.patch b/recipes/cookingtable1/desserts/apegrapes.recipe.patch index f63c8bd0..f3d77c1a 100644 --- a/recipes/cookingtable1/desserts/apegrapes.recipe.patch +++ b/recipes/cookingtable1/desserts/apegrapes.recipe.patch @@ -2,6 +2,6 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_energyregen"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/avesmingoicecream.recipe.patch b/recipes/cookingtable1/desserts/avesmingoicecream.recipe.patch index 3a48e65c..78622218 100644 --- a/recipes/cookingtable1/desserts/avesmingoicecream.recipe.patch +++ b/recipes/cookingtable1/desserts/avesmingoicecream.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/bananasplit.recipe.patch b/recipes/cookingtable1/desserts/bananasplit.recipe.patch index 326d9486..df882018 100644 --- a/recipes/cookingtable1/desserts/bananasplit.recipe.patch +++ b/recipes/cookingtable1/desserts/bananasplit.recipe.patch @@ -2,5 +2,5 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_energyregen"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/beakseedtart.recipe.patch b/recipes/cookingtable1/desserts/beakseedtart.recipe.patch index 68598362..5f2196ce 100644 --- a/recipes/cookingtable1/desserts/beakseedtart.recipe.patch +++ b/recipes/cookingtable1/desserts/beakseedtart.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/brineapple.recipe.patch b/recipes/cookingtable1/desserts/brineapple.recipe.patch index f61a1f8b..8b461e9f 100644 --- a/recipes/cookingtable1/desserts/brineapple.recipe.patch +++ b/recipes/cookingtable1/desserts/brineapple.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/campfirebanana.recipe.patch b/recipes/cookingtable1/desserts/campfirebanana.recipe.patch index 61459819..c7ffa6e3 100644 --- a/recipes/cookingtable1/desserts/campfirebanana.recipe.patch +++ b/recipes/cookingtable1/desserts/campfirebanana.recipe.patch @@ -2,6 +2,7 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_energyregen"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"campfire"}, {"op":"add","path":"/groups/-","value":"consumables"}, {"op":"add","path":"/groups/-","value":"all"}, diff --git a/recipes/cookingtable1/desserts/chocolate.recipe.patch b/recipes/cookingtable1/desserts/chocolate.recipe.patch index 05a19001..1bcea8b3 100644 --- a/recipes/cookingtable1/desserts/chocolate.recipe.patch +++ b/recipes/cookingtable1/desserts/chocolate.recipe.patch @@ -1,4 +1,4 @@ [[{"op":"test","path":"/groups"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/chocolatecake.recipe.patch b/recipes/cookingtable1/desserts/chocolatecake.recipe.patch index 9515028c..78622218 100644 --- a/recipes/cookingtable1/desserts/chocolatecake.recipe.patch +++ b/recipes/cookingtable1/desserts/chocolatecake.recipe.patch @@ -1,4 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_energy"} +{"op":"add","path":"/groups/-","value":"sb_energy"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/fruitsalad.recipe.patch b/recipes/cookingtable1/desserts/fruitsalad.recipe.patch index 326d9486..94108939 100644 --- a/recipes/cookingtable1/desserts/fruitsalad.recipe.patch +++ b/recipes/cookingtable1/desserts/fruitsalad.recipe.patch @@ -2,5 +2,6 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_energyregen"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/pussplumpudding.recipe.patch b/recipes/cookingtable1/desserts/pussplumpudding.recipe.patch index f6771189..391d09a2 100644 --- a/recipes/cookingtable1/desserts/pussplumpudding.recipe.patch +++ b/recipes/cookingtable1/desserts/pussplumpudding.recipe.patch @@ -2,6 +2,6 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_bouncy"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/desserts/pussplumtart.recipe.patch b/recipes/cookingtable1/desserts/pussplumtart.recipe.patch index bd6a0d75..032bbd44 100644 --- a/recipes/cookingtable1/desserts/pussplumtart.recipe.patch +++ b/recipes/cookingtable1/desserts/pussplumtart.recipe.patch @@ -1,7 +1,7 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_bouncy"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/avesmingojuice.recipe.patch b/recipes/cookingtable1/drinks/avesmingojuice.recipe.patch index f61a1f8b..8b461e9f 100644 --- a/recipes/cookingtable1/drinks/avesmingojuice.recipe.patch +++ b/recipes/cookingtable1/drinks/avesmingojuice.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/bloodypuss.recipe.patch b/recipes/cookingtable1/drinks/bloodypuss.recipe.patch index 6bf73337..9e38b6f9 100644 --- a/recipes/cookingtable1/drinks/bloodypuss.recipe.patch +++ b/recipes/cookingtable1/drinks/bloodypuss.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_bouncy"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/cyanider.recipe.patch b/recipes/cookingtable1/drinks/cyanider.recipe.patch index 1bc34e9f..e74b6b9c 100644 --- a/recipes/cookingtable1/drinks/cyanider.recipe.patch +++ b/recipes/cookingtable1/drinks/cyanider.recipe.patch @@ -1,7 +1,7 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_bouncy"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/grapejuice.recipe.patch b/recipes/cookingtable1/drinks/grapejuice.recipe.patch index f61a1f8b..8b461e9f 100644 --- a/recipes/cookingtable1/drinks/grapejuice.recipe.patch +++ b/recipes/cookingtable1/drinks/grapejuice.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/kiwijuice.recipe.patch b/recipes/cookingtable1/drinks/kiwijuice.recipe.patch index f61a1f8b..6ee200d3 100644 --- a/recipes/cookingtable1/drinks/kiwijuice.recipe.patch +++ b/recipes/cookingtable1/drinks/kiwijuice.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/mocha.recipe.patch b/recipes/cookingtable1/drinks/mocha.recipe.patch index 1665f3dd..df882018 100644 --- a/recipes/cookingtable1/drinks/mocha.recipe.patch +++ b/recipes/cookingtable1/drinks/mocha.recipe.patch @@ -1,5 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_energyregen"} +{"op":"add","path":"/groups/-","value":"sb_energyregen"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/pineapplejuice.recipe.patch b/recipes/cookingtable1/drinks/pineapplejuice.recipe.patch index f61a1f8b..8b461e9f 100644 --- a/recipes/cookingtable1/drinks/pineapplejuice.recipe.patch +++ b/recipes/cookingtable1/drinks/pineapplejuice.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/pozest.recipe.patch b/recipes/cookingtable1/drinks/pozest.recipe.patch index 7dbee2fd..eaaad62c 100644 --- a/recipes/cookingtable1/drinks/pozest.recipe.patch +++ b/recipes/cookingtable1/drinks/pozest.recipe.patch @@ -1,7 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, {"op":"add","path":"/groups/-","value":"sb_electrified"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/sweetpunch.recipe.patch b/recipes/cookingtable1/drinks/sweetpunch.recipe.patch index 77cd7732..07519454 100644 --- a/recipes/cookingtable1/drinks/sweetpunch.recipe.patch +++ b/recipes/cookingtable1/drinks/sweetpunch.recipe.patch @@ -1,4 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/tropicalpunch.recipe.patch b/recipes/cookingtable1/drinks/tropicalpunch.recipe.patch index 326d9486..94108939 100644 --- a/recipes/cookingtable1/drinks/tropicalpunch.recipe.patch +++ b/recipes/cookingtable1/drinks/tropicalpunch.recipe.patch @@ -2,5 +2,6 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_energyregen"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/drinks/ultimatejuice.recipe.patch b/recipes/cookingtable1/drinks/ultimatejuice.recipe.patch index 3170ca46..78ab9ce0 100644 --- a/recipes/cookingtable1/drinks/ultimatejuice.recipe.patch +++ b/recipes/cookingtable1/drinks/ultimatejuice.recipe.patch @@ -2,6 +2,7 @@ {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_rage"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/cornpeckers.recipe.patch b/recipes/cookingtable1/mains/cornpeckers.recipe.patch index 4fc7d8b6..85c66e1d 100644 --- a/recipes/cookingtable1/mains/cornpeckers.recipe.patch +++ b/recipes/cookingtable1/mains/cornpeckers.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/featherfood.recipe.patch b/recipes/cookingtable1/mains/featherfood.recipe.patch index 3a48e65c..fe3b24c5 100644 --- a/recipes/cookingtable1/mains/featherfood.recipe.patch +++ b/recipes/cookingtable1/mains/featherfood.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_jumpboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/fishfingers.recipe.patch b/recipes/cookingtable1/mains/fishfingers.recipe.patch index f101963f..788e8e06 100644 --- a/recipes/cookingtable1/mains/fishfingers.recipe.patch +++ b/recipes/cookingtable1/mains/fishfingers.recipe.patch @@ -1,5 +1,14 @@ -[[{"op":"test","path":"/groups"}, -{"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_t1food"} -]] \ No newline at end of file +[ + [ + {"op":"test","path":"/groups"}, + {"op":"add","path":"/groups/-","value":"sb_healing"}, + {"op":"add","path":"/groups/-","value":"sb_health"}, + {"op":"add","path":"/groups/-","value":"sb_t1food"} + ], + [ + {"op":"test","path":"/input/2","inverse":true}, + {"op":"test","path":"/input/1/item","value":"bread"}, + {"op":"replace","path":"/input/1/item","value":"wheat"}, + {"op":"add","path":"/input/-","value":{"item":"cheese","count":1}} + ] +] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/fishinabone.recipe.patch b/recipes/cookingtable1/mains/fishinabone.recipe.patch index 842e2dce..d850e3d4 100644 --- a/recipes/cookingtable1/mains/fishinabone.recipe.patch +++ b/recipes/cookingtable1/mains/fishinabone.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/hothothotpot.recipe.patch b/recipes/cookingtable1/mains/hothothotpot.recipe.patch index 379bf658..21e6c4b7 100644 --- a/recipes/cookingtable1/mains/hothothotpot.recipe.patch +++ b/recipes/cookingtable1/mains/hothothotpot.recipe.patch @@ -1,7 +1,7 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"}, {"op":"add","path":"/groups/-","value":"sb_nova"}, {"op":"add","path":"/groups/-","value":"sb_other"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/meatpie.recipe.patch b/recipes/cookingtable1/mains/meatpie.recipe.patch index c0784b70..9273eb18 100644 --- a/recipes/cookingtable1/mains/meatpie.recipe.patch +++ b/recipes/cookingtable1/mains/meatpie.recipe.patch @@ -1,4 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_health"} +{"op":"add","path":"/groups/-","value":"sb_health"}, +{"op":"add","path":"/groups/-","value":"sb_protection"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/oculemonstew.recipe.patch b/recipes/cookingtable1/mains/oculemonstew.recipe.patch index 9afa8380..5195986b 100644 --- a/recipes/cookingtable1/mains/oculemonstew.recipe.patch +++ b/recipes/cookingtable1/mains/oculemonstew.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_bouncy"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/pearlpeapancakes.recipe.patch b/recipes/cookingtable1/mains/pearlpeapancakes.recipe.patch index 9273eb18..84da16cb 100644 --- a/recipes/cookingtable1/mains/pearlpeapancakes.recipe.patch +++ b/recipes/cookingtable1/mains/pearlpeapancakes.recipe.patch @@ -1,5 +1,4 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_health"}, {"op":"add","path":"/groups/-","value":"sb_protection"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/pineapplepizzaslice.recipe.patch b/recipes/cookingtable1/mains/pineapplepizzaslice.recipe.patch index 0c6132dc..c90ea4b4 100644 --- a/recipes/cookingtable1/mains/pineapplepizzaslice.recipe.patch +++ b/recipes/cookingtable1/mains/pineapplepizzaslice.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"} +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/spookypie.recipe.patch b/recipes/cookingtable1/mains/spookypie.recipe.patch index 8cb9b914..08ce9a79 100644 --- a/recipes/cookingtable1/mains/spookypie.recipe.patch +++ b/recipes/cookingtable1/mains/spookypie.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/mains/wartweedstew.recipe.patch b/recipes/cookingtable1/mains/wartweedstew.recipe.patch index 52f402f9..84da16cb 100644 --- a/recipes/cookingtable1/mains/wartweedstew.recipe.patch +++ b/recipes/cookingtable1/mains/wartweedstew.recipe.patch @@ -1,5 +1,4 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_protection"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/sides/beakseedbread.recipe.patch b/recipes/cookingtable1/sides/beakseedbread.recipe.patch index f61a1f8b..6ee200d3 100644 --- a/recipes/cookingtable1/sides/beakseedbread.recipe.patch +++ b/recipes/cookingtable1/sides/beakseedbread.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/sides/eggshootsalad.recipe.patch b/recipes/cookingtable1/sides/eggshootsalad.recipe.patch index f61a1f8b..6ee200d3 100644 --- a/recipes/cookingtable1/sides/eggshootsalad.recipe.patch +++ b/recipes/cookingtable1/sides/eggshootsalad.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/sides/hotbone.recipe.patch b/recipes/cookingtable1/sides/hotbone.recipe.patch index c028db28..e4c80a2d 100644 --- a/recipes/cookingtable1/sides/hotbone.recipe.patch +++ b/recipes/cookingtable1/sides/hotbone.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_power"}, +{"op":"add","path":"/groups/-","value":"sb_rage"}, {"op":"add","path":"/groups/-","value":"sb_nova"}, {"op":"add","path":"/groups/-","value":"sb_other"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} diff --git a/recipes/cookingtable1/sides/pearlpeabroth.recipe.patch b/recipes/cookingtable1/sides/pearlpeabroth.recipe.patch index 2da0456a..8d774ca5 100644 --- a/recipes/cookingtable1/sides/pearlpeabroth.recipe.patch +++ b/recipes/cookingtable1/sides/pearlpeabroth.recipe.patch @@ -1,6 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_health"}, {"op":"add","path":"/groups/-","value":"sb_protection"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/sides/pearlpeaparcels.recipe.patch b/recipes/cookingtable1/sides/pearlpeaparcels.recipe.patch index 2da0456a..8d774ca5 100644 --- a/recipes/cookingtable1/sides/pearlpeaparcels.recipe.patch +++ b/recipes/cookingtable1/sides/pearlpeaparcels.recipe.patch @@ -1,6 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_health"}, {"op":"add","path":"/groups/-","value":"sb_protection"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/sides/spicyfeathercrown.recipe.patch b/recipes/cookingtable1/sides/spicyfeathercrown.recipe.patch index 808c0a88..866e5ec2 100644 --- a/recipes/cookingtable1/sides/spicyfeathercrown.recipe.patch +++ b/recipes/cookingtable1/sides/spicyfeathercrown.recipe.patch @@ -1,6 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_mobility"}, +{"op":"add","path":"/groups/-","value":"sb_jumpboost"}, {"op":"add","path":"/groups/-","value":"sb_nova"}, {"op":"add","path":"/groups/-","value":"sb_other"}, {"op":"add","path":"/groups/-","value":"sb_t1food"} diff --git a/recipes/cookingtable1/sides/stuffedautomato.recipe.patch b/recipes/cookingtable1/sides/stuffedautomato.recipe.patch index d82afe86..1c36a0ea 100644 --- a/recipes/cookingtable1/sides/stuffedautomato.recipe.patch +++ b/recipes/cookingtable1/sides/stuffedautomato.recipe.patch @@ -1,5 +1,6 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_health"}, +{"op":"add","path":"/groups/-","value":"sb_energy"}, {"op":"add","path":"/groups/-","value":"sb_electrified"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/snacks/choconut.recipe.patch b/recipes/cookingtable1/snacks/choconut.recipe.patch index 9515028c..78622218 100644 --- a/recipes/cookingtable1/snacks/choconut.recipe.patch +++ b/recipes/cookingtable1/snacks/choconut.recipe.patch @@ -1,4 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, -{"op":"add","path":"/groups/-","value":"sb_energy"} +{"op":"add","path":"/groups/-","value":"sb_energy"}, +{"op":"add","path":"/groups/-","value":"sb_runboost"} ]] \ No newline at end of file diff --git a/recipes/cookingtable1/snacks/spookydonut.recipe.patch b/recipes/cookingtable1/snacks/spookydonut.recipe.patch index 245cdea5..e8353e42 100644 --- a/recipes/cookingtable1/snacks/spookydonut.recipe.patch +++ b/recipes/cookingtable1/snacks/spookydonut.recipe.patch @@ -1,5 +1,5 @@ [[{"op":"test","path":"/groups"}, {"op":"add","path":"/groups/-","value":"sb_healing"}, {"op":"add","path":"/groups/-","value":"sb_energy"}, -{"op":"add","path":"/groups/-","value":"sb_power"} +{"op":"add","path":"/groups/-","value":"sb_rage"} ]] \ No newline at end of file diff --git a/recipes/emptyhands/flagapex.recipe.patch b/recipes/emptyhands/flagapex.recipe.patch index c829393e..e4b0ad98 100644 --- a/recipes/emptyhands/flagapex.recipe.patch +++ b/recipes/emptyhands/flagapex.recipe.patch @@ -1 +1 @@ -[{"op":"add","path":"/groups/-","value":"sb_objects"}] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"objects"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferchemistblue.recipe.patch b/recipes/emptyhands/jobofferchemistblue.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferchemistblue.recipe.patch +++ b/recipes/emptyhands/jobofferchemistblue.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferchemistgreen.recipe.patch b/recipes/emptyhands/jobofferchemistgreen.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferchemistgreen.recipe.patch +++ b/recipes/emptyhands/jobofferchemistgreen.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferchemistorange.recipe.patch b/recipes/emptyhands/jobofferchemistorange.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferchemistorange.recipe.patch +++ b/recipes/emptyhands/jobofferchemistorange.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferchemistyellow.recipe.patch b/recipes/emptyhands/jobofferchemistyellow.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferchemistyellow.recipe.patch +++ b/recipes/emptyhands/jobofferchemistyellow.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferengineer.recipe.patch b/recipes/emptyhands/jobofferengineer.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferengineer.recipe.patch +++ b/recipes/emptyhands/jobofferengineer.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferjanitor.recipe.patch b/recipes/emptyhands/jobofferjanitor.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferjanitor.recipe.patch +++ b/recipes/emptyhands/jobofferjanitor.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/joboffermechanic.recipe.patch b/recipes/emptyhands/joboffermechanic.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/joboffermechanic.recipe.patch +++ b/recipes/emptyhands/joboffermechanic.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/joboffermedic.recipe.patch b/recipes/emptyhands/joboffermedic.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/joboffermedic.recipe.patch +++ b/recipes/emptyhands/joboffermedic.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/jobofferoutlaw.recipe.patch b/recipes/emptyhands/jobofferoutlaw.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/jobofferoutlaw.recipe.patch +++ b/recipes/emptyhands/jobofferoutlaw.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/joboffersoldier.recipe.patch b/recipes/emptyhands/joboffersoldier.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/joboffersoldier.recipe.patch +++ b/recipes/emptyhands/joboffersoldier.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/joboffertailor.recipe.patch b/recipes/emptyhands/joboffertailor.recipe.patch index 472dbd7e..71d68ac7 100644 --- a/recipes/emptyhands/joboffertailor.recipe.patch +++ b/recipes/emptyhands/joboffertailor.recipe.patch @@ -1 +1 @@ -[[{"op":"add","path":"/groups/-","value":"tools"}]] \ No newline at end of file +[{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file diff --git a/recipes/emptyhands/torch.recipe.patch b/recipes/emptyhands/torch.recipe.patch index ef62784c..5b182595 100644 --- a/recipes/emptyhands/torch.recipe.patch +++ b/recipes/emptyhands/torch.recipe.patch @@ -1,2 +1,3 @@ [{"op":"add","path":"/groups/-","value":"objects"}, -{"op":"add","path":"/groups/-","value":"tools"}] \ No newline at end of file +{"op":"add","path":"/groups/-","value":"tools"}, +{"op":"add","path":"/groups/-","value":"craftingfurniture"}] \ No newline at end of file diff --git a/recipes/farmtable1/farming/hoe.recipe.patch b/recipes/farmtable1/farming/hoe.recipe.patch new file mode 100644 index 00000000..cbdf5685 --- /dev/null +++ b/recipes/farmtable1/farming/hoe.recipe.patch @@ -0,0 +1,10 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"copperbar"}, + {"op":"replace","path":"/input/1/item","value":"tungstenbar"} + ], + [ + {"op":"test","path":"/input/2/item","value":"string"}, + {"op":"replace","path":"/input/2/item","value":"climbingrope"} + ] +] \ No newline at end of file diff --git a/recipes/farmtable1/farming/scarecrow.recipe.patch b/recipes/farmtable1/farming/scarecrow.recipe.patch new file mode 100644 index 00000000..eafbb82f --- /dev/null +++ b/recipes/farmtable1/farming/scarecrow.recipe.patch @@ -0,0 +1,14 @@ +[ + //Mmm yes let me make a piece of furniture which confers no benefits instead of 40 bandages + //actually im not gonna change the fabric count since a shirt uses 20. still gonna change the fibre though + [ + {"op":"test","path":"/input/2/item","value":"plantfibre"}, + {"op":"test","path":"/input/2/count","value":40}, + {"op":"replace","path":"/input/2/count","value":10} + ], + [ + {"op":"add","path":"/groups/-","value":"craftingfurniture"}, + {"op":"add","path":"/groups/-","value":"decoration"}, + {"op":"add","path":"/groups/-","value":"all"} + ] +] \ No newline at end of file diff --git a/recipes/farmtable1/survival/flashlight.recipe.patch b/recipes/farmtable1/survival/flashlight.recipe.patch index 5f68ef80..b9b25da2 100644 --- a/recipes/farmtable1/survival/flashlight.recipe.patch +++ b/recipes/farmtable1/survival/flashlight.recipe.patch @@ -1,6 +1,6 @@ [ [ - {"op":"test","path":"/input/2/item","value":"glassmaterial"}, - {"op":"replace","path":"/input/2/item","value":"glass"} + {"op":"test","path":"/input/2/item","value":"glassmaterial"}, + {"op":"replace","path":"/input/2/item","value":"glass"} ] ] \ No newline at end of file diff --git a/recipes/farmtable2/hunting/compoundbow.recipe.patch b/recipes/farmtable2/hunting/compoundbow.recipe.patch new file mode 100644 index 00000000..b493c98a --- /dev/null +++ b/recipes/farmtable2/hunting/compoundbow.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"string"}, + {"op":"add","path":"/input/1/item","value":"thread"} + ] +] \ No newline at end of file diff --git a/recipes/farmtable2/survival/halogenpack.recipe.patch b/recipes/farmtable2/survival/halogenpack.recipe.patch new file mode 100644 index 00000000..1a3624dc --- /dev/null +++ b/recipes/farmtable2/survival/halogenpack.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"op":"test","path":"/input/0/item","value":"durasteelbar"}, + {"op":"add","path":"/input/0/item","value":"titaniumbar"} + ] +] \ No newline at end of file diff --git a/recipes/furniture1/doors/tier1door.recipe.patch b/recipes/furniture1/doors/tier1door.recipe.patch index 8da90033..7653f605 100644 --- a/recipes/furniture1/doors/tier1door.recipe.patch +++ b/recipes/furniture1/doors/tier1door.recipe.patch @@ -1,7 +1,7 @@ [ [ {"op":"test","path":"/input/1"}, - {"op":"test","path":"/input/1/item","value":"glassmaterial"}, - {"op":"replace","path":"/input/1/item","value":"glass"} + {"op":"test","path":"/input/1/item","value":"glassmaterial"}, + {"op":"replace","path":"/input/1/item","value":"glass"} ] ] \ No newline at end of file diff --git a/recipes/furniture1/lights/tier1light.recipe.patch b/recipes/furniture1/lights/tier1light.recipe.patch index e3f04408..1232cdbb 100644 --- a/recipes/furniture1/lights/tier1light.recipe.patch +++ b/recipes/furniture1/lights/tier1light.recipe.patch @@ -1,9 +1,9 @@ [ [ {"op":"test","path":"/input/2"}, - {"op":"test","path":"/input/2/item","value":"glassmaterial"}, - {"op":"test","path":"/input/2/count","value":1}, - {"op":"replace","path":"/input/2/item","value":"glass"}, - {"op":"replace","path":"/input/2/count","value":3} + {"op":"test","path":"/input/2/item","value":"glassmaterial"}, + {"op":"test","path":"/input/2/count","value":1}, + {"op":"replace","path":"/input/2/item","value":"glass"}, + {"op":"replace","path":"/input/2/count","value":3} ] ] \ No newline at end of file diff --git a/recipes/furniture1/lights/tier1spotlight.recipe.patch b/recipes/furniture1/lights/tier1spotlight.recipe.patch index c01f905f..5bd1a41c 100644 --- a/recipes/furniture1/lights/tier1spotlight.recipe.patch +++ b/recipes/furniture1/lights/tier1spotlight.recipe.patch @@ -1,7 +1,7 @@ [ [ {"op":"test","path":"/input/2"}, - {"op":"test","path":"/input/2/item","value":"glassmaterial"}, - {"op":"replace","path":"/input/2/item","value":"glass"} + {"op":"test","path":"/input/2/item","value":"glassmaterial"}, + {"op":"replace","path":"/input/2/item","value":"glass"} ] ] \ No newline at end of file diff --git a/recipes/furniture1/materials/wreckplatform.recipe.patch b/recipes/furniture1/materials/wreckplatform.recipe.patch index 1dfa31c7..72b2f50a 100644 --- a/recipes/furniture1/materials/wreckplatform.recipe.patch +++ b/recipes/furniture1/materials/wreckplatform.recipe.patch @@ -1,11 +1,11 @@ [ [ {"op":"test","path":"/input/1/count","value":10}, - {"op":"replace","path":"/input/1/count","value":1} + {"op":"replace","path":"/input/1/count","value":1} ], - + [ {"op":"test","path":"/output/count","value":10}, - {"op":"replace","path":"/output/count","value":40} + {"op":"replace","path":"/output/count","value":40} ] ] \ No newline at end of file diff --git a/recipes/generic/crafting/seeder/syncantentacle.recipe.patch b/recipes/generic/crafting/seeder/syncantentacle.recipe.patch new file mode 100644 index 00000000..b608c3f0 --- /dev/null +++ b/recipes/generic/crafting/seeder/syncantentacle.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"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/heartforge/cupidsback.recipe.patch b/recipes/heartforge/cupidsback.recipe.patch new file mode 100644 index 00000000..9f468818 --- /dev/null +++ b/recipes/heartforge/cupidsback.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"money"}, + {"op":"remove","path":"/input/1"} + ] +] \ No newline at end of file diff --git a/recipes/heartforge/cupidsbow.recipe.patch b/recipes/heartforge/cupidsbow.recipe.patch new file mode 100644 index 00000000..4a1d24f6 --- /dev/null +++ b/recipes/heartforge/cupidsbow.recipe.patch @@ -0,0 +1,9 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"money"}, + {"op":"remove","path":"/input/1"} + ], + [ + {"op":"add","path":"/input/-","value":{"item":"durasteelbar","count":6}} + ] +] \ No newline at end of file diff --git a/recipes/heartforge/cupidschest.recipe.patch b/recipes/heartforge/cupidschest.recipe.patch new file mode 100644 index 00000000..9f468818 --- /dev/null +++ b/recipes/heartforge/cupidschest.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"money"}, + {"op":"remove","path":"/input/1"} + ] +] \ No newline at end of file diff --git a/recipes/heartforge/cupidshead.recipe.patch b/recipes/heartforge/cupidshead.recipe.patch new file mode 100644 index 00000000..9f468818 --- /dev/null +++ b/recipes/heartforge/cupidshead.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"money"}, + {"op":"remove","path":"/input/1"} + ] +] \ No newline at end of file diff --git a/recipes/heartforge/cupidslegs.recipe.patch b/recipes/heartforge/cupidslegs.recipe.patch new file mode 100644 index 00000000..9f468818 --- /dev/null +++ b/recipes/heartforge/cupidslegs.recipe.patch @@ -0,0 +1,6 @@ +[ + [ + {"op":"test","path":"/input/1/item","value":"money"}, + {"op":"remove","path":"/input/1"} + ] +] \ No newline at end of file diff --git a/recipes/heartforge/heartforge.recipe.patch b/recipes/heartforge/heartforge.recipe.patch index ba29c289..473f5d57 100644 --- a/recipes/heartforge/heartforge.recipe.patch +++ b/recipes/heartforge/heartforge.recipe.patch @@ -1,5 +1,12 @@ [ -{"op":"add","path":"/groups/-","value":"craftingstations"}, -{"op":"add","path":"/groups/-","value":"all"}, -{"op":"add","path":"/groups/-","value":"inventorstable"} + [ + {"op":"add","path":"/groups/-","value":"craftingstations"}, + {"op":"add","path":"/groups/-","value":"all"}, + {"op":"add","path":"/groups/-","value":"inventorstable"} + ], + + [ + {"op":"test","path":"/input/2/item","value":"money"}, + {"op":"remove","path":"/input/2"} + ] ] \ No newline at end of file diff --git a/recipes/heartforge/valentinechocolates.recipe.patch b/recipes/heartforge/valentinechocolates.recipe.patch new file mode 100644 index 00000000..fe28d9ee --- /dev/null +++ b/recipes/heartforge/valentinechocolates.recipe.patch @@ -0,0 +1,7 @@ +[ + [ + {"op":"test","path":"/input/0/item","value":"money"}, + {"op":"test","path":"/input/0/count","value":150}, + {"op":"replace","path":"/input/0/count","value":600} + ] +] \ No newline at end of file diff --git a/recipes/inventorstable1/woodencookingtable.recipe.patch b/recipes/inventorstable1/woodencookingtable.recipe.patch index f1b79b59..7603b209 100644 --- a/recipes/inventorstable1/woodencookingtable.recipe.patch +++ b/recipes/inventorstable1/woodencookingtable.recipe.patch @@ -1,6 +1,6 @@ [ [ {"op":"test","path":"/input/2/item","value":"copperbar"}, - {"op":"replace","path":"/input/2/item","value":"silverbar"} + {"op":"replace","path":"/input/2/item","value":"silverbar"} ] ] \ No newline at end of file diff --git a/recipes/old/portable3dprinter/techhull1.recipe.patch b/recipes/old/portable3dprinter/techhull1.recipe.patch new file mode 100644 index 00000000..c5440165 --- /dev/null +++ b/recipes/old/portable3dprinter/techhull1.recipe.patch @@ -0,0 +1,3 @@ +[ +{"op":"add","path":"/input/-","value":{"item":"wire","count":1}} +] \ No newline at end of file diff --git a/recipes/spinningwheel2/objects/mannequin.recipe.patch b/recipes/spinningwheel2/objects/mannequin.recipe.patch index ea9b3ab7..20981cf7 100644 --- a/recipes/spinningwheel2/objects/mannequin.recipe.patch +++ b/recipes/spinningwheel2/objects/mannequin.recipe.patch @@ -1,6 +1,7 @@ [ [{"op":"test","path":"/input/1/count","value":10},{"op":"replace","path":"/input/1/count","value":1}], [{"op":"add","path":"/groups/-","value":"craftingfurniture"}, +{"op":"add","path":"/groups/-","value":"craftingwheel"}, {"op":"add","path":"/groups/-","value":"decoration"}, {"op":"add","path":"/groups/-","value":"all"}] ] \ No newline at end of file diff --git a/recipes/starbound/ammo/bouncybullet.recipe b/recipes/starbound/ammo/anvil/bouncybullet.recipe similarity index 100% rename from recipes/starbound/ammo/bouncybullet.recipe rename to recipes/starbound/ammo/anvil/bouncybullet.recipe diff --git a/recipes/starbound/ammo/explosivebullet.recipe b/recipes/starbound/ammo/anvil/explosivebullet.recipe similarity index 100% rename from recipes/starbound/ammo/explosivebullet.recipe rename to recipes/starbound/ammo/anvil/explosivebullet.recipe diff --git a/recipes/starbound/ammo/fast.recipe b/recipes/starbound/ammo/anvil/fast.recipe similarity index 100% rename from recipes/starbound/ammo/fast.recipe rename to recipes/starbound/ammo/anvil/fast.recipe diff --git a/recipes/starbound/ammo/huntingbullet.recipe b/recipes/starbound/ammo/anvil/huntingbullet.recipe similarity index 100% rename from recipes/starbound/ammo/huntingbullet.recipe rename to recipes/starbound/ammo/anvil/huntingbullet.recipe diff --git a/recipes/starbound/ammo/piercingbullet.recipe b/recipes/starbound/ammo/anvil/piercingbullet.recipe similarity index 100% rename from recipes/starbound/ammo/piercingbullet.recipe rename to recipes/starbound/ammo/anvil/piercingbullet.recipe diff --git a/recipes/starbound/ammo/standardbullet.recipe b/recipes/starbound/ammo/anvil/standardbullet.recipe similarity index 100% rename from recipes/starbound/ammo/standardbullet.recipe rename to recipes/starbound/ammo/anvil/standardbullet.recipe diff --git a/recipes/starbound/ammo/airburstelectricbullet.recipe b/recipes/starbound/ammo/anvil2/airburstelectricbullet.recipe similarity index 100% rename from recipes/starbound/ammo/airburstelectricbullet.recipe rename to recipes/starbound/ammo/anvil2/airburstelectricbullet.recipe diff --git a/recipes/starbound/ammo/airburstfirebullet.recipe b/recipes/starbound/ammo/anvil2/airburstfirebullet.recipe similarity index 100% rename from recipes/starbound/ammo/airburstfirebullet.recipe rename to recipes/starbound/ammo/anvil2/airburstfirebullet.recipe diff --git a/recipes/starbound/ammo/airbursticebullet.recipe b/recipes/starbound/ammo/anvil2/airbursticebullet.recipe similarity index 100% rename from recipes/starbound/ammo/airbursticebullet.recipe rename to recipes/starbound/ammo/anvil2/airbursticebullet.recipe diff --git a/recipes/starbound/ammo/airburstpoisonbullet.recipe b/recipes/starbound/ammo/anvil2/airburstpoisonbullet.recipe similarity index 100% rename from recipes/starbound/ammo/airburstpoisonbullet.recipe rename to recipes/starbound/ammo/anvil2/airburstpoisonbullet.recipe diff --git a/recipes/starbound/ammo/anvil2/homingbullet.recipe b/recipes/starbound/ammo/anvil2/homingbullet.recipe new file mode 100644 index 00000000..4809dd0d --- /dev/null +++ b/recipes/starbound/ammo/anvil2/homingbullet.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["stickofram","sb_gunpowder","lead"], + "output" : ["sb_ammo",75,{"projectileType":"sb_homingbullet"}], + "groups" : ["sb_ammo","craftinganvil2","all"] +} \ No newline at end of file diff --git a/recipes/starbound/backpacks/lightbackpack2.recipe b/recipes/starbound/backpacks/lightbackpack2.recipe deleted file mode 100644 index 15245176..00000000 --- a/recipes/starbound/backpacks/lightbackpack2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["lanternstickback","upgrademodule"], - "output" : "halogenpack", - "groups" : ["craftingfarm2","survival","all"] -} \ No newline at end of file diff --git a/recipes/starbound/backpacks/lightbackpack3.recipe b/recipes/starbound/backpacks/lightbackpack3.recipe deleted file mode 100644 index d9d48c09..00000000 --- a/recipes/starbound/backpacks/lightbackpack3.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["halogenpack","upgrademodule"], - "output" : "xenonpack", - "groups" : ["craftingfarm2","survival","all"] -} \ No newline at end of file diff --git a/recipes/starbound/biomes/bioluminescentcave/glowstickblue.recipe b/recipes/starbound/biomes/bioluminescentcave/glowstickblue.recipe deleted file mode 100644 index 73f5fd28..00000000 --- a/recipes/starbound/biomes/bioluminescentcave/glowstickblue.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_glowfibreblue","glass"], - "output" : "glowstickblue", - "groups" : ["craftingfarm","survival","all"] -} \ No newline at end of file diff --git a/recipes/starbound/biomes/bioluminescentcave/glowstickgreen.recipe b/recipes/starbound/biomes/bioluminescentcave/glowstickgreen.recipe deleted file mode 100644 index 35c5c73e..00000000 --- a/recipes/starbound/biomes/bioluminescentcave/glowstickgreen.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_glowfibregreen","glass"], - "output" : "glowstickgreen", - "groups" : ["craftingfarm","survival","all"] -} \ No newline at end of file diff --git a/recipes/starbound/biomes/bioluminescentcave/glowstickorange.recipe b/recipes/starbound/biomes/bioluminescentcave/glowstickorange.recipe deleted file mode 100644 index 1aef8406..00000000 --- a/recipes/starbound/biomes/bioluminescentcave/glowstickorange.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_glowfibreorange","glass"], - "output" : "glowstickorange", - "groups" : ["craftingfarm","survival","all"] -} \ No newline at end of file diff --git a/recipes/starbound/biomes/bioluminescentcave/glowstickyellow.recipe b/recipes/starbound/biomes/bioluminescentcave/glowstickyellow.recipe deleted file mode 100644 index 519d49f7..00000000 --- a/recipes/starbound/biomes/bioluminescentcave/glowstickyellow.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_glowfibreyellow","glass"], - "output" : "glowstickyellow", - "groups" : ["craftingfarm","survival","all"] -} \ No newline at end of file diff --git a/recipes/starbound/boss/decoyprincess.recipe b/recipes/starbound/boss/decoyprincess.recipe deleted file mode 100644 index 9f7b1a65..00000000 --- a/recipes/starbound/boss/decoyprincess.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["titaniumbar",5],["durasteelbar",5],["fabric",5]],//It's 2022, you gotta get this done sometime! -//I DONT WANNA - "output" : "sb_decoyprincess", - "groups" : ["sb_roboticcraftingtable","sb_objects","all"] -} \ No newline at end of file diff --git a/recipes/starbound/boss/artificialbrain.recipe b/recipes/starbound/boss/robot/artificialbrain.recipe similarity index 100% rename from recipes/starbound/boss/artificialbrain.recipe rename to recipes/starbound/boss/robot/artificialbrain.recipe diff --git a/recipes/starbound/boss/brain.recipe b/recipes/starbound/boss/robot/brain.recipe similarity index 100% rename from recipes/starbound/boss/brain.recipe rename to recipes/starbound/boss/robot/brain.recipe diff --git a/recipes/starbound/boss/brainextractor.recipe b/recipes/starbound/boss/robot/brainextractor.recipe similarity index 100% rename from recipes/starbound/boss/brainextractor.recipe rename to recipes/starbound/boss/robot/brainextractor.recipe diff --git a/recipes/starbound/boss/emptyrobothead.recipe b/recipes/starbound/boss/robot/emptyrobothead.recipe similarity index 100% rename from recipes/starbound/boss/emptyrobothead.recipe rename to recipes/starbound/boss/robot/emptyrobothead.recipe diff --git a/recipes/starbound/boss/robotarms.recipe b/recipes/starbound/boss/robot/robotarms.recipe similarity index 100% rename from recipes/starbound/boss/robotarms.recipe rename to recipes/starbound/boss/robot/robotarms.recipe diff --git a/recipes/starbound/boss/robotchest.recipe b/recipes/starbound/boss/robot/robotchest.recipe similarity index 100% rename from recipes/starbound/boss/robotchest.recipe rename to recipes/starbound/boss/robot/robotchest.recipe diff --git a/recipes/starbound/boss/robothead.recipe b/recipes/starbound/boss/robot/robothead.recipe similarity index 100% rename from recipes/starbound/boss/robothead.recipe rename to recipes/starbound/boss/robot/robothead.recipe diff --git a/recipes/starbound/boss/robotlegs.recipe b/recipes/starbound/boss/robot/robotlegs.recipe similarity index 100% rename from recipes/starbound/boss/robotlegs.recipe rename to recipes/starbound/boss/robot/robotlegs.recipe diff --git a/recipes/starbound/bossloot/asranox.recipe b/recipes/starbound/bossloot/asranox.recipe deleted file mode 100644 index f4f385eb..00000000 --- a/recipes/starbound/bossloot/asranox.recipe +++ /dev/null @@ -1,19 +0,0 @@ -{ - "input" : [ - "snorkelhead", - "valoroushead", - "valorouschest", - "valorouspants", - "hylotlmission2-codex", - "hylotlmission3-codex", - "hylotlmission4-codex", -/* "hylotlmission5-codex", - "hylotlmission6-codex", - "hylotlmission7-codex", - "hylotlmission8-codex", - "hylotlmission9-codex",*/ - "hylotlmission1-codex" - ], - "output" : "asranoxaf", - "groups" : ["sb_treasuredtrophies_outpost_mission3","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/bigape.recipe b/recipes/starbound/bossloot/bigape.recipe deleted file mode 100644 index b7180dcf..00000000 --- a/recipes/starbound/bossloot/bigape.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "visorhead", - "miniknoghead", - "miniknogchest", - "miniknogpants", - "apexmission2-codex", - "apexmission3-codex", - "apexmission4-codex", - "apexmission1-codex" - ], - "output" : "bigapeaf", - "groups" : ["sb_treasuredtrophies_outpost_mission5","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/bonedragon.recipe b/recipes/starbound/bossloot/bonedragon.recipe deleted file mode 100644 index a8d72b72..00000000 --- a/recipes/starbound/bossloot/bonedragon.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "wizardhead", - "wizardchest", - "wizardlegs", - "wizardback", - "glitchmission2-codex", - "glitchmission3-codex", - "glitchmission4-codex", - "glitchmission1-codex" - ], - "output" : "bonedragonaf", - "groups" : ["sb_treasuredtrophies_outpost_mission6","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/dragonhead.recipe b/recipes/starbound/bossloot/dragonhead.recipe deleted file mode 100644 index b31becd2..00000000 --- a/recipes/starbound/bossloot/dragonhead.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "wizardhead", - "wizardchest", - "wizardlegs", - "wizardback", - "glitchmission2-codex", - "glitchmission3-codex", - "glitchmission4-codex", - "glitchmission1-codex" - ], - "output" : "dragonhead", - "groups" : ["sb_treasuredtrophies_outpost_mission6","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/dreadwing.recipe b/recipes/starbound/bossloot/dreadwing.recipe deleted file mode 100644 index 469f3689..00000000 --- a/recipes/starbound/bossloot/dreadwing.recipe +++ /dev/null @@ -1,9 +0,0 @@ -{ - "input" : [ - "bossdreadwing-codex", - "moltencore", - ["sb_dreadwreckage",5] - ], - "output" : "dreadwingaf", - "groups" : ["sb_treasuredtrophies_outpost_beakeasy","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/erchiuseye.recipe b/recipes/starbound/bossloot/erchiuseye.recipe deleted file mode 100644 index 73e8659a..00000000 --- a/recipes/starbound/bossloot/erchiuseye.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "spacesuithead", - "spacesuitchest", - "spacesuitlegs", - "spacesuitback", - "lunarmission2-codex", - "lunarmission3-codex", - "lunarmission4-codex", - "lunarmission1-codex" - ], - "output" : "erchiuseye", - "groups" : ["sb_treasuredtrophies_outpost_mission1","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/erchiushorror.recipe b/recipes/starbound/bossloot/erchiushorror.recipe deleted file mode 100644 index c816fb98..00000000 --- a/recipes/starbound/bossloot/erchiushorror.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "spacesuithead", - "spacesuitchest", - "spacesuitlegs", - "spacesuitback", - "lunarmission2-codex", - "lunarmission3-codex", - "lunarmission4-codex", - "lunarmission1-codex" - ], - "output" : "erchiushorroraf", - "groups" : ["sb_treasuredtrophies_outpost_mission1","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/ixodoom.recipe b/recipes/starbound/bossloot/ixodoom.recipe deleted file mode 100644 index 0133332c..00000000 --- a/recipes/starbound/bossloot/ixodoom.recipe +++ /dev/null @@ -1,16 +0,0 @@ -{ - "input" : [ - "ethnichead", - "vicioushead", - "predatoryhead", - "predatorychest", - "predatorypants", - "predatoryback", - "floranmission2-codex", - "floranmission3-codex", - "floranmission4-codex", - "floranmission1-codex" - ], - "output" : "ixodoomaf", - "groups" : ["sb_treasuredtrophies_outpost_mission2","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/ixodoomclaw.recipe b/recipes/starbound/bossloot/ixodoomclaw.recipe deleted file mode 100644 index f134fe57..00000000 --- a/recipes/starbound/bossloot/ixodoomclaw.recipe +++ /dev/null @@ -1,16 +0,0 @@ -{ - "input" : [ - "ethnichead", - "vicioushead", - "predatoryhead", - "predatorychest", - "predatorypants", - "predatoryback", - "floranmission2-codex", - "floranmission3-codex", - "floranmission4-codex", - "floranmission1-codex" - ], - "output" : "ixodoomclaw", - "groups" : ["sb_treasuredtrophies_outpost_mission2","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/kluexavatar.recipe b/recipes/starbound/bossloot/kluexavatar.recipe deleted file mode 100644 index c66aaee7..00000000 --- a/recipes/starbound/bossloot/kluexavatar.recipe +++ /dev/null @@ -1,15 +0,0 @@ -{ - "input" : [ - "phoenixhat", - "valkyriehelm", - "fullbunnyhead", - "tribalwingsback", - "tribalfeathersback", - "avianmission2-codex", - "avianmission3-codex", - "avianmission4-codex", - "avianmission1-codex" - ], - "output" : "kluexavataraf", - "groups" : ["sb_treasuredtrophies_outpost_mission4","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/kluexstaff.recipe b/recipes/starbound/bossloot/kluexstaff.recipe deleted file mode 100644 index a336a925..00000000 --- a/recipes/starbound/bossloot/kluexstaff.recipe +++ /dev/null @@ -1,15 +0,0 @@ -{ - "input" : [ - "phoenixhat", - "valkyriehelm", - "fullbunnyhead", - "tribalwingsback", - "tribalfeathersback", - "avianmission2-codex", - "avianmission3-codex", - "avianmission4-codex", - "avianmission1-codex" - ], - "output" : "kluexstaff", - "groups" : ["sb_treasuredtrophies_outpost_mission4","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/miniknoglauncher.recipe b/recipes/starbound/bossloot/miniknoglauncher.recipe deleted file mode 100644 index f87845d0..00000000 --- a/recipes/starbound/bossloot/miniknoglauncher.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "visorhead", - "miniknoghead", - "miniknogchest", - "miniknogpants", - "apexmission2-codex", - "apexmission3-codex", - "apexmission4-codex", - "apexmission1-codex" - ], - "output" : "miniknoglauncher", - "groups" : ["sb_treasuredtrophies_outpost_mission5","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/soluskatana.recipe b/recipes/starbound/bossloot/soluskatana.recipe deleted file mode 100644 index 1864a502..00000000 --- a/recipes/starbound/bossloot/soluskatana.recipe +++ /dev/null @@ -1,14 +0,0 @@ -{ - "input" : [ - "snorkelhead", - "valoroushead", - "valorouschest", - "valorouspants", - "hylotlmission2-codex", - "hylotlmission3-codex", - "hylotlmission4-codex", - "hylotlmission1-codex" - ], - "output" : "soluskatana", - "groups" : ["sb_treasuredtrophies_outpost_mission3","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/bossloot/swansong.recipe b/recipes/starbound/bossloot/swansong.recipe deleted file mode 100644 index 9183b687..00000000 --- a/recipes/starbound/bossloot/swansong.recipe +++ /dev/null @@ -1,11 +0,0 @@ -{ - "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"] -} \ No newline at end of file diff --git a/recipes/starbound/campfire/cookedfleshlump.recipe b/recipes/starbound/campfire/cookedfleshlump.recipe deleted file mode 100644 index f7f6c127..00000000 --- a/recipes/starbound/campfire/cookedfleshlump.recipe +++ /dev/null @@ -1,3 +0,0 @@ -{"input":["sb_rawfleshlump"], -"output":"sb_cookedfleshlump", -"groups":["campfire","consumables","sb_healing","all"]} \ No newline at end of file diff --git a/recipes/starbound/campfire/meatchunks.recipe b/recipes/starbound/campfire/meatchunks.recipe deleted file mode 100644 index 88688de6..00000000 --- a/recipes/starbound/campfire/meatchunks.recipe +++ /dev/null @@ -1,3 +0,0 @@ -{"input":["sb_cookedfleshlump"], -"output":"sb_meatchunks", -"groups":["campfire","consumables","all"]} \ No newline at end of file diff --git a/recipes/starbound/campfire/roastbanana.recipe b/recipes/starbound/campfire/roastbanana.recipe deleted file mode 100644 index 7aa4cfa5..00000000 --- a/recipes/starbound/campfire/roastbanana.recipe +++ /dev/null @@ -1,3 +0,0 @@ -{"input":["banana"], -"output":"sb_roastbanana", -"groups":["campfire","consumables","all","sides","sb_healing","sb_energy"]} \ No newline at end of file diff --git a/recipes/starbound/campfire/roastcacti.recipe b/recipes/starbound/campfire/roastcacti.recipe deleted file mode 100644 index 38ac410c..00000000 --- a/recipes/starbound/campfire/roastcacti.recipe +++ /dev/null @@ -1,3 +0,0 @@ -{"input":["cacti"], -"output":"sb_roastcacti", -"groups":["campfire","consumables","all","sides","sb_healing","sb_thorns"]} \ No newline at end of file diff --git a/recipes/starbound/consumables/antidote_biosample.recipe b/recipes/starbound/consumables/antidote_biosample.recipe deleted file mode 100644 index d1a7443c..00000000 --- a/recipes/starbound/consumables/antidote_biosample.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["biosample",4],"bottle"], - "output" : "antidote", - "groups" : ["craftingmedical","healing","all"] -} \ No newline at end of file diff --git a/recipes/starbound/consumables/antidote_poisoncreep.recipe b/recipes/starbound/consumables/antidote_poisoncreep.recipe deleted file mode 100644 index 6c87334f..00000000 --- a/recipes/starbound/consumables/antidote_poisoncreep.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["sb_poisoncreep",2],"bottle"], - "output" : "antidote", - "groups" : ["craftingmedical","healing","all"] -} \ No newline at end of file diff --git a/recipes/starbound/consumables/campfire/cookedfleshlump.recipe b/recipes/starbound/consumables/campfire/cookedfleshlump.recipe new file mode 100644 index 00000000..5a28c3c9 --- /dev/null +++ b/recipes/starbound/consumables/campfire/cookedfleshlump.recipe @@ -0,0 +1,5 @@ +{ + "input": ["sb_rawfleshlump"], + "output": "sb_cookedfleshlump", + "groups": ["campfire", "consumables", "sb_healing", "all"] +} diff --git a/recipes/starbound/consumables/campfire/meatchunks.recipe b/recipes/starbound/consumables/campfire/meatchunks.recipe new file mode 100644 index 00000000..3041bb52 --- /dev/null +++ b/recipes/starbound/consumables/campfire/meatchunks.recipe @@ -0,0 +1,5 @@ +{ + "input": ["sb_cookedfleshlump"], + "output": "sb_meatchunks", + "groups": ["campfire", "consumables", "all"] +} diff --git a/recipes/starbound/consumables/campfire/roastbanana.recipe b/recipes/starbound/consumables/campfire/roastbanana.recipe new file mode 100644 index 00000000..b17bc7ba --- /dev/null +++ b/recipes/starbound/consumables/campfire/roastbanana.recipe @@ -0,0 +1,5 @@ +{ + "input": ["banana"], + "output": "sb_roastbanana", + "groups": ["campfire", "consumables", "all", "sides", "sb_healing", "sb_energy", "sb_energyregen"] +} diff --git a/recipes/starbound/consumables/campfire/roastcacti.recipe b/recipes/starbound/consumables/campfire/roastcacti.recipe new file mode 100644 index 00000000..c24c1a2b --- /dev/null +++ b/recipes/starbound/consumables/campfire/roastcacti.recipe @@ -0,0 +1,5 @@ +{ + "input": ["cacti"], + "output": "sb_roastcacti", + "groups": ["campfire", "consumables", "all", "sides", "sb_healing", "sb_thorns"] +} diff --git a/recipes/starbound/consumables/condiments/peanutbutterjar.recipe b/recipes/starbound/consumables/condiments/peanutbutterjar.recipe new file mode 100644 index 00000000..f2d8d107 --- /dev/null +++ b/recipes/starbound/consumables/condiments/peanutbutterjar.recipe @@ -0,0 +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"} +} \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/applepie.recipe b/recipes/starbound/consumables/desserts/applepie.recipe index 009c1ec7..7183c159 100644 --- a/recipes/starbound/consumables/desserts/applepie.recipe +++ b/recipes/starbound/consumables/desserts/applepie.recipe @@ -1,6 +1,6 @@ { - "input" : ["redapple","wheat","sugar"], + "input" : ["wheat","sugar","redapple","egg"], "output" : "sb_applepie", - "groups" : ["craftingfood","desserts","sb_healing","sb_health","sb_mobility","all"], + "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/blackcurrentcrumble.recipe b/recipes/starbound/consumables/desserts/blackcurrentcrumble.recipe index bfd68e6e..00789a34 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_health","sb_energy","sb_electrified","all"], + "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 4d0e2fc9..e36e470e 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_mobility","sb_health","sb_healing","all"], + "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 a91a072c..71b50858 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_nova","sb_other","all"], + "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 fbf52ab9..7ab62d13 100644 --- a/recipes/starbound/consumables/desserts/butter.recipe +++ b/recipes/starbound/consumables/desserts/butter.recipe @@ -1,6 +1,6 @@ { - "input" : ["milk","sugar"], - "output" : "sb_butter", - "groups" : ["craftingfood","desserts","craftingfood","sb_healing","sb_other","sb_t1food","all"], + "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/candiedpearlpeas.recipe b/recipes/starbound/consumables/desserts/candiedpearlpeas.recipe index 34e3cede..d95744cb 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_protection","sb_healing","sb_t1food","all"], + "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 09572360..5100cbcf 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_t1food","all"], + "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/chocolate.recipe b/recipes/starbound/consumables/desserts/chocolate.recipe index 184d3a11..6d4c4788 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","desserts","sb_mobility","sb_healing","snacks","all"], + "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 b6c39fea..cad21ee5 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_mobility","sb_healing","sb_energy","sb_energyregen","desserts","sb_t1food","all"], + "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 32dfff97..4bfe4461 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_electrified","sb_healing","all"], + "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 7e093de6..9504671c 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_mobility","sb_healing","all"], + "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 7fa974aa..75d4b069 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",3], - "groups" : ["craftingfood","desserts","sb_healing","sb_glow","sb_t1food","all"], + "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 b6d02913..1d3a2dd9 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","all"], + "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/jelly.recipe b/recipes/starbound/consumables/desserts/jelly.recipe index e7fa1787..f9374ab1 100644 --- a/recipes/starbound/consumables/desserts/jelly.recipe +++ b/recipes/starbound/consumables/desserts/jelly.recipe @@ -1,6 +1,6 @@ { - "input" : ["endomorphicjelly","greenslime","sugar"], + "input" : ["endomorphicjelly","sugar"], "output" : ["sb_jelly",3], - "groups" : ["craftingfood","desserts","sb_healing","sb_bouncy","sb_mobility","all"], + "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 97a050bb..3201af01 100644 --- a/recipes/starbound/consumables/desserts/lollypop.recipe +++ b/recipes/starbound/consumables/desserts/lollypop.recipe @@ -1,6 +1,6 @@ { - "input" : [["sugar",2]], + "input" : ["sugar","oculemon"], "output" : "sb_lollypop", - "groups" : ["craftingfood","desserts","sb_healing","sb_mobility","sb_t1food","all"], + "groups" : ["craftingfood","desserts","sb_healing","sb_health","sb_energy","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 3016d8fb..a6072854 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_energy","all"], + "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/peanutbutterjar.recipe b/recipes/starbound/consumables/desserts/peanutbutterjar.recipe deleted file mode 100644 index d0b59f6d..00000000 --- a/recipes/starbound/consumables/desserts/peanutbutterjar.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : ["sb_butter","pearlpea"], - "output" : "sb_peanutbutterjar", - "groups" : ["craftingfood","desserts","sb_healing","sb_protection","sb_t1food","all"], - "collectables" : {"cooking":"sb_peanutbutterjar"} -} \ No newline at end of file diff --git a/recipes/starbound/consumables/desserts/pussplumpie.recipe b/recipes/starbound/consumables/desserts/pussplumpie.recipe index 3348ead7..eb98bdba 100644 --- a/recipes/starbound/consumables/desserts/pussplumpie.recipe +++ b/recipes/starbound/consumables/desserts/pussplumpie.recipe @@ -1,6 +1,6 @@ { - "input" : ["wheat","pussplum","sb_meatchunks"], + "input" : ["wheat","pussplum","rawpoultry"], "output" : "sb_pussplumpie", - "groups" : ["craftingfood","desserts","sb_healing","sb_bouncy","sb_mobility","all"], + "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 82996339..b7896982 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_mobility","sb_t1food","all"], + "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 5317bd1c..acf120d4 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_mobility","sb_electrified","all"], + "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 7dc5be82..208f1484 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_mobility","sb_t1food","all"], + "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 fd8a0b9f..d3a4834e 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_mobility","sb_t1food","all"], + "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 5fbeb9bc..45ae0216 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_mobility","sb_t1food","all"], + "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 8ce0e10b..4ab5acca 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_other","sb_t1food","all"], + "groups" : ["craftingfood","drinks","sb_energy","sb_electrified","sb_t1food","all"], "collectables" : {"cooking":"sb_batteryacid"} } diff --git a/recipes/starbound/consumables/drinks/coffee.recipe b/recipes/starbound/consumables/drinks/coffee.recipe index 57f05b5e..6de60706 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","sb_healing","sb_energy","sb_energyregen","sb_t1food","plain","consumables","all"], + "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 d3390afc..95746e13 100644 --- a/recipes/starbound/consumables/drinks/cordialbottle.recipe +++ b/recipes/starbound/consumables/drinks/cordialbottle.recipe @@ -1,6 +1,6 @@ { - "input" : [["avesmingo",2],"sugar"], + "input" : ["avesmingo","banana","sugar"], "output" : "sb_cordialbottle", - "groups" : ["craftingfood","drinks","sb_power","sb_healing","sb_t1food","all"], + "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 e7f14183..fb4ccec5 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_power","sb_healing","sb_t1food","all"], + "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 d9f6a1df..7fcefce8 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" : ["craftingfood","drinks","sb_power","sb_healing","sb_t1food","all"], + "groups" : ["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 0461929b..7cd39a23 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","sb_healing","sb_energy","sb_energyregen","all"], + "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 bde132a6..a38ec88b 100644 --- a/recipes/starbound/consumables/drinks/liquidcoffee.recipe +++ b/recipes/starbound/consumables/drinks/liquidcoffee.recipe @@ -2,5 +2,9 @@ "input" : ["coffeebeans"], "duration" : 0.5, "output" : ["sb_liquidcoffee",2], - "groups" : ["coffee","sb_coffee","drinks","craftingfood","all"] + "groups" : [ + "sb_coffee","all", + /*MFM*/ "coffeeMFM","ExcludeFromRecipeBook", + /*FU*/ "coffeemachine" + ] } diff --git a/recipes/starbound/consumables/drinks/meatjuice.recipe b/recipes/starbound/consumables/drinks/meatjuice.recipe index 99a8eaad..57282b89 100644 --- a/recipes/starbound/consumables/drinks/meatjuice.recipe +++ b/recipes/starbound/consumables/drinks/meatjuice.recipe @@ -1,6 +1,6 @@ { - "input" : ["alienmeat"], + "input" : ["alienmeat","boneboo"], "output" : "sb_meatjuice", - "groups" : ["craftingfood","drinks","sb_power","sb_healing","sb_t1food","all"], + "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 44b684c3..6fe7d839 100644 --- a/recipes/starbound/consumables/drinks/meatwine.recipe +++ b/recipes/starbound/consumables/drinks/meatwine.recipe @@ -1,6 +1,6 @@ { - "input" : ["alienmeat","grapes"], + "input" : ["alienmeat","boneboo","grapes"], "output" : "sb_meatwine", - "groups" : ["craftingfood","drinks","sb_mobility","sb_power","sb_healing","sb_t1food","all"], + "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/mocha.recipe b/recipes/starbound/consumables/drinks/mocha.recipe index d85206bd..00f6db24 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","sb_healing","sb_energy","sb_energyregen","all"], + "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 54f1da56..7c24dc1a 100644 --- a/recipes/starbound/consumables/drinks/oculemonade.recipe +++ b/recipes/starbound/consumables/drinks/oculemonade.recipe @@ -1,6 +1,6 @@ { - "input" : ["oculemon"], + "input" : ["oculemon","sugar"], "output" : "sb_oculemonade", - "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_t1food","all"], + "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/orangenergyglass.recipe b/recipes/starbound/consumables/drinks/orangenergyglass.recipe index 2e2570cf..253240e0 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_mobility","sb_t1food","all"], + "groups" : ["craftingfood","drinks","sb_health","sb_healing","sb_runboost","sb_t1food","all"], "collectables" : {"cooking":"sb_orangenergyglass"} } diff --git a/recipes/starbound/consumables/drinks/ricevinegar.recipe b/recipes/starbound/consumables/drinks/ricevinegar.recipe index 86de8f7b..da1127ba 100644 --- a/recipes/starbound/consumables/drinks/ricevinegar.recipe +++ b/recipes/starbound/consumables/drinks/ricevinegar.recipe @@ -1,6 +1,6 @@ { "input" : ["liquidwater","rice"], "output" : "sb_ricevinegar", - "groups" : ["craftingfood","drinks","sb_healing","sb_t1food","all"], + "groups" : ["craftingfood","drinks","sb_health","sb_healing","sb_t1food","all"], "collectables" : {"cooking":"sb_ricevinegar"} } diff --git a/recipes/starbound/consumables/drinks/ricewine.recipe b/recipes/starbound/consumables/drinks/ricewine.recipe index c93e1e2f..3a212bc4 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_power","sb_healing","sb_t1food","all"], + "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 81fb4b34..97279f49 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_health","sb_healing","sb_t1food","all"], + "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 b1129fbf..0d029bfb 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_health","sb_healing","sb_t1food","all"], + "groups" : ["craftingfood","drinks","sb_energy","sb_healing","sb_t1food","all"], "collectables" : {"cooking":"sb_rootpopflask"} } diff --git a/recipes/starbound/consumables/drinks/wartwine.recipe b/recipes/starbound/consumables/drinks/wartwine.recipe index 407ff4b2..a6f463b1 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_health","sb_power","sb_healing","sb_t1food","all"], + "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 33cc46e7..febe26be 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_energy","sb_power","sb_healing","sb_t1food","all"], + "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 7ccdb3a7..8984d5ef 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_power","sb_healing","all"], + "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 460a06d7..5c7216b3 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_power","sb_healing","all"], + "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 a9c29a70..d067639c 100644 --- a/recipes/starbound/consumables/drinks/winebottle.recipe +++ b/recipes/starbound/consumables/drinks/winebottle.recipe @@ -1,6 +1,6 @@ { - "input" : [["avesmingo",2],"grapes","sugar"], + "input" : ["pussplum","grapes","sugar"], "output" : "sb_winebottle", - "groups" : ["craftingfood","drinks","sb_power","sb_healing","sb_health","all"], + "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 8ac848c9..f44b0a27 100644 --- a/recipes/starbound/consumables/drinks/wineglass.recipe +++ b/recipes/starbound/consumables/drinks/wineglass.recipe @@ -1,6 +1,6 @@ { - "input" : ["avesmingo","grapes","sugar"], + "input" : ["grapes","sugar"], "output" : "sb_wineglass", - "groups" : ["craftingfood","drinks","sb_power","sb_healing","sb_health","all"], + "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/chilistew.recipe b/recipes/starbound/consumables/entrees/chilistew.recipe index d4f3d531..c738b0f2 100644 --- a/recipes/starbound/consumables/entrees/chilistew.recipe +++ b/recipes/starbound/consumables/entrees/chilistew.recipe @@ -1,5 +1,5 @@ { - "input" : ["tomato","chili","sb_meatchunks"], + "input" : ["tomato","chili","alienmeat"], "output" : "sb_chilistew", "groups" : ["craftingfood","mains","sb_health","sb_healing","sb_nova","sb_other","all"], "collectables" : {"cooking":"sb_chilistew"} diff --git a/recipes/starbound/consumables/entrees/crystalnachos.recipe b/recipes/starbound/consumables/entrees/crystalnachos.recipe index 0e49a724..7354b486 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_health","sb_glow","all"], + "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 4e046eb9..da63395a 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_mobility","sb_healing","sb_nova","sb_other","sb_t1food","all"], + "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/meatandmarrow.recipe b/recipes/starbound/consumables/entrees/meatandmarrow.recipe index 44fa0bcc..631f874b 100644 --- a/recipes/starbound/consumables/entrees/meatandmarrow.recipe +++ b/recipes/starbound/consumables/entrees/meatandmarrow.recipe @@ -1,6 +1,6 @@ { - "input" : ["boneboo","sb_meatchunks"], + "input" : ["boneboo","alienmeat"], "output" : "sb_meatandmarrow", - "groups" : ["craftingfood","mains","sb_healing","sb_power","sb_t1food","all"], + "groups" : ["craftingfood","mains","sb_healing","sb_health","sb_rage","sb_t1food","all"], "collectables" : {"cooking":"sb_meatandmarrow"} } diff --git a/recipes/starbound/consumables/entrees/poachedavesmingo.recipe b/recipes/starbound/consumables/entrees/poachedavesmingo.recipe index f5682d13..17142802 100644 --- a/recipes/starbound/consumables/entrees/poachedavesmingo.recipe +++ b/recipes/starbound/consumables/entrees/poachedavesmingo.recipe @@ -1,6 +1,6 @@ { - "input" : ["avesmingo","sb_wartjuice"], + "input" : ["avesmingo","sb_wartwine"], "output" : "sb_poachedavesmingo", - "groups" : ["craftingfood","mains","sb_health","sb_power","sb_mobility","sb_healing","sb_t1food","all"], + "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/soup.recipe b/recipes/starbound/consumables/entrees/soup.recipe deleted file mode 100644 index 983dcc1d..00000000 --- a/recipes/starbound/consumables/entrees/soup.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : ["tomato","chili"], - "output" : "sb_soup", - "groups" : ["craftingfood","mains","sb_healing","sb_health","sb_nova","sb_other","sb_t1food","all"], - "collectables" : {"cooking":"sb_soup"} -} \ No newline at end of file diff --git a/recipes/starbound/consumables/entrees/thespecial.recipe b/recipes/starbound/consumables/entrees/thespecial.recipe index 57c87f54..c2d8e307 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_power","sb_healing","all"], + "groups" : ["craftingfood","mains","sb_health","sb_rage","sb_healing","all"], "collectables" : {"cooking":"sb_thespecial"} } diff --git a/recipes/starbound/consumables/fungusstim.recipe b/recipes/starbound/consumables/fungusstim.recipe deleted file mode 100644 index 46104466..00000000 --- a/recipes/starbound/consumables/fungusstim.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["shroom",5],"livingroot","syringe"], - "output" : "fungusstim", - "groups" : ["craftingmedical2","buffs","all"] -} \ No newline at end of file diff --git a/recipes/starbound/consumables/greenstim.recipe b/recipes/starbound/consumables/greenstim.recipe deleted file mode 100644 index 8aa85565..00000000 --- a/recipes/starbound/consumables/greenstim.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["biosample",4],"syringe"], - "output" : "greenstim", - "groups" : ["craftingmedical2","buffs","all"] -} \ No newline at end of file diff --git a/recipes/starbound/consumables/gauze.recipe b/recipes/starbound/consumables/medical1/gauze.recipe similarity index 100% rename from recipes/starbound/consumables/gauze.recipe rename to recipes/starbound/consumables/medical1/gauze.recipe diff --git a/recipes/starbound/consumables/grassremedy.recipe b/recipes/starbound/consumables/medical1/grassremedy.recipe similarity index 100% rename from recipes/starbound/consumables/grassremedy.recipe rename to recipes/starbound/consumables/medical1/grassremedy.recipe diff --git a/recipes/starbound/consumables/shroomremedy.recipe b/recipes/starbound/consumables/medical1/shroomremedy.recipe similarity index 100% rename from recipes/starbound/consumables/shroomremedy.recipe rename to recipes/starbound/consumables/medical1/shroomremedy.recipe diff --git a/recipes/starbound/consumables/medical2/fungusstim.recipe b/recipes/starbound/consumables/medical2/fungusstim.recipe new file mode 100644 index 00000000..d1b5811d --- /dev/null +++ b/recipes/starbound/consumables/medical2/fungusstim.recipe @@ -0,0 +1,5 @@ +{ + "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/greystim.recipe b/recipes/starbound/consumables/medical2/greystim.recipe similarity index 100% rename from recipes/starbound/consumables/greystim.recipe rename to recipes/starbound/consumables/medical2/greystim.recipe diff --git a/recipes/starbound/consumables/synthesisstim.recipe b/recipes/starbound/consumables/medical2/synthesisstim.recipe similarity index 100% rename from recipes/starbound/consumables/synthesisstim.recipe rename to recipes/starbound/consumables/medical2/synthesisstim.recipe diff --git a/recipes/starbound/consumables/medkit.recipe b/recipes/starbound/consumables/medkit.recipe deleted file mode 100644 index b53193ca..00000000 --- a/recipes/starbound/consumables/medkit.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["biosample","bandage"], - "output" : "medkit", - "groups" : ["craftingmedical","healing","all"] -} \ No newline at end of file diff --git a/recipes/starbound/consumables/sides/boneboomarrow.recipe b/recipes/starbound/consumables/sides/boneboomarrow.recipe index b46f1023..313f21b9 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_power","sb_t1food","all"], + "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/toast.recipe b/recipes/starbound/consumables/sides/toast.recipe index 1cd006a6..ff42a268 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_t1food","all"], + "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/consumables/yellowstim.recipe b/recipes/starbound/consumables/yellowstim.recipe deleted file mode 100644 index a1770c30..00000000 --- a/recipes/starbound/consumables/yellowstim.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["toxicwaste",4],"syringe"], - "output" : "yellowstim", - "groups" : ["craftingmedical","buffs","all"] -} \ No newline at end of file diff --git a/recipes/starbound/conversion/skyrail_desc.recipe b/recipes/starbound/conversion/skyrail_desc.recipe deleted file mode 100644 index 8bb090d7..00000000 --- a/recipes/starbound/conversion/skyrail_desc.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["skyrail_asc"], - "output" : "skyrail_desc", - "groups" : ["skyrailtable","sb_convert","nouncrafting","all"] -} diff --git a/recipes/starbound/conversion/skyrail_diodel.recipe b/recipes/starbound/conversion/skyrail_diodel.recipe deleted file mode 100644 index bc92f01c..00000000 --- a/recipes/starbound/conversion/skyrail_diodel.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["skyrail_diodeR"], - "output" : "skyrail_diodeL", - "groups" : ["skyrailtable","sb_convert","nouncrafting","all"] -} diff --git a/recipes/starbound/conversion/skyrail_dioder.recipe b/recipes/starbound/conversion/skyrail_dioder.recipe deleted file mode 100644 index 792093ed..00000000 --- a/recipes/starbound/conversion/skyrail_dioder.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["skyrail_diodeL"], - "output" : "skyrail_diodeR", - "groups" : ["skyrailtable","sb_convert","nouncrafting","all"] -} diff --git a/recipes/starbound/conversion/skyrailboost.recipe b/recipes/starbound/conversion/skyrailboost.recipe deleted file mode 100644 index d49cf2b9..00000000 --- a/recipes/starbound/conversion/skyrailboost.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["skyrailbreak"], - "output" : "skyrailboost", - "groups" : ["skyrailtable","sb_convert","nouncrafting","all"] -} diff --git a/recipes/starbound/conversion/skyrailbreak.recipe b/recipes/starbound/conversion/skyrailbreak.recipe deleted file mode 100644 index f9918c55..00000000 --- a/recipes/starbound/conversion/skyrailbreak.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["skyrailboost"], - "output" : "skyrailbreak", - "groups" : ["skyrailtable","sb_convert","nouncrafting","all"] -} diff --git a/recipes/starbound/crafting/lectern.recipe b/recipes/starbound/crafting/inventors/lectern.recipe similarity index 100% rename from recipes/starbound/crafting/lectern.recipe rename to recipes/starbound/crafting/inventors/lectern.recipe diff --git a/recipes/starbound/crafting/woodencookingtable.recipe b/recipes/starbound/crafting/inventors/woodencookingtable.recipe similarity index 100% rename from recipes/starbound/crafting/woodencookingtable.recipe rename to recipes/starbound/crafting/inventors/woodencookingtable.recipe diff --git a/recipes/starbound/crafting/woodencraftingtable.recipe b/recipes/starbound/crafting/inventors/woodencraftingtable.recipe similarity index 100% rename from recipes/starbound/crafting/woodencraftingtable.recipe rename to recipes/starbound/crafting/inventors/woodencraftingtable.recipe diff --git a/recipes/starbound/crafting/wrappingtable.recipe b/recipes/starbound/crafting/inventors/wrappingtable.recipe similarity index 100% rename from recipes/starbound/crafting/wrappingtable.recipe rename to recipes/starbound/crafting/inventors/wrappingtable.recipe diff --git a/recipes/starbound/crafting/ironcraftingtable.recipe b/recipes/starbound/crafting/inventors2/ironcraftingtable.recipe similarity index 100% rename from recipes/starbound/crafting/ironcraftingtable.recipe rename to recipes/starbound/crafting/inventors2/ironcraftingtable.recipe diff --git a/recipes/starbound/crafting/roboticcraftingtable.recipe b/recipes/starbound/crafting/inventors2/roboticcraftingtable.recipe similarity index 100% rename from recipes/starbound/crafting/roboticcraftingtable.recipe rename to recipes/starbound/crafting/inventors2/roboticcraftingtable.recipe diff --git a/recipes/starbound/crafting/cookingstation.recipe b/recipes/starbound/crafting/inventors3/cookingstation.recipe similarity index 100% rename from recipes/starbound/crafting/cookingstation.recipe rename to recipes/starbound/crafting/inventors3/cookingstation.recipe diff --git a/recipes/starbound/crafting/mechassemblystation.recipe b/recipes/starbound/crafting/inventors3/mechassemblystation.recipe similarity index 100% rename from recipes/starbound/crafting/mechassemblystation.recipe rename to recipes/starbound/crafting/inventors3/mechassemblystation.recipe diff --git a/recipes/starbound/crafting/mechcraftingtable.recipe b/recipes/starbound/crafting/inventors3/mechcraftingtable.recipe similarity index 100% rename from recipes/starbound/crafting/mechcraftingtable.recipe rename to recipes/starbound/crafting/inventors3/mechcraftingtable.recipe diff --git a/recipes/starbound/crafting/researchstation.recipe b/recipes/starbound/crafting/inventors3/researchstation.recipe similarity index 100% rename from recipes/starbound/crafting/researchstation.recipe rename to recipes/starbound/crafting/inventors3/researchstation.recipe diff --git a/recipes/starbound/crafting/spawnerstation.recipe b/recipes/starbound/crafting/inventors3/spawnerstation.recipe similarity index 100% rename from recipes/starbound/crafting/spawnerstation.recipe rename to recipes/starbound/crafting/inventors3/spawnerstation.recipe diff --git a/recipes/starbound/crafting/techconsole.recipe b/recipes/starbound/crafting/inventors3/techconsole.recipe similarity index 100% rename from recipes/starbound/crafting/techconsole.recipe rename to recipes/starbound/crafting/inventors3/techconsole.recipe diff --git a/recipes/starbound/crafting/old/acceleratortable.recipe b/recipes/starbound/crafting/old/acceleratortable.recipe deleted file mode 100644 index 0b46bd09..00000000 --- a/recipes/starbound/crafting/old/acceleratortable.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["durasteelbar",10],["refinedaegisalt",10]], - "output" : "sb_acceleratortable", - "groups" : ["sb_scifianvil","sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/ironanvil.recipe b/recipes/starbound/crafting/old/ironanvil.recipe deleted file mode 100644 index 0a6ac0c2..00000000 --- a/recipes/starbound/crafting/old/ironanvil.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["ironbar",8]], - "output" : "sb_ironanvil", - "groups" : ["sb_anvil","sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/ironfurnace.recipe b/recipes/starbound/crafting/old/ironfurnace.recipe deleted file mode 100644 index 65cc5bb9..00000000 --- a/recipes/starbound/crafting/old/ironfurnace.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["ironbar",10],["glass",5],"sb_stonefurnace"], - "output" : "sb_alloyfurnace", - "groups" : ["sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/manipulatortable.recipe b/recipes/starbound/crafting/old/manipulatortable.recipe deleted file mode 100644 index c9ebede8..00000000 --- a/recipes/starbound/crafting/old/manipulatortable.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["durasteelbar",10],["sb_refinedrubium",10]], - "output" : "sb_manipulatortable", - "groups" : ["sb_scifianvil","sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/metalworkstation.recipe b/recipes/starbound/crafting/old/metalworkstation.recipe deleted file mode 100644 index ad166292..00000000 --- a/recipes/starbound/crafting/old/metalworkstation.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_ironanvil",["tungstenbar",5],"moltencore"], - "output" : "sb_metalworkstation", - "groups" : ["sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/scifianvil.recipe b/recipes/starbound/crafting/old/scifianvil.recipe deleted file mode 100644 index c1ae8fd2..00000000 --- a/recipes/starbound/crafting/old/scifianvil.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["endomorphicjelly",["durasteelbar",10]], - "output" : "sb_scifianvil", - "groups" : ["sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/scififurnace.recipe b/recipes/starbound/crafting/old/scififurnace.recipe deleted file mode 100644 index 32e3056b..00000000 --- a/recipes/starbound/crafting/old/scififurnace.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["glass",10],["uraniumrod",10],["titaniumbar",10],["silverbar",10]], - "output" : "sb_scififurnace", - "groups" : ["sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/separatortable.recipe b/recipes/starbound/crafting/old/separatortable.recipe deleted file mode 100644 index 4bc429c0..00000000 --- a/recipes/starbound/crafting/old/separatortable.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["durasteelbar",10],["refinedviolium",10]], - "output" : "sb_separatortable", - "groups" : ["sb_scifianvil","sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/old/stonefurnace.recipe b/recipes/starbound/crafting/old/stonefurnace.recipe deleted file mode 100644 index e2eabd48..00000000 --- a/recipes/starbound/crafting/old/stonefurnace.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["cobblestonematerial",25],"campfire"], - "output" : "sb_stonefurnace", - "groups" : ["sb_stations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/racial/apextech.recipe b/recipes/starbound/crafting/racial/apextech.recipe deleted file mode 100644 index 9a1e9de5..00000000 --- a/recipes/starbound/crafting/racial/apextech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/aviantech.recipe b/recipes/starbound/crafting/racial/aviantech.recipe deleted file mode 100644 index 7ba0dd81..00000000 --- a/recipes/starbound/crafting/racial/aviantech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation_avian", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/florantech.recipe b/recipes/starbound/crafting/racial/florantech.recipe deleted file mode 100644 index bae6e550..00000000 --- a/recipes/starbound/crafting/racial/florantech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation_floran", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/apexfuel.recipe b/recipes/starbound/crafting/racial/fuel/apexfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/apexfuel.recipe rename to recipes/starbound/crafting/racial/fuel/apexfuel.recipe diff --git a/recipes/starbound/crafting/racial/avianfuel.recipe b/recipes/starbound/crafting/racial/fuel/avianfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/avianfuel.recipe rename to recipes/starbound/crafting/racial/fuel/avianfuel.recipe diff --git a/recipes/starbound/crafting/racial/floranfuel.recipe b/recipes/starbound/crafting/racial/fuel/floranfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/floranfuel.recipe rename to recipes/starbound/crafting/racial/fuel/floranfuel.recipe diff --git a/recipes/starbound/crafting/racial/glitchfuel.recipe b/recipes/starbound/crafting/racial/fuel/glitchfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/glitchfuel.recipe rename to recipes/starbound/crafting/racial/fuel/glitchfuel.recipe diff --git a/recipes/starbound/crafting/racial/humanfuel.recipe b/recipes/starbound/crafting/racial/fuel/humanfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/humanfuel.recipe rename to recipes/starbound/crafting/racial/fuel/humanfuel.recipe diff --git a/recipes/starbound/crafting/racial/hylotlfuel.recipe b/recipes/starbound/crafting/racial/fuel/hylotlfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/hylotlfuel.recipe rename to recipes/starbound/crafting/racial/fuel/hylotlfuel.recipe diff --git a/recipes/starbound/crafting/racial/novakidfuel.recipe b/recipes/starbound/crafting/racial/fuel/novakidfuel.recipe similarity index 100% rename from recipes/starbound/crafting/racial/novakidfuel.recipe rename to recipes/starbound/crafting/racial/fuel/novakidfuel.recipe diff --git a/recipes/starbound/crafting/racial/glitchtech.recipe b/recipes/starbound/crafting/racial/glitchtech.recipe deleted file mode 100644 index 27b2e469..00000000 --- a/recipes/starbound/crafting/racial/glitchtech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation_glitch", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/humantech.recipe b/recipes/starbound/crafting/racial/humantech.recipe deleted file mode 100644 index acd0db15..00000000 --- a/recipes/starbound/crafting/racial/humantech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation_human", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/hylotltech.recipe b/recipes/starbound/crafting/racial/hylotltech.recipe deleted file mode 100644 index c60d5d7c..00000000 --- a/recipes/starbound/crafting/racial/hylotltech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation_hylotl", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/novakidtech.recipe b/recipes/starbound/crafting/racial/novakidtech.recipe deleted file mode 100644 index b5dbc2cc..00000000 --- a/recipes/starbound/crafting/racial/novakidtech.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["upgrademodule",["platinumbar",5],["wire",20],"techconsole"], - "output" : "sb_techstation_novakid", - "groups" : ["sb_roboticcraftingtable","sb_stations","all"] -} diff --git a/recipes/starbound/crafting/racial/tech/apextech.recipe b/recipes/starbound/crafting/racial/tech/apextech.recipe new file mode 100644 index 00000000..cc8b498f --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/apextech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/racial/tech/aviantech.recipe b/recipes/starbound/crafting/racial/tech/aviantech.recipe new file mode 100644 index 00000000..64cb1781 --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/aviantech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation_avian", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/racial/tech/florantech.recipe b/recipes/starbound/crafting/racial/tech/florantech.recipe new file mode 100644 index 00000000..db44ab64 --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/florantech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation_floran", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/racial/tech/glitchtech.recipe b/recipes/starbound/crafting/racial/tech/glitchtech.recipe new file mode 100644 index 00000000..621124bf --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/glitchtech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation_glitch", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/racial/tech/humantech.recipe b/recipes/starbound/crafting/racial/tech/humantech.recipe new file mode 100644 index 00000000..b5b5beb4 --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/humantech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation_human", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/racial/tech/hylotltech.recipe b/recipes/starbound/crafting/racial/tech/hylotltech.recipe new file mode 100644 index 00000000..fb1b0d93 --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/hylotltech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation_hylotl", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/racial/tech/novakidtech.recipe b/recipes/starbound/crafting/racial/tech/novakidtech.recipe new file mode 100644 index 00000000..8fe565b4 --- /dev/null +++ b/recipes/starbound/crafting/racial/tech/novakidtech.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["platinumbar",5],["wire",5],"siliconboard","stickofram"], + "output" : "sb_techstation_novakid", + "groups" : ["sb_roboticcraftingtable","sb_stations","all"] +} diff --git a/recipes/starbound/crafting/skyrailrailtabletable.recipe b/recipes/starbound/crafting/skyrailrailtabletable.recipe deleted file mode 100644 index 3ca5ce0e..00000000 --- a/recipes/starbound/crafting/skyrailrailtabletable.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_skyrailtable","railcraftingtable"], - "output" : "sb_skyrailrailtable", - "groups" : ["inventorstable3","craftingstations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/crafting/skyrailtable.recipe b/recipes/starbound/crafting/skyrailtable.recipe deleted file mode 100644 index fdd0ed4a..00000000 --- a/recipes/starbound/crafting/skyrailtable.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["silverbar",10]], - "output" : "sb_skyrailtable", - "groups" : ["inventorstable3","craftingstations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/ceruliumcompound.recipe b/recipes/starbound/furnace/ceruliumcompound.recipe deleted file mode 100644 index 108b960f..00000000 --- a/recipes/starbound/furnace/ceruliumcompound.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["sb_ceruliumore",2]], - "output" : "sb_ceruliumcompound", - "duration" : 0.15, - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/feroziumcompound_gold.recipe b/recipes/starbound/furnace/feroziumcompound_gold.recipe deleted file mode 100644 index 5440c4ca..00000000 --- a/recipes/starbound/furnace/feroziumcompound_gold.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["refinedferozium",2],"goldbar"], - "output" : "sb_feroziumcompound", - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/feroziumcompound_solarium.recipe b/recipes/starbound/furnace/feroziumcompound_solarium.recipe deleted file mode 100644 index c5f07f60..00000000 --- a/recipes/starbound/furnace/feroziumcompound_solarium.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["refinedferozium",2],"solariumstar"], - "output" : ["sb_feroziumcompound",2], - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/coalore.recipe b/recipes/starbound/furnace/furnace1/bars/coalore.recipe similarity index 100% rename from recipes/starbound/furnace/coalore.recipe rename to recipes/starbound/furnace/furnace1/bars/coalore.recipe diff --git a/recipes/starbound/furnace/diamond.recipe b/recipes/starbound/furnace/furnace1/bars/diamond.recipe similarity index 100% rename from recipes/starbound/furnace/diamond.recipe rename to recipes/starbound/furnace/furnace1/bars/diamond.recipe diff --git a/recipes/starbound/furnace/platinumbar.recipe b/recipes/starbound/furnace/furnace1/bars/platinumbar.recipe similarity index 100% rename from recipes/starbound/furnace/platinumbar.recipe rename to recipes/starbound/furnace/furnace1/bars/platinumbar.recipe diff --git a/recipes/starbound/reagent/glass.recipe b/recipes/starbound/furnace/furnace1/ingredients/glass.recipe similarity index 100% rename from recipes/starbound/reagent/glass.recipe rename to recipes/starbound/furnace/furnace1/ingredients/glass.recipe diff --git a/recipes/starbound/reagent/glasscoffeemug.recipe b/recipes/starbound/furnace/furnace1/ingredients/glasscoffeemug.recipe similarity index 100% rename from recipes/starbound/reagent/glasscoffeemug.recipe rename to recipes/starbound/furnace/furnace1/ingredients/glasscoffeemug.recipe diff --git a/recipes/starbound/reagent/gunpowder.recipe b/recipes/starbound/furnace/furnace1/ingredients/gunpowder.recipe similarity index 100% rename from recipes/starbound/reagent/gunpowder.recipe rename to recipes/starbound/furnace/furnace1/ingredients/gunpowder.recipe diff --git a/recipes/starbound/reagent/leather.recipe b/recipes/starbound/furnace/furnace1/ingredients/leather.recipe similarity index 100% rename from recipes/starbound/reagent/leather.recipe rename to recipes/starbound/furnace/furnace1/ingredients/leather.recipe diff --git a/recipes/starbound/other/mysteriousashes.recipe b/recipes/starbound/furnace/furnace1/ingredients/mysteriousashes.recipe similarity index 100% rename from recipes/starbound/other/mysteriousashes.recipe rename to recipes/starbound/furnace/furnace1/ingredients/mysteriousashes.recipe diff --git a/recipes/starbound/furnace/furnace1/ingredients/screws.recipe b/recipes/starbound/furnace/furnace1/ingredients/screws.recipe new file mode 100644 index 00000000..9b7e153c --- /dev/null +++ b/recipes/starbound/furnace/furnace1/ingredients/screws.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["ironbar"], + "output" : ["screws",8], + "groups" : ["craftingfurnace","ingredients","all"] +} \ No newline at end of file diff --git a/recipes/starbound/reagent/volatilepowder.recipe b/recipes/starbound/furnace/furnace1/ingredients/volatilepowder.recipe similarity index 100% rename from recipes/starbound/reagent/volatilepowder.recipe rename to recipes/starbound/furnace/furnace1/ingredients/volatilepowder.recipe diff --git a/recipes/starbound/furnace/steelbar_coal.recipe b/recipes/starbound/furnace/furnace2/bars/steelbar_coal.recipe similarity index 100% rename from recipes/starbound/furnace/steelbar_coal.recipe rename to recipes/starbound/furnace/furnace2/bars/steelbar_coal.recipe diff --git a/recipes/starbound/furnace/steelbar_copper.recipe b/recipes/starbound/furnace/furnace2/bars/steelbar_copper.recipe similarity index 100% rename from recipes/starbound/furnace/steelbar_copper.recipe rename to recipes/starbound/furnace/furnace2/bars/steelbar_copper.recipe diff --git a/recipes/starbound/furnace/steelbar_oil.recipe b/recipes/starbound/furnace/furnace2/bars/steelbar_oil.recipe similarity index 100% rename from recipes/starbound/furnace/steelbar_oil.recipe rename to recipes/starbound/furnace/furnace2/bars/steelbar_oil.recipe diff --git a/recipes/starbound/furnace/uraniumrod.recipe b/recipes/starbound/furnace/furnace2/bars/uraniumrod.recipe similarity index 100% rename from recipes/starbound/furnace/uraniumrod.recipe rename to recipes/starbound/furnace/furnace2/bars/uraniumrod.recipe diff --git a/recipes/starbound/reagent/polymer_coal.recipe b/recipes/starbound/furnace/furnace2/ingredients/polymer_coal.recipe similarity index 100% rename from recipes/starbound/reagent/polymer_coal.recipe rename to recipes/starbound/furnace/furnace2/ingredients/polymer_coal.recipe diff --git a/recipes/starbound/reagent/polymer_oil.recipe b/recipes/starbound/furnace/furnace2/ingredients/polymer_oil.recipe similarity index 100% rename from recipes/starbound/reagent/polymer_oil.recipe rename to recipes/starbound/furnace/furnace2/ingredients/polymer_oil.recipe diff --git a/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe new file mode 100644 index 00000000..20371b5e --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound.recipe @@ -0,0 +1,6 @@ +{ + "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/ceruliumcompound_rubium.recipe b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_rubium.recipe similarity index 75% rename from recipes/starbound/furnace/ceruliumcompound_rubium.recipe rename to recipes/starbound/furnace/furnace3/bars/ceruliumcompound_rubium.recipe index 099f0c19..4f787053 100644 --- a/recipes/starbound/furnace/ceruliumcompound_rubium.recipe +++ b/recipes/starbound/furnace/furnace3/bars/ceruliumcompound_rubium.recipe @@ -1,6 +1,6 @@ { "input" : [["sb_refinedrubium",2],"solariumstar"], - "output" : ["sb_ceruliumcompound",2], + "output" : "sb_ceruliumcompound", "duration" : 0.15, "groups" : ["craftingfurnace3","bars","all"] } \ No newline at end of file diff --git a/recipes/starbound/furnace/durasteelbar_silver.recipe b/recipes/starbound/furnace/furnace3/bars/durasteelbar_silver.recipe similarity index 100% rename from recipes/starbound/furnace/durasteelbar_silver.recipe rename to recipes/starbound/furnace/furnace3/bars/durasteelbar_silver.recipe diff --git a/recipes/starbound/furnace/durasteelbar_steel.recipe b/recipes/starbound/furnace/furnace3/bars/durasteelbar_steel.recipe similarity index 100% rename from recipes/starbound/furnace/durasteelbar_steel.recipe rename to recipes/starbound/furnace/furnace3/bars/durasteelbar_steel.recipe diff --git a/recipes/starbound/furnace/durasteelbar_uranium.recipe b/recipes/starbound/furnace/furnace3/bars/durasteelbar_uranium.recipe similarity index 100% rename from recipes/starbound/furnace/durasteelbar_uranium.recipe rename to recipes/starbound/furnace/furnace3/bars/durasteelbar_uranium.recipe diff --git a/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe new file mode 100644 index 00000000..cd660b34 --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_plutonium.recipe @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 00000000..be79ef06 --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/feroziumcompound_solarium.recipe @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 00000000..8d7fc4aa --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/imperviumcompound_plutonium.recipe @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 00000000..686fdb77 --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/imperviumcompound_solarium.recipe @@ -0,0 +1,6 @@ +{ + "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/plutoniumrod.recipe b/recipes/starbound/furnace/furnace3/bars/plutoniumrod.recipe similarity index 100% rename from recipes/starbound/furnace/plutoniumrod.recipe rename to recipes/starbound/furnace/furnace3/bars/plutoniumrod.recipe diff --git a/recipes/starbound/furnace/refinedrubium.recipe b/recipes/starbound/furnace/furnace3/bars/refinedrubium.recipe similarity index 100% rename from recipes/starbound/furnace/refinedrubium.recipe rename to recipes/starbound/furnace/furnace3/bars/refinedrubium.recipe diff --git a/recipes/starbound/furnace/furnace3/bars/transmutate/aegisalt_ferozium.recipe b/recipes/starbound/furnace/furnace3/bars/transmutate/aegisalt_ferozium.recipe new file mode 100644 index 00000000..a8d17e5b --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/transmutate/aegisalt_ferozium.recipe @@ -0,0 +1,6 @@ +{ + "input" : [["refinedaegisalt",2],"platinumbar"], + "output" : "refinedferozium", + "duration" : 0.15, + "groups" : ["craftingfurnace3","bars","all"] +} \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/transmutate/ferozium_violium.recipe b/recipes/starbound/furnace/furnace3/bars/transmutate/ferozium_violium.recipe new file mode 100644 index 00000000..4f3a316c --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/transmutate/ferozium_violium.recipe @@ -0,0 +1,6 @@ +{ + "input" : [["refinedferozium",2],"platinumbar"], + "output" : "refinedviolium", + "duration" : 0.15, + "groups" : ["craftingfurnace3","bars","all"] +} \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/transmutate/rubium_aegisalt.recipe b/recipes/starbound/furnace/furnace3/bars/transmutate/rubium_aegisalt.recipe new file mode 100644 index 00000000..a1f7c1d3 --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/transmutate/rubium_aegisalt.recipe @@ -0,0 +1,6 @@ +{ + "input" : [["sb_refinedrubium",2],"platinumbar"], + "output" : "refinedaegisalt", + "duration" : 0.15, + "groups" : ["craftingfurnace3","bars","all"] +} \ No newline at end of file diff --git a/recipes/starbound/furnace/furnace3/bars/transmutate/violium_rubium.recipe b/recipes/starbound/furnace/furnace3/bars/transmutate/violium_rubium.recipe new file mode 100644 index 00000000..ea7d275c --- /dev/null +++ b/recipes/starbound/furnace/furnace3/bars/transmutate/violium_rubium.recipe @@ -0,0 +1,6 @@ +{ + "input" : [["refinedviolium",2],"platinumbar"], + "output" : "sb_refinedrubium", + "duration" : 0.15, + "groups" : ["craftingfurnace3","bars","all"] +} \ No newline at end of file diff --git a/recipes/starbound/furnace/aegisaltbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/aegisaltbar.recipe similarity index 100% rename from recipes/starbound/furnace/aegisaltbar.recipe rename to recipes/starbound/furnace/furnace3/ingredients/aegisaltbar.recipe diff --git a/recipes/starbound/reagent/battery.recipe b/recipes/starbound/furnace/furnace3/ingredients/battery.recipe similarity index 100% rename from recipes/starbound/reagent/battery.recipe rename to recipes/starbound/furnace/furnace3/ingredients/battery.recipe diff --git a/recipes/starbound/furnace/ceruliumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/ceruliumbar.recipe similarity index 100% rename from recipes/starbound/furnace/ceruliumbar.recipe rename to recipes/starbound/furnace/furnace3/ingredients/ceruliumbar.recipe diff --git a/recipes/starbound/furnace/feroziumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/feroziumbar.recipe similarity index 100% rename from recipes/starbound/furnace/feroziumbar.recipe rename to recipes/starbound/furnace/furnace3/ingredients/feroziumbar.recipe diff --git a/recipes/starbound/furnace/imperviumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/imperviumbar.recipe similarity index 100% rename from recipes/starbound/furnace/imperviumbar.recipe rename to recipes/starbound/furnace/furnace3/ingredients/imperviumbar.recipe diff --git a/recipes/starbound/furnace/rubiumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/rubiumbar.recipe similarity index 100% rename from recipes/starbound/furnace/rubiumbar.recipe rename to recipes/starbound/furnace/furnace3/ingredients/rubiumbar.recipe diff --git a/recipes/starbound/reagent/smallbattery.recipe b/recipes/starbound/furnace/furnace3/ingredients/smallbattery.recipe similarity index 100% rename from recipes/starbound/reagent/smallbattery.recipe rename to recipes/starbound/furnace/furnace3/ingredients/smallbattery.recipe diff --git a/recipes/starbound/furnace/violiumbar.recipe b/recipes/starbound/furnace/furnace3/ingredients/violiumbar.recipe similarity index 100% rename from recipes/starbound/furnace/violiumbar.recipe rename to recipes/starbound/furnace/furnace3/ingredients/violiumbar.recipe diff --git a/recipes/starbound/furnace/imperviumcompound_gold.recipe b/recipes/starbound/furnace/imperviumcompound_gold.recipe deleted file mode 100644 index e6a79c64..00000000 --- a/recipes/starbound/furnace/imperviumcompound_gold.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["refinedviolium",2],"goldbar"], - "output" : "sb_imperviumcompound", - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/imperviumcompound_solarium.recipe b/recipes/starbound/furnace/imperviumcompound_solarium.recipe deleted file mode 100644 index 0fbd2847..00000000 --- a/recipes/starbound/furnace/imperviumcompound_solarium.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["refinedviolium",2],"solariumstar"], - "output" : ["sb_imperviumcompound",2], - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/refinedferozium.recipe b/recipes/starbound/furnace/refinedferozium.recipe deleted file mode 100644 index 9a8ad875..00000000 --- a/recipes/starbound/furnace/refinedferozium.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["refinedaegisalt",2],"coalore"], - "output" : "refinedferozium", - "duration" : 0.15, - "groups" : ["sb_scififurnace","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furnace/refinedviolium.recipe b/recipes/starbound/furnace/refinedviolium.recipe deleted file mode 100644 index c47e4de4..00000000 --- a/recipes/starbound/furnace/refinedviolium.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["sb_ceruliumcompound",2],"coalore"], - "output" : "refinedviolium", - "groups" : ["craftingfurnace3","bars","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furniture/beds/tier10bed.recipe b/recipes/starbound/furniture/beds2/tier10bed.recipe similarity index 100% rename from recipes/starbound/furniture/beds/tier10bed.recipe rename to recipes/starbound/furniture/beds2/tier10bed.recipe diff --git a/recipes/starbound/furniture/beds/tier5bed.recipe b/recipes/starbound/furniture/beds2/tier5bed.recipe similarity index 100% rename from recipes/starbound/furniture/beds/tier5bed.recipe rename to recipes/starbound/furniture/beds2/tier5bed.recipe diff --git a/recipes/starbound/furniture/beds/tier6bed.recipe b/recipes/starbound/furniture/beds2/tier6bed.recipe similarity index 100% rename from recipes/starbound/furniture/beds/tier6bed.recipe rename to recipes/starbound/furniture/beds2/tier6bed.recipe diff --git a/recipes/starbound/furniture/beds/tier7bed.recipe b/recipes/starbound/furniture/beds2/tier7bed.recipe similarity index 100% rename from recipes/starbound/furniture/beds/tier7bed.recipe rename to recipes/starbound/furniture/beds2/tier7bed.recipe diff --git a/recipes/starbound/furniture/beds/tier8bed.recipe b/recipes/starbound/furniture/beds2/tier8bed.recipe similarity index 100% rename from recipes/starbound/furniture/beds/tier8bed.recipe rename to recipes/starbound/furniture/beds2/tier8bed.recipe diff --git a/recipes/starbound/furniture/beds/tier9bed.recipe b/recipes/starbound/furniture/beds2/tier9bed.recipe similarity index 100% rename from recipes/starbound/furniture/beds/tier9bed.recipe rename to recipes/starbound/furniture/beds2/tier9bed.recipe diff --git a/recipes/starbound/furniture/decorative/tier10chair.recipe b/recipes/starbound/furniture/decorative2/tier10chair.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier10chair.recipe rename to recipes/starbound/furniture/decorative2/tier10chair.recipe diff --git a/recipes/starbound/furniture/decorative/tier10table.recipe b/recipes/starbound/furniture/decorative2/tier10table.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier10table.recipe rename to recipes/starbound/furniture/decorative2/tier10table.recipe diff --git a/recipes/starbound/furniture/decorative/tier5chair.recipe b/recipes/starbound/furniture/decorative2/tier5chair.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier5chair.recipe rename to recipes/starbound/furniture/decorative2/tier5chair.recipe diff --git a/recipes/starbound/furniture/decorative/tier5table.recipe b/recipes/starbound/furniture/decorative2/tier5table.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier5table.recipe rename to recipes/starbound/furniture/decorative2/tier5table.recipe diff --git a/recipes/starbound/furniture/decorative/tier6chair.recipe b/recipes/starbound/furniture/decorative2/tier6chair.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier6chair.recipe rename to recipes/starbound/furniture/decorative2/tier6chair.recipe diff --git a/recipes/starbound/furniture/decorative/tier6table.recipe b/recipes/starbound/furniture/decorative2/tier6table.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier6table.recipe rename to recipes/starbound/furniture/decorative2/tier6table.recipe diff --git a/recipes/starbound/furniture/decorative/tier7chair.recipe b/recipes/starbound/furniture/decorative2/tier7chair.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier7chair.recipe rename to recipes/starbound/furniture/decorative2/tier7chair.recipe diff --git a/recipes/starbound/furniture/decorative/tier7table.recipe b/recipes/starbound/furniture/decorative2/tier7table.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier7table.recipe rename to recipes/starbound/furniture/decorative2/tier7table.recipe diff --git a/recipes/starbound/furniture/decorative/tier8chair.recipe b/recipes/starbound/furniture/decorative2/tier8chair.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier8chair.recipe rename to recipes/starbound/furniture/decorative2/tier8chair.recipe diff --git a/recipes/starbound/furniture/decorative/tier8table.recipe b/recipes/starbound/furniture/decorative2/tier8table.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier8table.recipe rename to recipes/starbound/furniture/decorative2/tier8table.recipe diff --git a/recipes/starbound/furniture/decorative/tier9chair.recipe b/recipes/starbound/furniture/decorative2/tier9chair.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier9chair.recipe rename to recipes/starbound/furniture/decorative2/tier9chair.recipe diff --git a/recipes/starbound/furniture/decorative/tier9table.recipe b/recipes/starbound/furniture/decorative2/tier9table.recipe similarity index 100% rename from recipes/starbound/furniture/decorative/tier9table.recipe rename to recipes/starbound/furniture/decorative2/tier9table.recipe diff --git a/recipes/starbound/furniture/doors/apexcooldoor.recipe b/recipes/starbound/furniture/doors2/apexcooldoor.recipe similarity index 100% rename from recipes/starbound/furniture/doors/apexcooldoor.recipe rename to recipes/starbound/furniture/doors2/apexcooldoor.recipe diff --git a/recipes/starbound/furniture/doors/apexcoolverticaldoor.recipe b/recipes/starbound/furniture/doors2/apexcoolverticaldoor.recipe similarity index 100% rename from recipes/starbound/furniture/doors/apexcoolverticaldoor.recipe rename to recipes/starbound/furniture/doors2/apexcoolverticaldoor.recipe diff --git a/recipes/starbound/furniture/doors/tier10door.recipe b/recipes/starbound/furniture/doors2/tier10door.recipe similarity index 100% rename from recipes/starbound/furniture/doors/tier10door.recipe rename to recipes/starbound/furniture/doors2/tier10door.recipe diff --git a/recipes/starbound/furniture/doors/tier5door.recipe b/recipes/starbound/furniture/doors2/tier5door.recipe similarity index 100% rename from recipes/starbound/furniture/doors/tier5door.recipe rename to recipes/starbound/furniture/doors2/tier5door.recipe diff --git a/recipes/starbound/furniture/doors/tier6door.recipe b/recipes/starbound/furniture/doors2/tier6door.recipe similarity index 100% rename from recipes/starbound/furniture/doors/tier6door.recipe rename to recipes/starbound/furniture/doors2/tier6door.recipe diff --git a/recipes/starbound/furniture/doors/tier7door.recipe b/recipes/starbound/furniture/doors2/tier7door.recipe similarity index 100% rename from recipes/starbound/furniture/doors/tier7door.recipe rename to recipes/starbound/furniture/doors2/tier7door.recipe diff --git a/recipes/starbound/furniture/doors/tier8door.recipe b/recipes/starbound/furniture/doors2/tier8door.recipe similarity index 100% rename from recipes/starbound/furniture/doors/tier8door.recipe rename to recipes/starbound/furniture/doors2/tier8door.recipe diff --git a/recipes/starbound/furniture/doors/tier9door.recipe b/recipes/starbound/furniture/doors2/tier9door.recipe similarity index 100% rename from recipes/starbound/furniture/doors/tier9door.recipe rename to recipes/starbound/furniture/doors2/tier9door.recipe diff --git a/recipes/starbound/furniture/lights/tier10light.recipe b/recipes/starbound/furniture/lights2/tier10light.recipe similarity index 100% rename from recipes/starbound/furniture/lights/tier10light.recipe rename to recipes/starbound/furniture/lights2/tier10light.recipe diff --git a/recipes/starbound/furniture/lights/tier5light.recipe b/recipes/starbound/furniture/lights2/tier5light.recipe similarity index 100% rename from recipes/starbound/furniture/lights/tier5light.recipe rename to recipes/starbound/furniture/lights2/tier5light.recipe diff --git a/recipes/starbound/furniture/lights/tier6light.recipe b/recipes/starbound/furniture/lights2/tier6light.recipe similarity index 100% rename from recipes/starbound/furniture/lights/tier6light.recipe rename to recipes/starbound/furniture/lights2/tier6light.recipe diff --git a/recipes/starbound/furniture/lights/tier7light.recipe b/recipes/starbound/furniture/lights2/tier7light.recipe similarity index 100% rename from recipes/starbound/furniture/lights/tier7light.recipe rename to recipes/starbound/furniture/lights2/tier7light.recipe diff --git a/recipes/starbound/furniture/lights/tier8light.recipe b/recipes/starbound/furniture/lights2/tier8light.recipe similarity index 100% rename from recipes/starbound/furniture/lights/tier8light.recipe rename to recipes/starbound/furniture/lights2/tier8light.recipe diff --git a/recipes/starbound/furniture/lights/tier9light.recipe b/recipes/starbound/furniture/lights2/tier9light.recipe similarity index 100% rename from recipes/starbound/furniture/lights/tier9light.recipe rename to recipes/starbound/furniture/lights2/tier9light.recipe diff --git a/recipes/starbound/tiles/blackblock.recipe b/recipes/starbound/furniture/materials/blackblock.recipe similarity index 100% rename from recipes/starbound/tiles/blackblock.recipe rename to recipes/starbound/furniture/materials/blackblock.recipe diff --git a/recipes/starbound/tiles/cloudblock.recipe b/recipes/starbound/furniture/materials/cloudblock.recipe similarity index 100% rename from recipes/starbound/tiles/cloudblock.recipe rename to recipes/starbound/furniture/materials/cloudblock.recipe diff --git a/recipes/starbound/tiles/coconutblock.recipe b/recipes/starbound/furniture/materials/coconutblock.recipe similarity index 100% rename from recipes/starbound/tiles/coconutblock.recipe rename to recipes/starbound/furniture/materials/coconutblock.recipe diff --git a/recipes/starbound/tiles/darkwoodmaterial.recipe b/recipes/starbound/furniture/materials/darkwoodmaterial.recipe similarity index 100% rename from recipes/starbound/tiles/darkwoodmaterial.recipe rename to recipes/starbound/furniture/materials/darkwoodmaterial.recipe diff --git a/recipes/starbound/furniture/materials/ridgebrick.recipe b/recipes/starbound/furniture/materials/ridgebrick.recipe new file mode 100644 index 00000000..9d96a459 --- /dev/null +++ b/recipes/starbound/furniture/materials/ridgebrick.recipe @@ -0,0 +1,6 @@ +{ + "input" : ["brickmaterial","cobblestonematerial"], + "output" : ["ridgebrick",50], + "duration" : 0.5, + "groups" : ["craftingfurniture","materials","all"] +} \ No newline at end of file diff --git a/recipes/starbound/tiles/rock01.recipe b/recipes/starbound/furniture/materials/rock01.recipe similarity index 100% rename from recipes/starbound/tiles/rock01.recipe rename to recipes/starbound/furniture/materials/rock01.recipe diff --git a/recipes/starbound/tiles/rock02.recipe b/recipes/starbound/furniture/materials/rock02.recipe similarity index 100% rename from recipes/starbound/tiles/rock02.recipe rename to recipes/starbound/furniture/materials/rock02.recipe diff --git a/recipes/starbound/tiles/rock03.recipe b/recipes/starbound/furniture/materials/rock03.recipe similarity index 100% rename from recipes/starbound/tiles/rock03.recipe rename to recipes/starbound/furniture/materials/rock03.recipe diff --git a/recipes/starbound/tiles/rock04.recipe b/recipes/starbound/furniture/materials/rock04.recipe similarity index 100% rename from recipes/starbound/tiles/rock04.recipe rename to recipes/starbound/furniture/materials/rock04.recipe diff --git a/recipes/starbound/tiles/rock12.recipe b/recipes/starbound/furniture/materials/rock12.recipe similarity index 100% rename from recipes/starbound/tiles/rock12.recipe rename to recipes/starbound/furniture/materials/rock12.recipe diff --git a/recipes/starbound/tiles/rock14.recipe b/recipes/starbound/furniture/materials/rock14.recipe similarity index 100% rename from recipes/starbound/tiles/rock14.recipe rename to recipes/starbound/furniture/materials/rock14.recipe diff --git a/recipes/starbound/tiles/rock15.recipe b/recipes/starbound/furniture/materials/rock15.recipe similarity index 100% rename from recipes/starbound/tiles/rock15.recipe rename to recipes/starbound/furniture/materials/rock15.recipe diff --git a/recipes/starbound/tiles/rock17.recipe b/recipes/starbound/furniture/materials/rock17.recipe similarity index 100% rename from recipes/starbound/tiles/rock17.recipe rename to recipes/starbound/furniture/materials/rock17.recipe diff --git a/recipes/starbound/tiles/rock19.recipe b/recipes/starbound/furniture/materials/rock19.recipe similarity index 100% rename from recipes/starbound/tiles/rock19.recipe rename to recipes/starbound/furniture/materials/rock19.recipe diff --git a/recipes/starbound/tiles/rock20.recipe b/recipes/starbound/furniture/materials/rock20.recipe similarity index 100% rename from recipes/starbound/tiles/rock20.recipe rename to recipes/starbound/furniture/materials/rock20.recipe diff --git a/recipes/starbound/tiles/slopedglasspanel.recipe b/recipes/starbound/furniture/materials/slopedglasspanel.recipe similarity index 100% rename from recipes/starbound/tiles/slopedglasspanel.recipe rename to recipes/starbound/furniture/materials/slopedglasspanel.recipe diff --git a/recipes/starbound/tiles/smoothconcrete.recipe b/recipes/starbound/furniture/materials/smoothconcrete.recipe similarity index 100% rename from recipes/starbound/tiles/smoothconcrete.recipe rename to recipes/starbound/furniture/materials/smoothconcrete.recipe diff --git a/recipes/starbound/furniture/materials/waste.recipe b/recipes/starbound/furniture/materials/waste.recipe new file mode 100644 index 00000000..e07f07e7 --- /dev/null +++ b/recipes/starbound/furniture/materials/waste.recipe @@ -0,0 +1,6 @@ +{ + "input" : [["toxicwaste",3]], + "output" : ["waste",20], + "duration" : 0.25, + "groups" : ["craftingfurniture","materials","all"] +} \ No newline at end of file diff --git a/recipes/starbound/tiles/outpost.recipe b/recipes/starbound/furniture/materials2/outpost.recipe similarity index 100% rename from recipes/starbound/tiles/outpost.recipe rename to recipes/starbound/furniture/materials2/outpost.recipe diff --git a/recipes/starbound/tiles/platinum.recipe b/recipes/starbound/furniture/materials2/platinum.recipe similarity index 100% rename from recipes/starbound/tiles/platinum.recipe rename to recipes/starbound/furniture/materials2/platinum.recipe diff --git a/recipes/starbound/tiles/sb_chain.recipe b/recipes/starbound/furniture/materials2/sb_chain.recipe similarity index 100% rename from recipes/starbound/tiles/sb_chain.recipe rename to recipes/starbound/furniture/materials2/sb_chain.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/steel.recipe b/recipes/starbound/furniture/storage/tieredchests/steel.recipe deleted file mode 100644 index 42028e12..00000000 --- a/recipes/starbound/furniture/storage/tieredchests/steel.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_steelbar"], - "output" : "sb_tier2techchest", - "groups" : ["craftingfurniture2","storage","all"] -} \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/tieredchests/iron.recipe b/recipes/starbound/furniture/storage/tieredchests/t1.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/iron.recipe rename to recipes/starbound/furniture/storage/tieredchests/t1.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/t2.recipe b/recipes/starbound/furniture/storage/tieredchests/t2.recipe new file mode 100644 index 00000000..f3999d12 --- /dev/null +++ b/recipes/starbound/furniture/storage/tieredchests/t2.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["sb_steelbar"], + "output" : "sb_tier2techchest", + "groups" : ["craftingfurniture","storage","all"] +} \ No newline at end of file diff --git a/recipes/starbound/furniture/storage/shiplockers/apexshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/apexshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/apexshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/apexshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/shiplockers/avianshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/avianshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/avianshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/avianshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/shiplockers/floranshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/floranshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/floranshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/floranshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/shiplockers/glitchshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/glitchshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/glitchshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/glitchshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/shiplockers/humanshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/humanshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/humanshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/humanshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/shiplockers/hylotlshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/hylotlshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/hylotlshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/hylotlshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/shiplockers/novakidshiplocker.recipe b/recipes/starbound/furniture/storage2/shiplockers/novakidshiplocker.recipe similarity index 100% rename from recipes/starbound/furniture/storage/shiplockers/novakidshiplocker.recipe rename to recipes/starbound/furniture/storage2/shiplockers/novakidshiplocker.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/titanium.recipe b/recipes/starbound/furniture/storage2/tieredchests/t3.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/titanium.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t3.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/durasteel.recipe b/recipes/starbound/furniture/storage2/tieredchests/t4.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/durasteel.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t4.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/aegisalt.recipe b/recipes/starbound/furniture/storage2/tieredchests/t5a.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/aegisalt.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t5a.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/rubium.recipe b/recipes/starbound/furniture/storage2/tieredchests/t5m.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/rubium.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t5m.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/violium.recipe b/recipes/starbound/furniture/storage2/tieredchests/t5s.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/violium.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t5s.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/ferozium.recipe b/recipes/starbound/furniture/storage2/tieredchests/t6a.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/ferozium.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t6a.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/cerulium.recipe b/recipes/starbound/furniture/storage2/tieredchests/t6m.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/cerulium.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t6m.recipe diff --git a/recipes/starbound/furniture/storage/tieredchests/impervium.recipe b/recipes/starbound/furniture/storage2/tieredchests/t6s.recipe similarity index 100% rename from recipes/starbound/furniture/storage/tieredchests/impervium.recipe rename to recipes/starbound/furniture/storage2/tieredchests/t6s.recipe diff --git a/recipes/starbound/furniture/switches/ironswitch.recipe b/recipes/starbound/furniture/switches/ironswitch.recipe deleted file mode 100644 index cb8649d5..00000000 --- a/recipes/starbound/furniture/switches/ironswitch.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["ironbar","copperbar",["wire",5],"smallbattery"], - "output" : "ironswitch", - "groups" : ["craftingwiring", "switches"] -} \ No newline at end of file diff --git a/recipes/starbound/instruments/acousticguitar.recipe b/recipes/starbound/instruments/tool/acousticguitar.recipe similarity index 100% rename from recipes/starbound/instruments/acousticguitar.recipe rename to recipes/starbound/instruments/tool/acousticguitar.recipe diff --git a/recipes/starbound/instruments/banjo.recipe b/recipes/starbound/instruments/tool/banjo.recipe similarity index 100% rename from recipes/starbound/instruments/banjo.recipe rename to recipes/starbound/instruments/tool/banjo.recipe diff --git a/recipes/starbound/instruments/bassguitar.recipe b/recipes/starbound/instruments/tool/bassguitar.recipe similarity index 100% rename from recipes/starbound/instruments/bassguitar.recipe rename to recipes/starbound/instruments/tool/bassguitar.recipe diff --git a/recipes/starbound/instruments/bones.recipe b/recipes/starbound/instruments/tool/bones.recipe similarity index 100% rename from recipes/starbound/instruments/bones.recipe rename to recipes/starbound/instruments/tool/bones.recipe diff --git a/recipes/starbound/instruments/dulcimer.recipe b/recipes/starbound/instruments/tool/dulcimer.recipe similarity index 100% rename from recipes/starbound/instruments/dulcimer.recipe rename to recipes/starbound/instruments/tool/dulcimer.recipe diff --git a/recipes/starbound/instruments/electricbass.recipe b/recipes/starbound/instruments/tool/electricbass.recipe similarity index 100% rename from recipes/starbound/instruments/electricbass.recipe rename to recipes/starbound/instruments/tool/electricbass.recipe diff --git a/recipes/starbound/instruments/harp.recipe b/recipes/starbound/instruments/tool/harp.recipe similarity index 100% rename from recipes/starbound/instruments/harp.recipe rename to recipes/starbound/instruments/tool/harp.recipe diff --git a/recipes/starbound/instruments/koto.recipe b/recipes/starbound/instruments/tool/koto.recipe similarity index 100% rename from recipes/starbound/instruments/koto.recipe rename to recipes/starbound/instruments/tool/koto.recipe diff --git a/recipes/starbound/instruments/leadguitar.recipe b/recipes/starbound/instruments/tool/leadguitar.recipe similarity index 100% rename from recipes/starbound/instruments/leadguitar.recipe rename to recipes/starbound/instruments/tool/leadguitar.recipe diff --git a/recipes/starbound/instruments/oboe.recipe b/recipes/starbound/instruments/tool/oboe.recipe similarity index 100% rename from recipes/starbound/instruments/oboe.recipe rename to recipes/starbound/instruments/tool/oboe.recipe diff --git a/recipes/starbound/instruments/ocarina.recipe b/recipes/starbound/instruments/tool/ocarina.recipe similarity index 100% rename from recipes/starbound/instruments/ocarina.recipe rename to recipes/starbound/instruments/tool/ocarina.recipe diff --git a/recipes/starbound/instruments/saxophone.recipe b/recipes/starbound/instruments/tool/saxophone.recipe similarity index 100% rename from recipes/starbound/instruments/saxophone.recipe rename to recipes/starbound/instruments/tool/saxophone.recipe diff --git a/recipes/starbound/instruments/trumpet.recipe b/recipes/starbound/instruments/tool/trumpet.recipe similarity index 100% rename from recipes/starbound/instruments/trumpet.recipe rename to recipes/starbound/instruments/tool/trumpet.recipe diff --git a/recipes/starbound/instruments/violin.recipe b/recipes/starbound/instruments/tool/violin.recipe similarity index 100% rename from recipes/starbound/instruments/violin.recipe rename to recipes/starbound/instruments/tool/violin.recipe diff --git a/recipes/starbound/instruments/accordion.recipe b/recipes/starbound/instruments/tool2/accordion.recipe similarity index 100% rename from recipes/starbound/instruments/accordion.recipe rename to recipes/starbound/instruments/tool2/accordion.recipe diff --git a/recipes/starbound/instruments/brightpiano.recipe b/recipes/starbound/instruments/tool2/brightpiano.recipe similarity index 100% rename from recipes/starbound/instruments/brightpiano.recipe rename to recipes/starbound/instruments/tool2/brightpiano.recipe diff --git a/recipes/starbound/instruments/clarinet.recipe b/recipes/starbound/instruments/tool2/clarinet.recipe similarity index 100% rename from recipes/starbound/instruments/clarinet.recipe rename to recipes/starbound/instruments/tool2/clarinet.recipe diff --git a/recipes/starbound/instruments/drumkit.recipe b/recipes/starbound/instruments/tool2/drumkit.recipe similarity index 100% rename from recipes/starbound/instruments/drumkit.recipe rename to recipes/starbound/instruments/tool2/drumkit.recipe diff --git a/recipes/starbound/instruments/flute.recipe b/recipes/starbound/instruments/tool2/flute.recipe similarity index 100% rename from recipes/starbound/instruments/flute.recipe rename to recipes/starbound/instruments/tool2/flute.recipe diff --git a/recipes/starbound/instruments/harmonica.recipe b/recipes/starbound/instruments/tool2/harmonica.recipe similarity index 100% rename from recipes/starbound/instruments/harmonica.recipe rename to recipes/starbound/instruments/tool2/harmonica.recipe diff --git a/recipes/starbound/instruments/keyboard.recipe b/recipes/starbound/instruments/tool2/keyboard.recipe similarity index 100% rename from recipes/starbound/instruments/keyboard.recipe rename to recipes/starbound/instruments/tool2/keyboard.recipe diff --git a/recipes/starbound/instruments/musicbox.recipe b/recipes/starbound/instruments/tool2/musicbox.recipe similarity index 100% rename from recipes/starbound/instruments/musicbox.recipe rename to recipes/starbound/instruments/tool2/musicbox.recipe diff --git a/recipes/starbound/instruments/nylonguitar.recipe b/recipes/starbound/instruments/tool2/nylonguitar.recipe similarity index 100% rename from recipes/starbound/instruments/nylonguitar.recipe rename to recipes/starbound/instruments/tool2/nylonguitar.recipe diff --git a/recipes/starbound/instruments/piano.recipe b/recipes/starbound/instruments/tool2/piano.recipe similarity index 100% rename from recipes/starbound/instruments/piano.recipe rename to recipes/starbound/instruments/tool2/piano.recipe diff --git a/recipes/starbound/instruments/reedorgan.recipe b/recipes/starbound/instruments/tool2/reedorgan.recipe similarity index 100% rename from recipes/starbound/instruments/reedorgan.recipe rename to recipes/starbound/instruments/tool2/reedorgan.recipe diff --git a/recipes/starbound/instruments/steeldrum.recipe b/recipes/starbound/instruments/tool2/steeldrum.recipe similarity index 100% rename from recipes/starbound/instruments/steeldrum.recipe rename to recipes/starbound/instruments/tool2/steeldrum.recipe diff --git a/recipes/starbound/instruments/microphone.recipe b/recipes/starbound/instruments/tool3/microphone.recipe similarity index 100% rename from recipes/starbound/instruments/microphone.recipe rename to recipes/starbound/instruments/tool3/microphone.recipe diff --git a/recipes/starbound/instruments/microphonefem.recipe b/recipes/starbound/instruments/tool3/microphonefem.recipe similarity index 100% rename from recipes/starbound/instruments/microphonefem.recipe rename to recipes/starbound/instruments/tool3/microphonefem.recipe diff --git a/recipes/starbound/instruments/overdriveguitar.recipe b/recipes/starbound/instruments/tool3/overdriveguitar.recipe similarity index 100% rename from recipes/starbound/instruments/overdriveguitar.recipe rename to recipes/starbound/instruments/tool3/overdriveguitar.recipe diff --git a/recipes/starbound/instruments/rockorgan.recipe b/recipes/starbound/instruments/tool3/rockorgan.recipe similarity index 100% rename from recipes/starbound/instruments/rockorgan.recipe rename to recipes/starbound/instruments/tool3/rockorgan.recipe diff --git a/recipes/starbound/instruments/spaceorgan.recipe b/recipes/starbound/instruments/tool3/spaceorgan.recipe similarity index 100% rename from recipes/starbound/instruments/spaceorgan.recipe rename to recipes/starbound/instruments/tool3/spaceorgan.recipe diff --git a/recipes/starbound/instruments/squareorgan.recipe b/recipes/starbound/instruments/tool3/squareorgan.recipe similarity index 100% rename from recipes/starbound/instruments/squareorgan.recipe rename to recipes/starbound/instruments/tool3/squareorgan.recipe diff --git a/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe b/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe new file mode 100644 index 00000000..56294399 --- /dev/null +++ b/recipes/starbound/mods/ivrpgminer/sb_ceruliumcompound.recipe @@ -0,0 +1,6 @@ +{ + "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/professions/miner/recipe/bars/sb_platinumbar.recipe b/recipes/starbound/mods/ivrpgminer/sb_platinumbar.recipe similarity index 100% rename from professions/miner/recipe/bars/sb_platinumbar.recipe rename to recipes/starbound/mods/ivrpgminer/sb_platinumbar.recipe diff --git a/professions/miner/recipe/bars/sb_refinedrubium.recipe b/recipes/starbound/mods/ivrpgminer/sb_refinedrubium.recipe similarity index 100% rename from professions/miner/recipe/bars/sb_refinedrubium.recipe rename to recipes/starbound/mods/ivrpgminer/sb_refinedrubium.recipe diff --git a/recipes/starbound/seeds/crystalplantseed.recipe b/recipes/starbound/mods/seeds/crystalplantseed.recipe similarity index 100% rename from recipes/starbound/seeds/crystalplantseed.recipe rename to recipes/starbound/mods/seeds/crystalplantseed.recipe diff --git a/recipes/starbound/seeds/poisoncreepseed.recipe b/recipes/starbound/mods/seeds/poisoncreepseed.recipe similarity index 100% rename from recipes/starbound/seeds/poisoncreepseed.recipe rename to recipes/starbound/mods/seeds/poisoncreepseed.recipe diff --git a/recipes/starbound/other/preservatives.recipe b/recipes/starbound/other/preservatives.recipe deleted file mode 100644 index e06113ba..00000000 --- a/recipes/starbound/other/preservatives.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sulphur","seaweed"], - "output" : "sb_preservatives", - "groups" : ["craftingfarm","farming","all"] -} \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/housecleaning.recipe b/recipes/starbound/peacekeeperstore/housecleaning.recipe deleted file mode 100644 index 8f64f1fa..00000000 --- a/recipes/starbound/peacekeeperstore/housecleaning.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["peacecredit",3]], - "output" : ["sb_musicsheet",1,{"music":"housecleaning"}], - "groups" : ["peacekeeper3","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/salvagearm.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagearm.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagearm.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper1/salvagearm.recipe diff --git a/recipes/starbound/peacekeeperstore/salvagebody.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebody.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagebody.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper1/salvagebody.recipe diff --git a/recipes/starbound/peacekeeperstore/salvagebooster.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagebooster.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagebooster.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper1/salvagebooster.recipe diff --git a/recipes/starbound/peacekeeperstore/salvagelegs.recipe b/recipes/starbound/peacekeeperstore/peacekeeper1/salvagelegs.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagelegs.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper1/salvagelegs.recipe diff --git a/recipes/starbound/peacekeeperstore/arrester.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/arrester.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/arrester.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper2/arrester.recipe diff --git a/recipes/starbound/peacekeeperstore/dead-or-alive.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/dead-or-alive.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/dead-or-alive.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper2/dead-or-alive.recipe diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe new file mode 100644 index 00000000..6d91ea1a --- /dev/null +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/housecleaning.recipe @@ -0,0 +1,5 @@ +{ + "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/radio.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/radio.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/radio.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper2/radio.recipe diff --git a/recipes/starbound/peacekeeperstore/songbook.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/songbook.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/songbook.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper2/songbook.recipe diff --git a/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe b/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe new file mode 100644 index 00000000..6a16844e --- /dev/null +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/supermatter.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..b731dc2d --- /dev/null +++ b/recipes/starbound/peacekeeperstore/peacekeeper2/the-peacekeepers.recipe @@ -0,0 +1,5 @@ +{ + "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/repair/peacekeeper.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperbattery.recipe similarity index 100% rename from recipes/starbound/repair/peacekeeper.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperbattery.recipe diff --git a/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe new file mode 100644 index 00000000..aa8bda09 --- /dev/null +++ b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeeperteleporter.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["peacecredit",18],"teleportercore"], + "output" : "sb_peacekeeperteleporter", + "groups" : ["peacekeeper3","all"] +} \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/peacekeepervendingmachine.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/peacekeepervendingmachine.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/peacekeepervendingmachine.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper3/peacekeepervendingmachine.recipe diff --git a/recipes/starbound/peacekeeperstore/salvagetier4.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier4.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagetier4.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier4.recipe diff --git a/recipes/starbound/peacekeeperstore/salvagetier5.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier5.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagetier5.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper3/salvagetier5.recipe diff --git a/recipes/starbound/peacekeeperstore/translocator.recipe b/recipes/starbound/peacekeeperstore/peacekeeper3/translocator.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/translocator.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper3/translocator.recipe diff --git a/recipes/starbound/peacekeeperstore/salvagetier6.recipe b/recipes/starbound/peacekeeperstore/peacekeeper4/salvagetier6.recipe similarity index 100% rename from recipes/starbound/peacekeeperstore/salvagetier6.recipe rename to recipes/starbound/peacekeeperstore/peacekeeper4/salvagetier6.recipe diff --git a/recipes/starbound/peacekeeperstore/peacekeeperteleporter.recipe b/recipes/starbound/peacekeeperstore/peacekeeperteleporter.recipe deleted file mode 100644 index 39cbd9b1..00000000 --- a/recipes/starbound/peacekeeperstore/peacekeeperteleporter.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["peacecredit",18],"teleportercore"], - "output" : "sb_peacekeeperteleporter", - "groups" : ["peacekeeper2","all"] -} \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/supermatter.recipe b/recipes/starbound/peacekeeperstore/supermatter.recipe deleted file mode 100644 index 90db6461..00000000 --- a/recipes/starbound/peacekeeperstore/supermatter.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["peacecredit"], - "output" : ["supermatter",5], - "groups" : ["peacekeeper1","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/peacekeeperstore/the-peacekeepers.recipe b/recipes/starbound/peacekeeperstore/the-peacekeepers.recipe deleted file mode 100644 index d56f8d1a..00000000 --- a/recipes/starbound/peacekeeperstore/the-peacekeepers.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["peacecredit",3]], - "output" : ["sb_musicsheet",1,{"music":"the-peacekeepers"}], - "groups" : ["peacekeeper4","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/capturepod.recipe b/recipes/starbound/portable3dprinter/capturepod.recipe deleted file mode 100644 index 835e6f9c..00000000 --- a/recipes/starbound/portable3dprinter/capturepod.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["money",750]], - "output" : "capturepod", - "groups" : ["sb_portable3dprinter","sb_other","all"] -} \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/crittercapturepod.recipe b/recipes/starbound/portable3dprinter/crittercapturepod.recipe deleted file mode 100644 index 0f1c1f60..00000000 --- a/recipes/starbound/portable3dprinter/crittercapturepod.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["money",200]], - "output" : "sb_crittercapturepod", - "groups" : ["sb_portable3dprinter","sb_other","all"] -} \ No newline at end of file diff --git a/recipes/starbound/portable3dprinter/steelcapturepod.recipe b/recipes/starbound/portable3dprinter/steelcapturepod.recipe deleted file mode 100644 index 6ad13df0..00000000 --- a/recipes/starbound/portable3dprinter/steelcapturepod.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["money",120]], - "output" : "sb_capturepod", - "groups" : ["sb_portable3dprinter","sb_other","all"] -} \ No newline at end of file diff --git a/recipes/starbound/reagent/glowfibre.recipe b/recipes/starbound/reagent/glowfibre.recipe deleted file mode 100644 index ec8fbd84..00000000 --- a/recipes/starbound/reagent/glowfibre.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["sb_glowfibreblue","sb_glowfibregreen","sb_glowfibreorange","sb_glowfibreyellow"], - "output" : ["glowfibre",4], - "groups" : ["plain","other","all"] -} \ No newline at end of file diff --git a/recipes/starbound/reagent/screws.recipe b/recipes/starbound/reagent/screws.recipe deleted file mode 100644 index 352aa085..00000000 --- a/recipes/starbound/reagent/screws.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["ironbar"], - "output" : ["screws",8], - "groups" : ["craftingfurnace2","ingredients","all"] -} \ No newline at end of file diff --git a/recipes/starbound/refinery/recycle/crittercapturepod.recipe b/recipes/starbound/refinery/recycle/crittercapturepod.recipe deleted file mode 100644 index 32ffa14d..00000000 --- a/recipes/starbound/refinery/recycle/crittercapturepod.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : ["sb_filledcrittercapturepod"], - "output" : "sb_crittercapturepod", - "duration" : 0.8, - "groups" : ["refinery","nouncrafting","all"] -} diff --git a/recipes/starbound/refinery/recycle/tech.recipe b/recipes/starbound/refinery/recycle/techcard_tech.recipe similarity index 100% rename from recipes/starbound/refinery/recycle/tech.recipe rename to recipes/starbound/refinery/recycle/techcard_tech.recipe diff --git a/recipes/starbound/conversion/skyrail_asc.recipe b/recipes/starbound/skyrails/conversion/skyrail_asc.recipe similarity index 100% rename from recipes/starbound/conversion/skyrail_asc.recipe rename to recipes/starbound/skyrails/conversion/skyrail_asc.recipe diff --git a/recipes/starbound/skyrails/conversion/skyrail_desc.recipe b/recipes/starbound/skyrails/conversion/skyrail_desc.recipe new file mode 100644 index 00000000..c3b1cd89 --- /dev/null +++ b/recipes/starbound/skyrails/conversion/skyrail_desc.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["skyrail_asc"], + "output" : "skyrail_desc", + "groups" : ["sb_skyrailtable","sb_convert","nouncrafting","all"] +} diff --git a/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe b/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe new file mode 100644 index 00000000..5d3a737d --- /dev/null +++ b/recipes/starbound/skyrails/conversion/skyrail_diodel.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..81ff7700 --- /dev/null +++ b/recipes/starbound/skyrails/conversion/skyrail_dioder.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..fc09fdc2 --- /dev/null +++ b/recipes/starbound/skyrails/conversion/skyrailboost.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..76060406 --- /dev/null +++ b/recipes/starbound/skyrails/conversion/skyrailbreak.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["skyrailboost"], + "output" : "skyrailbreak", + "groups" : ["sb_skyrailtable","sb_convert","nouncrafting","all"] +} diff --git a/recipes/starbound/spinningwheel/chest/sweatervest.recipe b/recipes/starbound/spinningwheel/chest/sweatervest.recipe deleted file mode 100644 index e2775a86..00000000 --- a/recipes/starbound/spinningwheel/chest/sweatervest.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["fabric",20],["cottonwool",2]], - "output" : "sb_sweatervestchest", - "groups" : ["craftingwheel","clothes","all"] -} \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/legs/sweatervest.recipe b/recipes/starbound/spinningwheel/legs/sweatervest.recipe deleted file mode 100644 index 0cfbe203..00000000 --- a/recipes/starbound/spinningwheel/legs/sweatervest.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["fabric",10],"cottonwool"], - "output" : "sb_sweatervestlegs", - "groups" : ["craftingwheel","clothes","all"] -} \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/head/apexskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/apexskull.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/apexskull.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/apexskull.recipe diff --git a/recipes/starbound/spinningwheel/head/avianskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/avianskull.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/avianskull.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/avianskull.recipe diff --git a/recipes/starbound/spinningwheel/chest/cool.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/coolchest.recipe similarity index 100% rename from recipes/starbound/spinningwheel/chest/cool.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/coolchest.recipe diff --git a/recipes/starbound/spinningwheel/empty/chest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptychest.recipe similarity index 100% rename from recipes/starbound/spinningwheel/empty/chest.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/emptychest.recipe diff --git a/recipes/starbound/spinningwheel/empty/head.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptyhead.recipe similarity index 100% rename from recipes/starbound/spinningwheel/empty/head.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/emptyhead.recipe diff --git a/recipes/starbound/spinningwheel/empty/legs.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/emptylegs.recipe similarity index 100% rename from recipes/starbound/spinningwheel/empty/legs.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/emptylegs.recipe diff --git a/recipes/starbound/spinningwheel/head/eyehead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/eyehead.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/eyehead.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/eyehead.recipe diff --git a/recipes/starbound/spinningwheel/head/floranskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/floranskull.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/floranskull.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/floranskull.recipe diff --git a/recipes/starbound/spinningwheel/head/glitchskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/glitchskull.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/glitchskull.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/glitchskull.recipe diff --git a/recipes/starbound/spinningwheel/head/humanskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/humanskull.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/humanskull.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/humanskull.recipe diff --git a/recipes/starbound/spinningwheel/head/hylotlskull.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/hylotlskull.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/hylotlskull.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/hylotlskull.recipe diff --git a/recipes/starbound/spinningwheel/empty/back.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/invisibleback.recipe similarity index 100% rename from recipes/starbound/spinningwheel/empty/back.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/invisibleback.recipe diff --git a/recipes/starbound/spinningwheel/chest/shirtlong1.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtlong1.recipe similarity index 100% rename from recipes/starbound/spinningwheel/chest/shirtlong1.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtlong1.recipe diff --git a/recipes/starbound/spinningwheel/chest/shirtshort1.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtshort1.recipe similarity index 100% rename from recipes/starbound/spinningwheel/chest/shirtshort1.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/shirtshort1.recipe diff --git a/recipes/starbound/spinningwheel/snowinfantry/snowinfantrychest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrychest.recipe similarity index 100% rename from recipes/starbound/spinningwheel/snowinfantry/snowinfantrychest.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrychest.recipe diff --git a/recipes/starbound/spinningwheel/snowinfantry/snowinfantryhead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantryhead.recipe similarity index 100% rename from recipes/starbound/spinningwheel/snowinfantry/snowinfantryhead.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantryhead.recipe diff --git a/recipes/starbound/spinningwheel/snowinfantry/snowinfantrylegs.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrylegs.recipe similarity index 100% rename from recipes/starbound/spinningwheel/snowinfantry/snowinfantrylegs.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/snowinfantrylegs.recipe diff --git a/recipes/starbound/spinningwheel/head/winterscarfhead.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/winterscarfhead.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/winterscarfhead.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/winterscarfhead.recipe diff --git a/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe new file mode 100644 index 00000000..78c91f51 --- /dev/null +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workchest.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..2773f48e --- /dev/null +++ b/recipes/starbound/spinningwheel/spinningwheel1/clothes/worklegs.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["fabric",10],"cottonwool"], + "output" : "sb_worklegs", + "groups" : ["craftingwheel","clothes","all"] +} \ No newline at end of file diff --git a/recipes/starbound/spinningwheel/chest/workout.recipe b/recipes/starbound/spinningwheel/spinningwheel1/clothes/workoutchest.recipe similarity index 100% rename from recipes/starbound/spinningwheel/chest/workout.recipe rename to recipes/starbound/spinningwheel/spinningwheel1/clothes/workoutchest.recipe diff --git a/recipes/starbound/reagent/silkfibre.txt b/recipes/starbound/spinningwheel/spinningwheel1/ingredients/silkfibre.txt similarity index 100% rename from recipes/starbound/reagent/silkfibre.txt rename to recipes/starbound/spinningwheel/spinningwheel1/ingredients/silkfibre.txt diff --git a/recipes/starbound/spinningwheel/wedding/wedding1chest.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1chest.recipe similarity index 100% rename from recipes/starbound/spinningwheel/wedding/wedding1chest.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1chest.recipe diff --git a/recipes/starbound/spinningwheel/wedding/wedding1legs.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1legs.recipe similarity index 100% rename from recipes/starbound/spinningwheel/wedding/wedding1legs.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding1legs.recipe diff --git a/recipes/starbound/spinningwheel/wedding/wedding2chest.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2chest.recipe similarity index 100% rename from recipes/starbound/spinningwheel/wedding/wedding2chest.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2chest.recipe diff --git a/recipes/starbound/spinningwheel/wedding/wedding2head.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2head.recipe similarity index 100% rename from recipes/starbound/spinningwheel/wedding/wedding2head.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2head.recipe diff --git a/recipes/starbound/spinningwheel/wedding/wedding2legs.recipe b/recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2legs.recipe similarity index 100% rename from recipes/starbound/spinningwheel/wedding/wedding2legs.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/clothes/wedding2legs.recipe diff --git a/recipes/starbound/other/greybluedye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/greybluedye.recipe similarity index 100% rename from recipes/starbound/other/greybluedye.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/dyes/greybluedye.recipe diff --git a/recipes/starbound/other/lightgreydye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/lightgreydye.recipe similarity index 100% rename from recipes/starbound/other/lightgreydye.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/dyes/lightgreydye.recipe diff --git a/recipes/starbound/other/limegreendye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/limegreendye.recipe similarity index 100% rename from recipes/starbound/other/limegreendye.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/dyes/limegreendye.recipe diff --git a/recipes/starbound/other/tealdye.recipe b/recipes/starbound/spinningwheel/spinningwheel2/dyes/tealdye.recipe similarity index 100% rename from recipes/starbound/other/tealdye.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/dyes/tealdye.recipe diff --git a/recipes/starbound/spinningwheel/spinningwheel2/ingredients/canvas_fabric.recipe b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/canvas_fabric.recipe new file mode 100644 index 00000000..707265c8 --- /dev/null +++ b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/canvas_fabric.recipe @@ -0,0 +1,5 @@ +{ + "input": [["cottonwool", 2], ["fabric", 3]], + "output": "canvas", + "groups": ["craftingwheel2", "ingredients", "all"] +} diff --git a/recipes/starbound/spinningwheel/spinningwheel2/ingredients/canvas_polymer.recipe b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/canvas_polymer.recipe new file mode 100644 index 00000000..c6e53313 --- /dev/null +++ b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/canvas_polymer.recipe @@ -0,0 +1,5 @@ +{ + "input": [["cottonwool", 2], "polymer"], + "output": "canvas", + "groups": ["craftingwheel2", "ingredients", "all"] +} diff --git a/recipes/starbound/reagent/syntheticmaterial.recipe b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/syntheticmaterial.recipe similarity index 100% rename from recipes/starbound/reagent/syntheticmaterial.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/ingredients/syntheticmaterial.recipe diff --git a/recipes/starbound/reagent/thread.recipe b/recipes/starbound/spinningwheel/spinningwheel2/ingredients/thread.recipe similarity index 100% rename from recipes/starbound/reagent/thread.recipe rename to recipes/starbound/spinningwheel/spinningwheel2/ingredients/thread.recipe diff --git a/recipes/starbound/spinningwheel/head/glasses2head.recipe b/recipes/starbound/spinningwheel/tool/glasses2head.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/glasses2head.recipe rename to recipes/starbound/spinningwheel/tool/glasses2head.recipe diff --git a/recipes/starbound/spinningwheel/head/glasses3eyes.recipe b/recipes/starbound/spinningwheel/tool/glasses3eyes.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/glasses3eyes.recipe rename to recipes/starbound/spinningwheel/tool/glasses3eyes.recipe diff --git a/recipes/starbound/spinningwheel/head/glasses4.recipe b/recipes/starbound/spinningwheel/tool/glasses4.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/glasses4.recipe rename to recipes/starbound/spinningwheel/tool/glasses4.recipe diff --git a/recipes/starbound/spinningwheel/head/glasses5.recipe b/recipes/starbound/spinningwheel/tool/glasses5.recipe similarity index 100% rename from recipes/starbound/spinningwheel/head/glasses5.recipe rename to recipes/starbound/spinningwheel/tool/glasses5.recipe diff --git a/recipes/starbound/throwing/anvil/handgrenade.recipe b/recipes/starbound/throwing/anvil/handgrenade.recipe new file mode 100644 index 00000000..eef31971 --- /dev/null +++ b/recipes/starbound/throwing/anvil/handgrenade.recipe @@ -0,0 +1,5 @@ +{ + "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/thorngrenade.recipe b/recipes/starbound/throwing/anvil/thorngrenade.recipe new file mode 100644 index 00000000..323b4ae7 --- /dev/null +++ b/recipes/starbound/throwing/anvil/thorngrenade.recipe @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 00000000..f37cdc06 --- /dev/null +++ b/recipes/starbound/throwing/anvil/throwingdagger.recipe @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 00000000..21ccae13 --- /dev/null +++ b/recipes/starbound/throwing/anvil/throwingneedles.recipe @@ -0,0 +1,5 @@ +{ + "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 53b0cb45..3dfdc42e 100644 --- a/recipes/starbound/throwing/anvil2/electrogrenade.recipe +++ b/recipes/starbound/throwing/anvil2/electrogrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],"staticcell","sb_steelbar"], + "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 33778f35..dceacfe4 100644 --- a/recipes/starbound/throwing/anvil2/gasgrenade.recipe +++ b/recipes/starbound/throwing/anvil2/gasgrenade.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],"venomsample","sb_steelbar"], + "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 00ad42f6..b2584993 100644 --- a/recipes/starbound/throwing/anvil2/groundfirebomb.recipe +++ b/recipes/starbound/throwing/anvil2/groundfirebomb.recipe @@ -1,5 +1,5 @@ { - "input" : [["volatilepowder",4],"string","scorchedcore","sb_steelbar"], + "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/handgrenade.recipe b/recipes/starbound/throwing/anvil2/handgrenade.recipe deleted file mode 100644 index 2a6a8d52..00000000 --- a/recipes/starbound/throwing/anvil2/handgrenade.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["volatilepowder",6],"sb_steelbar"], - "output" : "sb_handgrenade", - "groups" : ["consumables","craftinganvil2","all"] -} \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/thorngrenade.recipe b/recipes/starbound/throwing/anvil2/thorngrenade.recipe deleted file mode 100644 index dc64a1d4..00000000 --- a/recipes/starbound/throwing/anvil2/thorngrenade.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["volatilepowder",4],"thornfruit","ironbar"], - "output" : "thorngrenade", - "duration" : 0.6, - "groups" : ["craftinganvil2","consumables","all"] -} \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/throwingdagger.recipe b/recipes/starbound/throwing/anvil2/throwingdagger.recipe deleted file mode 100644 index 7d5821bd..00000000 --- a/recipes/starbound/throwing/anvil2/throwingdagger.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : ["tungstenbar"], - "output" : ["throwingdagger",15], - "duration" : 0.3, - "groups" : ["craftinganvil2","consumables","all"] -} \ No newline at end of file diff --git a/recipes/starbound/throwing/anvil2/throwingneedles.recipe b/recipes/starbound/throwing/anvil2/throwingneedles.recipe deleted file mode 100644 index ae2a9671..00000000 --- a/recipes/starbound/throwing/anvil2/throwingneedles.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["ironbar"], - "output" : ["sb_throwingneedle",6], - "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 new file mode 100644 index 00000000..d33710f3 --- /dev/null +++ b/recipes/starbound/throwing/anvil3/corrosivegrenade.recipe @@ -0,0 +1,5 @@ +{ + "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/toxicbarrel.recipe b/recipes/starbound/throwing/anvil3/toxicbarrel.recipe new file mode 100644 index 00000000..86d9cde0 --- /dev/null +++ b/recipes/starbound/throwing/anvil3/toxicbarrel.recipe @@ -0,0 +1,6 @@ +{ + "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/capturepod.recipe b/recipes/starbound/throwing/capturepod.recipe deleted file mode 100644 index 829f621d..00000000 --- a/recipes/starbound/throwing/capturepod.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["sb_steelbar",2]], - "output" : "sb_capturepod", - "groups" : ["capturestation","all"] -} \ No newline at end of file diff --git a/recipes/starbound/throwing/crittercapturepod.recipe b/recipes/starbound/throwing/crittercapturepod.recipe deleted file mode 100644 index c066f333..00000000 --- a/recipes/starbound/throwing/crittercapturepod.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["platinumbar",2]], - "output" : "sb_crittercapturepod", - "groups" : ["capturestation","all"] -} \ No newline at end of file diff --git a/recipes/starbound/throwing/farm/throwingreed.recipe b/recipes/starbound/throwing/farm/throwingreed.recipe new file mode 100644 index 00000000..e61db2d7 --- /dev/null +++ b/recipes/starbound/throwing/farm/throwingreed.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["reed"], + "output" : ["sb_throwingreed",10], + "groups" : ["craftingfarm","hunting","all"] +} \ No newline at end of file diff --git a/recipes/starbound/tools/beamaxe.recipe b/recipes/starbound/tools/beamaxe.recipe deleted file mode 100644 index 8b17f1fd..00000000 --- a/recipes/starbound/tools/beamaxe.recipe +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input" : [["money",100]], - "output" : "sb_beamaxe", - "duration" : 0, - "groups" : ["sb_craftingtable","plain","sb_tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/blankblueprint.recipe b/recipes/starbound/tools/blankblueprint.recipe deleted file mode 100644 index 45b9446f..00000000 --- a/recipes/starbound/tools/blankblueprint.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["canvas"], - "output" : "sb_blankblueprint", - "groups" : ["sb_ironcraftingtable","craftingwheel2","sb_tools","ingredients","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/chainsaw.recipe b/recipes/starbound/tools/chainsaw.recipe deleted file mode 100644 index dd6c8932..00000000 --- a/recipes/starbound/tools/chainsaw.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["sb_steelbar",4],["wire",2],"smallbattery"], - "output" : "sb_chainsaw", - "groups" : ["craftingfarm2","farming","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/copybook.recipe b/recipes/starbound/tools/copybook.recipe deleted file mode 100644 index ec72cc89..00000000 --- a/recipes/starbound/tools/copybook.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["paper",3],"leather"], - "output" : "sb_copybook", - "groups" : ["sb_craftingtable","sb_tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/customcodex.recipe b/recipes/starbound/tools/customcodex.recipe deleted file mode 100644 index 8677078c..00000000 --- a/recipes/starbound/tools/customcodex.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["paper",3],"leather"], - "output" : "sb_customcodex", - "groups" : ["sb_craftingtable","sb_tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/draintool.recipe b/recipes/starbound/tools/draintool.recipe deleted file mode 100644 index 70fd1877..00000000 --- a/recipes/starbound/tools/draintool.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["manipulatormodule","bottle","goldbar","wire"], - "output" : "sb_draintool", - "groups" : ["sb_roboticcraftingtable","sb_tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/copperdrill.recipe b/recipes/starbound/tools/drills/copperdrill.recipe deleted file mode 100644 index ad858063..00000000 --- a/recipes/starbound/tools/drills/copperdrill.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["copperbar",12],"sb_handdrill"], - "output" : "copperdrill", - "groups" : ["sb_roboticcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/diamonddrill.recipe b/recipes/starbound/tools/drills/diamonddrill.recipe deleted file mode 100644 index c4f8906c..00000000 --- a/recipes/starbound/tools/drills/diamonddrill.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["diamond",12],"sb_handdrill"], - "output" : "diamonddrill", - "groups" : ["sb_roboticcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/diamonddrill2.recipe b/recipes/starbound/tools/drills/diamonddrill2.recipe deleted file mode 100644 index 9eecb6e6..00000000 --- a/recipes/starbound/tools/drills/diamonddrill2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["diamond",8],"platinumdrill"], - "output" : "diamonddrill", - "groups" : ["sb_roboticcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/golddrill.recipe b/recipes/starbound/tools/drills/golddrill.recipe deleted file mode 100644 index 7e03d094..00000000 --- a/recipes/starbound/tools/drills/golddrill.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["goldbar",12],"sb_handdrill"], - "output" : "golddrill", - "groups" : ["sb_roboticcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/golddrill2.recipe b/recipes/starbound/tools/drills/golddrill2.recipe deleted file mode 100644 index 8c7d5005..00000000 --- a/recipes/starbound/tools/drills/golddrill2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["goldbar",8],"silverdrill"], - "output" : "golddrill", - "groups" : ["sb_roboticcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/handdrill.recipe b/recipes/starbound/tools/drills/handdrill.recipe deleted file mode 100644 index 8f02b603..00000000 --- a/recipes/starbound/tools/drills/handdrill.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["battery",["sb_steelbar",6],["wire",4]], - "output" : "sb_handdrill", - "groups" : ["sb_roboticcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/platinumdrill.recipe b/recipes/starbound/tools/drills/platinumdrill.recipe deleted file mode 100644 index b682d77c..00000000 --- a/recipes/starbound/tools/drills/platinumdrill.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["platinumbar",12],"sb_handdrill"], - "output" : "platinumdrill", - "groups" : ["sb_roboticcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/platinumdrill2.recipe b/recipes/starbound/tools/drills/platinumdrill2.recipe deleted file mode 100644 index e5244797..00000000 --- a/recipes/starbound/tools/drills/platinumdrill2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["platinumbar",8],"golddrill"], - "output" : "platinumdrill", - "groups" : ["sb_roboticcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/silverdrill.recipe b/recipes/starbound/tools/drills/silverdrill.recipe deleted file mode 100644 index cf059245..00000000 --- a/recipes/starbound/tools/drills/silverdrill.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["silverbar",12],"sb_handdrill"], - "output" : "silverdrill", - "groups" : ["sb_roboticcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/drills/silverdrill2.recipe b/recipes/starbound/tools/drills/silverdrill2.recipe deleted file mode 100644 index c71e710a..00000000 --- a/recipes/starbound/tools/drills/silverdrill2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["silverbar",8],"copperdrill"], - "output" : "silverdrill", - "groups" : ["sb_roboticcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/farm/hoe2.recipe b/recipes/starbound/tools/farm/hoe2.recipe new file mode 100644 index 00000000..3112450a --- /dev/null +++ b/recipes/starbound/tools/farm/hoe2.recipe @@ -0,0 +1,5 @@ +{ + "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/ironaxe.recipe b/recipes/starbound/tools/farm/ironaxe.recipe new file mode 100644 index 00000000..38e48c8a --- /dev/null +++ b/recipes/starbound/tools/farm/ironaxe.recipe @@ -0,0 +1,5 @@ +{ + "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/ironaxe2.recipe b/recipes/starbound/tools/farm/ironaxe2.recipe new file mode 100644 index 00000000..6bc2d9a8 --- /dev/null +++ b/recipes/starbound/tools/farm/ironaxe2.recipe @@ -0,0 +1,5 @@ +{ + "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/preservatives.recipe b/recipes/starbound/tools/farm/preservatives.recipe new file mode 100644 index 00000000..944c3196 --- /dev/null +++ b/recipes/starbound/tools/farm/preservatives.recipe @@ -0,0 +1,5 @@ +{ + "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/wateringcan.recipe b/recipes/starbound/tools/farm/wateringcan.recipe similarity index 100% rename from recipes/starbound/tools/wateringcan.recipe rename to recipes/starbound/tools/farm/wateringcan.recipe diff --git a/recipes/starbound/tools/farm2/chainsaw.recipe b/recipes/starbound/tools/farm2/chainsaw.recipe new file mode 100644 index 00000000..de1d94a9 --- /dev/null +++ b/recipes/starbound/tools/farm2/chainsaw.recipe @@ -0,0 +1,5 @@ +{ + "input": [["sb_steelbar", 4], ["wire", 2], "smallbattery", ["liquidoil", 15]], + "output": "sb_chainsaw", + "groups": ["craftingfarm2", "farming", "all"] +} diff --git a/recipes/starbound/tools/farm2/flashfreeze.recipe b/recipes/starbound/tools/farm2/flashfreeze.recipe new file mode 100644 index 00000000..22a41f8d --- /dev/null +++ b/recipes/starbound/tools/farm2/flashfreeze.recipe @@ -0,0 +1,5 @@ +{ + "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/gps.recipe b/recipes/starbound/tools/farm2/gps.recipe similarity index 100% rename from recipes/starbound/tools/gps.recipe rename to recipes/starbound/tools/farm2/gps.recipe diff --git a/recipes/starbound/tools/healthmonitor.recipe b/recipes/starbound/tools/farm2/healthmonitor.recipe similarity index 100% rename from recipes/starbound/tools/healthmonitor.recipe rename to recipes/starbound/tools/farm2/healthmonitor.recipe diff --git a/recipes/starbound/tools/spaceairtank.recipe b/recipes/starbound/tools/farm2/spaceairtank.recipe similarity index 100% rename from recipes/starbound/tools/spaceairtank.recipe rename to recipes/starbound/tools/farm2/spaceairtank.recipe diff --git a/recipes/starbound/tools/inventors3/portable3dprinter.recipe b/recipes/starbound/tools/inventors3/portable3dprinter.recipe new file mode 100644 index 00000000..5601f515 --- /dev/null +++ b/recipes/starbound/tools/inventors3/portable3dprinter.recipe @@ -0,0 +1,5 @@ +{ + "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/ironaxe.recipe b/recipes/starbound/tools/ironaxe.recipe deleted file mode 100644 index f892caf0..00000000 --- a/recipes/starbound/tools/ironaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["ironbar",4],["darkwoodmaterial",12]], - "output" : "sb_ironaxe", - "groups" : ["sb_craftingtable","tools","craftingfarm","farming","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/ironaxe2.recipe b/recipes/starbound/tools/ironaxe2.recipe deleted file mode 100644 index 41549074..00000000 --- a/recipes/starbound/tools/ironaxe2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["ironbar",2],"sb_stoneaxe"], - "output" : "sb_ironaxe", - "groups" : ["sb_craftingtable","tools","nouncrafting","craftingfarm","farming","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/mining/beamaxe.recipe b/recipes/starbound/tools/mining/beamaxe.recipe new file mode 100644 index 00000000..75ac96ce --- /dev/null +++ b/recipes/starbound/tools/mining/beamaxe.recipe @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 00000000..d2a841d3 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/copperdrill.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..a7aba5a7 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/diamonddrill.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..e37545d4 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/diamonddrill2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..d7645681 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/golddrill.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..6963ba78 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/golddrill2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..9d7fe2fa --- /dev/null +++ b/recipes/starbound/tools/mining/drills/handdrill.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..f18fd468 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/platinumdrill.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..956ecd2c --- /dev/null +++ b/recipes/starbound/tools/mining/drills/platinumdrill2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..48f9eec6 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/silverdrill.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..20a5f432 --- /dev/null +++ b/recipes/starbound/tools/mining/drills/silverdrill2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..ef084eff --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/copperpickaxe.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..c0fbaf2a --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/diamondpickaxe.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..ff62284b --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/diamondpickaxe2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..4b5190a3 --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/goldpickaxe.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..f209c8a2 --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/goldpickaxe2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..701b116a --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/pickaxe.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..f57a1fd5 --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/pickaxe2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..2eebb634 --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/platinumpickaxe.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..735e7625 --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/platinumpickaxe2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..d9189c84 --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/silverpickaxe.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..87723ddc --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/silverpickaxe2.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..90cfbf5f --- /dev/null +++ b/recipes/starbound/tools/mining/pickaxes/stonepick.recipe @@ -0,0 +1,5 @@ +{ + "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/pickaxes/copperpickaxe.recipe b/recipes/starbound/tools/pickaxes/copperpickaxe.recipe deleted file mode 100644 index cd31802e..00000000 --- a/recipes/starbound/tools/pickaxes/copperpickaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["copperbar",8],"sb_stonepickaxe"], - "output" : "copperpickaxe", - "groups" : ["sb_craftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/diamondpickaxe.recipe b/recipes/starbound/tools/pickaxes/diamondpickaxe.recipe deleted file mode 100644 index f099d177..00000000 --- a/recipes/starbound/tools/pickaxes/diamondpickaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["diamond",8],"sb_stonepickaxe"], - "output" : "diamondpickaxe", - "groups" : ["sb_ironcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/diamondpickaxe2.recipe b/recipes/starbound/tools/pickaxes/diamondpickaxe2.recipe deleted file mode 100644 index 3e4990f3..00000000 --- a/recipes/starbound/tools/pickaxes/diamondpickaxe2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["diamond",4],"platinumpickaxe"], - "output" : "diamondpickaxe", - "groups" : ["sb_ironcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/goldpickaxe.recipe b/recipes/starbound/tools/pickaxes/goldpickaxe.recipe deleted file mode 100644 index 587f1927..00000000 --- a/recipes/starbound/tools/pickaxes/goldpickaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["goldbar",8],"sb_stonepickaxe"], - "output" : "goldpickaxe", - "groups" : ["sb_ironcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/goldpickaxe2.recipe b/recipes/starbound/tools/pickaxes/goldpickaxe2.recipe deleted file mode 100644 index aaa8d224..00000000 --- a/recipes/starbound/tools/pickaxes/goldpickaxe2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["goldbar",4],"silverpickaxe"], - "output" : "goldpickaxe", - "groups" : ["sb_ironcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/pickaxe.recipe b/recipes/starbound/tools/pickaxes/pickaxe.recipe deleted file mode 100644 index b05f33d3..00000000 --- a/recipes/starbound/tools/pickaxes/pickaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["ironbar",8],"sb_stonepickaxe"], - "output" : "pickaxe", - "groups" : ["sb_craftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/pickaxe2.recipe b/recipes/starbound/tools/pickaxes/pickaxe2.recipe deleted file mode 100644 index b33c684c..00000000 --- a/recipes/starbound/tools/pickaxes/pickaxe2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["ironbar",4],"copperpickaxe"], - "output" : "pickaxe", - "groups" : ["sb_craftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/platinumpickaxe.recipe b/recipes/starbound/tools/pickaxes/platinumpickaxe.recipe deleted file mode 100644 index 452f5e2f..00000000 --- a/recipes/starbound/tools/pickaxes/platinumpickaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["platinumbar",8],"sb_stonepickaxe"], - "output" : "platinumpickaxe", - "groups" : ["sb_ironcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/platinumpickaxe2.recipe b/recipes/starbound/tools/pickaxes/platinumpickaxe2.recipe deleted file mode 100644 index 4f0f9a1c..00000000 --- a/recipes/starbound/tools/pickaxes/platinumpickaxe2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["platinumbar",4],"goldpickaxe"], - "output" : "platinumpickaxe", - "groups" : ["sb_ironcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/silverpickaxe.recipe b/recipes/starbound/tools/pickaxes/silverpickaxe.recipe deleted file mode 100644 index 0eb67f4d..00000000 --- a/recipes/starbound/tools/pickaxes/silverpickaxe.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["silverbar",8],"sb_stonepickaxe"], - "output" : "silverpickaxe", - "groups" : ["sb_ironcraftingtable","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/silverpickaxe2.recipe b/recipes/starbound/tools/pickaxes/silverpickaxe2.recipe deleted file mode 100644 index 6674c6be..00000000 --- a/recipes/starbound/tools/pickaxes/silverpickaxe2.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["silverbar",4],"pickaxe"], - "output" : "silverpickaxe", - "groups" : ["sb_ironcraftingtable","tools","nouncrafting","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/pickaxes/stonepick.recipe b/recipes/starbound/tools/pickaxes/stonepick.recipe deleted file mode 100644 index dfcedc7c..00000000 --- a/recipes/starbound/tools/pickaxes/stonepick.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["darkwoodmaterial",8],["cobblestonematerial",8]], - "output" : "sb_stonepickaxe", - "groups" : ["plain","all","tools","sb_craftingtable","sb_tools"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/plain/slimehandgrapple.recipe b/recipes/starbound/tools/plain/slimehandgrapple.recipe new file mode 100644 index 00000000..3cc5130b --- /dev/null +++ b/recipes/starbound/tools/plain/slimehandgrapple.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["greenslime",2],"climbingrope"], + "output" : ["sb_slimehandgrapple",2], + "groups" : ["plain","tools","all"] +} \ No newline at end of file diff --git a/recipes/starbound/tools/portable3dprinter.recipe b/recipes/starbound/tools/portable3dprinter.recipe deleted file mode 100644 index 6eaf62f5..00000000 --- a/recipes/starbound/tools/portable3dprinter.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["money",200],["silverbar",5],"siliconboard"], - "output" : "sb_portable3dprinter", - "groups" : ["inventorstable3","craftingstations","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/slimehandgrapple_rope.recipe b/recipes/starbound/tools/slimehandgrapple_rope.recipe deleted file mode 100644 index caa719d2..00000000 --- a/recipes/starbound/tools/slimehandgrapple_rope.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : ["greenslime","climbingrope"], - "output" : "sb_slimehandgrapple", - "groups" : ["plain","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/slimehandgrapple_slime.recipe b/recipes/starbound/tools/slimehandgrapple_slime.recipe deleted file mode 100644 index 1bb0bed9..00000000 --- a/recipes/starbound/tools/slimehandgrapple_slime.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["greenslime",4]], - "output" : "sb_slimehandgrapple", - "groups" : ["plain","tools","all"] -} \ No newline at end of file diff --git a/recipes/starbound/tools/spinningwheel/blankblueprint.recipe b/recipes/starbound/tools/spinningwheel/blankblueprint.recipe new file mode 100644 index 00000000..5385f94c --- /dev/null +++ b/recipes/starbound/tools/spinningwheel/blankblueprint.recipe @@ -0,0 +1,5 @@ +{ + "input": ["canvas"], + "output": "sb_blankblueprint", + "groups": ["craftingwheel2", "ingredients", "all"] +} diff --git a/recipes/starbound/tools/tool/copybook.recipe b/recipes/starbound/tools/tool/copybook.recipe new file mode 100644 index 00000000..40673a48 --- /dev/null +++ b/recipes/starbound/tools/tool/copybook.recipe @@ -0,0 +1,5 @@ +{ + "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 new file mode 100644 index 00000000..eec9837e --- /dev/null +++ b/recipes/starbound/tools/tool/customcodex.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["paper",3],"leather"], + "output" : "sb_customcodex", + "groups" : ["sb_craftingtable","tools","all"] +} \ No newline at end of file diff --git a/recipes/starbound/tools/ladderdeployer.recipe b/recipes/starbound/tools/tool/ladderdeployer.recipe similarity index 100% rename from recipes/starbound/tools/ladderdeployer.recipe rename to recipes/starbound/tools/tool/ladderdeployer.recipe diff --git a/recipes/starbound/other/partypopper.recipe b/recipes/starbound/tools/tool/partypopper.recipe similarity index 100% rename from recipes/starbound/other/partypopper.recipe rename to recipes/starbound/tools/tool/partypopper.recipe diff --git a/recipes/starbound/tools/radio.recipe b/recipes/starbound/tools/tool/radio.recipe similarity index 100% rename from recipes/starbound/tools/radio.recipe rename to recipes/starbound/tools/tool/radio.recipe diff --git a/recipes/starbound/tools/songbook.recipe b/recipes/starbound/tools/tool/songbook.recipe similarity index 100% rename from recipes/starbound/tools/songbook.recipe rename to recipes/starbound/tools/tool/songbook.recipe diff --git a/recipes/starbound/tools/stoneaxe.recipe b/recipes/starbound/tools/tool/stoneaxe.recipe similarity index 100% rename from recipes/starbound/tools/stoneaxe.recipe rename to recipes/starbound/tools/tool/stoneaxe.recipe diff --git a/recipes/starbound/tools/stonehoe.recipe b/recipes/starbound/tools/tool/stonehoe.recipe similarity index 100% rename from recipes/starbound/tools/stonehoe.recipe rename to recipes/starbound/tools/tool/stonehoe.recipe diff --git a/recipes/starbound/other/wrappingpaper.recipe b/recipes/starbound/tools/tool/wrappingpaper.recipe similarity index 100% rename from recipes/starbound/other/wrappingpaper.recipe rename to recipes/starbound/tools/tool/wrappingpaper.recipe diff --git a/recipes/starbound/tools/tool3/draintool.recipe b/recipes/starbound/tools/tool3/draintool.recipe new file mode 100644 index 00000000..4069c3d9 --- /dev/null +++ b/recipes/starbound/tools/tool3/draintool.recipe @@ -0,0 +1,5 @@ +{ + "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/painttool.recipe b/recipes/starbound/tools/tool3/painttool.recipe similarity index 100% rename from recipes/starbound/tools/painttool.recipe rename to recipes/starbound/tools/tool3/painttool.recipe diff --git a/recipes/starbound/tools/wiretool.recipe b/recipes/starbound/tools/tool3/wiretool.recipe similarity index 100% rename from recipes/starbound/tools/wiretool.recipe rename to recipes/starbound/tools/tool3/wiretool.recipe diff --git a/recipes/starbound/treasuredtrophies/asranox.recipe b/recipes/starbound/treasuredtrophies/asranox.recipe new file mode 100644 index 00000000..f2f96edf --- /dev/null +++ b/recipes/starbound/treasuredtrophies/asranox.recipe @@ -0,0 +1,19 @@ +{ + "input": [ + "snorkelhead", + "valoroushead", + "valorouschest", + "valorouspants", + "hylotlmission2-codex", + "hylotlmission3-codex", + "hylotlmission4-codex", + /* "hylotlmission5-codex", + "hylotlmission6-codex", + "hylotlmission7-codex", + "hylotlmission8-codex", + "hylotlmission9-codex",*/ + "hylotlmission1-codex" + ], + "output": "asranoxaf", + "groups": ["sb_treasuredtrophies_outpost_mission3", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/bigape.recipe b/recipes/starbound/treasuredtrophies/bigape.recipe new file mode 100644 index 00000000..574fa733 --- /dev/null +++ b/recipes/starbound/treasuredtrophies/bigape.recipe @@ -0,0 +1,14 @@ +{ + "input": [ + "visorhead", + "miniknoghead", + "miniknogchest", + "miniknogpants", + "apexmission2-codex", + "apexmission3-codex", + "apexmission4-codex", + "apexmission1-codex" + ], + "output": "bigapeaf", + "groups": ["sb_treasuredtrophies_outpost_mission5", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/bonedragon.recipe b/recipes/starbound/treasuredtrophies/bonedragon.recipe new file mode 100644 index 00000000..7dc5983f --- /dev/null +++ b/recipes/starbound/treasuredtrophies/bonedragon.recipe @@ -0,0 +1,14 @@ +{ + "input": [ + "wizardhead", + "wizardchest", + "wizardlegs", + "wizardback", + "glitchmission2-codex", + "glitchmission3-codex", + "glitchmission4-codex", + "glitchmission1-codex" + ], + "output": "bonedragonaf", + "groups": ["sb_treasuredtrophies_outpost_mission6", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/dragonhead.recipe b/recipes/starbound/treasuredtrophies/dragonhead.recipe new file mode 100644 index 00000000..9d26bd02 --- /dev/null +++ b/recipes/starbound/treasuredtrophies/dragonhead.recipe @@ -0,0 +1,14 @@ +{ + "input": [ + "wizardhead", + "wizardchest", + "wizardlegs", + "wizardback", + "glitchmission2-codex", + "glitchmission3-codex", + "glitchmission4-codex", + "glitchmission1-codex" + ], + "output": "dragonhead", + "groups": ["sb_treasuredtrophies_outpost_mission6", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/dreadwing.recipe b/recipes/starbound/treasuredtrophies/dreadwing.recipe new file mode 100644 index 00000000..a8659f63 --- /dev/null +++ b/recipes/starbound/treasuredtrophies/dreadwing.recipe @@ -0,0 +1,9 @@ +{ + "input": [ + "bossdreadwing-codex", + "moltencore", + ["sb_dreadwreckage", 5] + ], + "output": "dreadwingaf", + "groups": ["sb_treasuredtrophies_outpost_beakeasy", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/erchiuseye.recipe b/recipes/starbound/treasuredtrophies/erchiuseye.recipe new file mode 100644 index 00000000..561de616 --- /dev/null +++ b/recipes/starbound/treasuredtrophies/erchiuseye.recipe @@ -0,0 +1,14 @@ +{ + "input": [ + "spacesuithead", + "spacesuitchest", + "spacesuitlegs", + "spacesuitback", + "lunarmission2-codex", + "lunarmission3-codex", + "lunarmission4-codex", + "lunarmission1-codex" + ], + "output": "erchiuseye", + "groups": ["sb_treasuredtrophies_outpost_mission1", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/erchiushorror.recipe b/recipes/starbound/treasuredtrophies/erchiushorror.recipe new file mode 100644 index 00000000..21adda26 --- /dev/null +++ b/recipes/starbound/treasuredtrophies/erchiushorror.recipe @@ -0,0 +1,14 @@ +{ + "input": [ + "spacesuithead", + "spacesuitchest", + "spacesuitlegs", + "spacesuitback", + "lunarmission2-codex", + "lunarmission3-codex", + "lunarmission4-codex", + "lunarmission1-codex" + ], + "output": "erchiushorroraf", + "groups": ["sb_treasuredtrophies_outpost_mission1", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/ixodoom.recipe b/recipes/starbound/treasuredtrophies/ixodoom.recipe new file mode 100644 index 00000000..83d4c6cc --- /dev/null +++ b/recipes/starbound/treasuredtrophies/ixodoom.recipe @@ -0,0 +1,16 @@ +{ + "input": [ + "ethnichead", + "vicioushead", + "predatoryhead", + "predatorychest", + "predatorypants", + "predatoryback", + "floranmission2-codex", + "floranmission3-codex", + "floranmission4-codex", + "floranmission1-codex" + ], + "output": "ixodoomaf", + "groups": ["sb_treasuredtrophies_outpost_mission2", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/ixodoomclaw.recipe b/recipes/starbound/treasuredtrophies/ixodoomclaw.recipe new file mode 100644 index 00000000..fce47963 --- /dev/null +++ b/recipes/starbound/treasuredtrophies/ixodoomclaw.recipe @@ -0,0 +1,16 @@ +{ + "input": [ + "ethnichead", + "vicioushead", + "predatoryhead", + "predatorychest", + "predatorypants", + "predatoryback", + "floranmission2-codex", + "floranmission3-codex", + "floranmission4-codex", + "floranmission1-codex" + ], + "output": "ixodoomclaw", + "groups": ["sb_treasuredtrophies_outpost_mission2", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/kluexavatar.recipe b/recipes/starbound/treasuredtrophies/kluexavatar.recipe new file mode 100644 index 00000000..b14ba24c --- /dev/null +++ b/recipes/starbound/treasuredtrophies/kluexavatar.recipe @@ -0,0 +1,15 @@ +{ + "input": [ + "phoenixhat", + "valkyriehelm", + "fullbunnyhead", + "tribalwingsback", + "tribalfeathersback", + "avianmission2-codex", + "avianmission3-codex", + "avianmission4-codex", + "avianmission1-codex" + ], + "output": "kluexavataraf", + "groups": ["sb_treasuredtrophies_outpost_mission4", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/kluexstaff.recipe b/recipes/starbound/treasuredtrophies/kluexstaff.recipe new file mode 100644 index 00000000..1406a0ca --- /dev/null +++ b/recipes/starbound/treasuredtrophies/kluexstaff.recipe @@ -0,0 +1,15 @@ +{ + "input": [ + "phoenixhat", + "valkyriehelm", + "fullbunnyhead", + "tribalwingsback", + "tribalfeathersback", + "avianmission2-codex", + "avianmission3-codex", + "avianmission4-codex", + "avianmission1-codex" + ], + "output": "kluexstaff", + "groups": ["sb_treasuredtrophies_outpost_mission4", "nouncrafting", "all"] +} diff --git a/recipes/starbound/treasuredtrophies/miniknoglauncher.recipe b/recipes/starbound/treasuredtrophies/miniknoglauncher.recipe new file mode 100644 index 00000000..4fa5120b --- /dev/null +++ b/recipes/starbound/treasuredtrophies/miniknoglauncher.recipe @@ -0,0 +1,14 @@ +{ + "input": [ + "visorhead", + "miniknoghead", + "miniknogchest", + "miniknogpants", + "apexmission2-codex", + "apexmission3-codex", + "apexmission4-codex", + "apexmission1-codex" + ], + "output": "miniknoglauncher", + "groups": ["sb_treasuredtrophies_outpost_mission5", "nouncrafting", "all"] +} diff --git a/recipes/starbound/bossloot/shockhoppermki.recipe b/recipes/starbound/treasuredtrophies/shockhoppermki.recipe similarity index 100% rename from recipes/starbound/bossloot/shockhoppermki.recipe rename to recipes/starbound/treasuredtrophies/shockhoppermki.recipe diff --git a/recipes/starbound/treasuredtrophies/soluskatana.recipe b/recipes/starbound/treasuredtrophies/soluskatana.recipe new file mode 100644 index 00000000..581dc26e --- /dev/null +++ b/recipes/starbound/treasuredtrophies/soluskatana.recipe @@ -0,0 +1,14 @@ +{ + "input" : [ + "snorkelhead", + "valoroushead", + "valorouschest", + "valorouspants", + "hylotlmission2-codex", + "hylotlmission3-codex", + "hylotlmission4-codex", + "hylotlmission1-codex" + ], + "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 new file mode 100644 index 00000000..78f2355e --- /dev/null +++ b/recipes/starbound/treasuredtrophies/swansong.recipe @@ -0,0 +1,11 @@ +{ + "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"] +} \ No newline at end of file diff --git a/recipes/starbound/other/tieredrewardbag.recipe b/recipes/starbound/treasuredtrophies/tieredrewardbag.recipe similarity index 100% rename from recipes/starbound/other/tieredrewardbag.recipe rename to recipes/starbound/treasuredtrophies/tieredrewardbag.recipe diff --git a/recipes/starbound/upgrades/blanktechcard.recipe b/recipes/starbound/upgrades/blanktechcard.recipe deleted file mode 100644 index ed4bd6a9..00000000 --- a/recipes/starbound/upgrades/blanktechcard.recipe +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["sb_techchip",3]], - "output" : "techcard", - "groups" : ["sb_craftingtable","other","plain","sb_techconsole","all"] -} \ No newline at end of file diff --git a/recipes/starbound/upgrades/manipulatormodule.recipe b/recipes/starbound/upgrades/manipulatormodule.recipe index 5983138d..f8a8dc8a 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","all"] + "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 bfff9c1d..1590636d 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","tools","all"] + "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 e9f692fc..ccabdb7b 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","tools","all"] + "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 a333fbe8..355aad1f 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","tools","all"] + "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 2fe1ac5e..94cede78 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","tools","all"] + "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 e592b697..f15f9431 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","tools","all"] + "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 dd792f2a..0305778d 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","tools","all"] + "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 new file mode 100644 index 00000000..4d582ade --- /dev/null +++ b/recipes/starbound/upgrades/techcard.recipe @@ -0,0 +1,5 @@ +{ + "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 44e324f1..85d50e87 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","sb_craftingtable","tools","all"] + "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 1a80b4cc..88dffb4a 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","sb_roboticcraftingtable","tools","all"] + "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 24d20a8f..aeb281bb 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","all"] + "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 98eb952b..3641da70 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","tools","all"] + "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 609ef3f4..403d95a5 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","tools","all"] + "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 fc60fe5c..5d82741e 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","tools","all"] + "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 44433a5e..8db578d7 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","tools","all"] + "groups" : ["sb_roboticcraftingtable","upgrades","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/axes/coralcleaver.recipe b/recipes/starbound/weapons/axes/coralcleaver.recipe index 31459255..936cfe78 100644 --- a/recipes/starbound/weapons/axes/coralcleaver.recipe +++ b/recipes/starbound/weapons/axes/coralcleaver.recipe @@ -1,6 +1,5 @@ { - "input" : [["refinedferozium",5],["coralfragment",15],["coalore",15]], - //originally used cerulium + "input" : [["refinedferozium",5],["coralfragment",7],["coalore",7]], "output" : ["sb_coralcleaver",1,{"level":5,"seed":1}], "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 5d230e6c..da2bf5af 100644 --- a/recipes/starbound/weapons/bows/aegisaltbow.recipe +++ b/recipes/starbound/weapons/bows/aegisaltbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedaegisalt",6],"string",["liquidoil",3]], + "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/firebow.recipe b/recipes/starbound/weapons/bows/firebow.recipe index c12d5fa7..0e4d29db 100644 --- a/recipes/starbound/weapons/bows/firebow.recipe +++ b/recipes/starbound/weapons/bows/firebow.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],"string","scorchedcore"], + "input" : [["titaniumbar",6],"thread","scorchedcore"], "output" : ["sb_firebow",1,{"seed":1,"level":3}], "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 b4ba7bd1..a7a58e94 100644 --- a/recipes/starbound/weapons/bows/frozenbow.recipe +++ b/recipes/starbound/weapons/bows/frozenbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],"string",["snowflake",15]], + "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/lightbow.recipe b/recipes/starbound/weapons/bows/lightbow.recipe index fc4f2281..44b8539d 100644 --- a/recipes/starbound/weapons/bows/lightbow.recipe +++ b/recipes/starbound/weapons/bows/lightbow.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",6],"string",["glowfibre",10]], + "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/pollenpump.recipe b/recipes/starbound/weapons/bows/pollenpump.recipe index 63aab47b..bde6c207 100644 --- a/recipes/starbound/weapons/bows/pollenpump.recipe +++ b/recipes/starbound/weapons/bows/pollenpump.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",6],["wildvines",5]], + "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"] diff --git a/recipes/starbound/weapons/broadswords/chromosword.recipe b/recipes/starbound/weapons/broadswords/chromosword.recipe index b27c1d36..f9e79e88 100644 --- a/recipes/starbound/weapons/broadswords/chromosword.recipe +++ b/recipes/starbound/weapons/broadswords/chromosword.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedferozium",10],["cellmatter",15]], + "input" : [["refinedferozium",10],["cellmatter",25]], //5 cellmateria "output" : ["sb_chromosword",1,{"level":5,"seed":18}], "groups" : ["craftingseparator","weapons","all"] diff --git a/recipes/starbound/weapons/broadswords/eyesword.recipe b/recipes/starbound/weapons/broadswords/eyesword.recipe index 01cd7686..045f3fe7 100644 --- a/recipes/starbound/weapons/broadswords/eyesword.recipe +++ b/recipes/starbound/weapons/broadswords/eyesword.recipe @@ -1,5 +1,6 @@ { "input" : [["durasteelbar",10],["eyepiles",30]], + //30 instead of 15 because 1:10 crafting rate "output" : ["sb_eyesword",1,{"level":4,"seed":2,"shortdescription":"Eye Sword"}], "groups" : ["craftinganvil2","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/firesword.recipe b/recipes/starbound/weapons/broadswords/firesword.recipe new file mode 100644 index 00000000..3bd4cfaa --- /dev/null +++ b/recipes/starbound/weapons/broadswords/firesword.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["titaniumbar",10],["corefragmentore",7],["glowfibre",7]], + "output" : ["sb_firesword",1,{"level":3,"seed":1,"shortdescription":"Fire Sword"}], + "groups" : ["craftinganvil2","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/firesword.txt b/recipes/starbound/weapons/broadswords/firesword.txt deleted file mode 100644 index c3bbc26a..00000000 --- a/recipes/starbound/weapons/broadswords/firesword.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["titaniumbar",10],["liquidlava",30],["sb_glowfibreorange",15]], - "output" : ["sb_firesword",1,{"level":3,"seed":42,"shortdescription":"Fire Sword"}], - "groups" : ["craftinganvil2","weapons","all"] -} \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/flowerbouquet.recipe b/recipes/starbound/weapons/broadswords/flowerbouquet.recipe index 67d5d7a0..57ce9196 100644 --- a/recipes/starbound/weapons/broadswords/flowerbouquet.recipe +++ b/recipes/starbound/weapons/broadswords/flowerbouquet.recipe @@ -1,5 +1,5 @@ { - "input" : [["plantfibre",5],["paper",5],["money",150]], + "input" : [["plantfibre",5],["paper",5]], "output" : "sb_flowerbouquet", "groups" : ["heartforge","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/rainbowsword.recipe b/recipes/starbound/weapons/broadswords/rainbowsword.recipe new file mode 100644 index 00000000..52f649dd --- /dev/null +++ b/recipes/starbound/weapons/broadswords/rainbowsword.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["titaniumbar",10],["rainbowwood",25]], + "output" : ["sb_rainbowsword",1,{"level":3,"seed":1}], + "groups" : ["craftinganvil2","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/watersword.recipe b/recipes/starbound/weapons/broadswords/watersword.recipe new file mode 100644 index 00000000..023737db --- /dev/null +++ b/recipes/starbound/weapons/broadswords/watersword.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["titaniumbar",10],["liquidwater",30],["kelp",15]], + "output" : ["sb_watersword",1,{"level":3,"seed":9,"shortdescription":"Water Sword"}], + "groups" : ["craftinganvil2","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/broadswords/watersword.txt b/recipes/starbound/weapons/broadswords/watersword.txt deleted file mode 100644 index d57db221..00000000 --- a/recipes/starbound/weapons/broadswords/watersword.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["titaniumbar",10],["liquidwater",30],["kelp",15]], - "output" : ["sb_watersword",1,{"level":3,"seed":1,"shortdescription":"Water Sword"}], - "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 2ed67116..bc481056 100644 --- a/recipes/starbound/weapons/daggers/splatterknife.recipe +++ b/recipes/starbound/weapons/daggers/splatterknife.recipe @@ -1,5 +1,5 @@ { - "input" : [["sb_refinedrubium",3],["sb_meatchunks",15],["bone",15]], + "input" : [["sb_refinedrubium",3],["sb_meatchunks",7],["bone",7]], //originally used impervium and fleshstrand "output" : ["sb_splatterknife",1,{"level":5,"seed":1}], "groups" : ["craftingseparator","weapons","all"] diff --git a/recipes/starbound/weapons/hammers/bonehammer.recipe b/recipes/starbound/weapons/hammers/bonehammer.recipe new file mode 100644 index 00000000..be07f8bf --- /dev/null +++ b/recipes/starbound/weapons/hammers/bonehammer.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["durasteelbar",10],["bone",25]], + "output" : ["sb_bonehammer",1,{"level":4,"seed":2,"shortdescription":"Bone Hammer"}], + "groups" : ["craftinganvil3","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/bonehammer.txt b/recipes/starbound/weapons/hammers/bonehammer.txt deleted file mode 100644 index 85928cc4..00000000 --- a/recipes/starbound/weapons/hammers/bonehammer.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["durasteelbar",10],["bone",25]], - "output" : ["sb_bonehammer",1,{"level":4,"seed":1}], - "groups" : ["craftinganvil3","weapons","all"] -} \ No newline at end of file diff --git a/recipes/starbound/weapons/hammers/tarhammer.txt b/recipes/starbound/weapons/hammers/tarhammer.recipe similarity index 100% rename from recipes/starbound/weapons/hammers/tarhammer.txt rename to recipes/starbound/weapons/hammers/tarhammer.recipe diff --git a/recipes/starbound/weapons/handguns/alienlaser.txt b/recipes/starbound/weapons/handguns/alienlaser.txt index 584a89a7..f58b774d 100644 --- a/recipes/starbound/weapons/handguns/alienlaser.txt +++ b/recipes/starbound/weapons/handguns/alienlaser.txt @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",4],["alientreesap",15]], + "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/tranquilizergun.recipe b/recipes/starbound/weapons/handguns/tranquilizergun.recipe index d11a51bb..7c85abdd 100644 --- a/recipes/starbound/weapons/handguns/tranquilizergun.recipe +++ b/recipes/starbound/weapons/handguns/tranquilizergun.recipe @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",4],["biosample",15],"syringe"], + "input" : [["durasteelbar",4],["biosample",15]], "output" : ["sb_tranquilizergun",1,{"seed":1,"level":4}], "groups" : ["craftinganvil3","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/corrosivegun.recipe b/recipes/starbound/weapons/longguns/corrosivegun.recipe new file mode 100644 index 00000000..7a7e5486 --- /dev/null +++ b/recipes/starbound/weapons/longguns/corrosivegun.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["durasteelbar",10],["alienwoodsap",25]], + "output" : ["sb_corrosivegun",1,{"level":4}], + "groups" : ["craftinganvil2","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/longguns/corrosivegun.txt b/recipes/starbound/weapons/longguns/corrosivegun.txt deleted file mode 100644 index 7962334d..00000000 --- a/recipes/starbound/weapons/longguns/corrosivegun.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input" : [["durasteelbar",10],["sb_corrosivegrenade",5]], - "output" : ["sb_corrosivegun",1,{"seed":1,"level":4}], - "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 387e48c9..e3662d7c 100644 --- a/recipes/starbound/weapons/shields/frostshield.recipe +++ b/recipes/starbound/weapons/shields/frostshield.recipe @@ -1,5 +1,5 @@ { - "input" : [["snowflake",20],["titaniumbar",5]], + "input" : [["titaniumbar",5],["snowflake",15]], "output" : ["frostshield",1,{"level":3}], "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 0cf54dd0..d19b2dfe 100644 --- a/recipes/starbound/weapons/shields/mushroomshield.recipe +++ b/recipes/starbound/weapons/shields/mushroomshield.recipe @@ -1,5 +1,5 @@ { - "input" : [["shroom",20],["tungstenbar",5]], + "input" : [["tungstenbar",5],["shroom",15]], "output" : ["mushroomshield",1,{"level":2,"shortdescription":"Mushroom Shield"}], "groups" : ["craftinganvil","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 5f60b88b..3593dce9 100644 --- a/recipes/starbound/weapons/shortswords/cutarrh.recipe +++ b/recipes/starbound/weapons/shortswords/cutarrh.recipe @@ -1,6 +1,5 @@ { - "input" : [["refinedaegisalt",5],["greenslime",30]], - //used slime and greenslime + "input" : [["refinedaegisalt",5],["greenslime",15]], "output" : ["sb_cutarrh",1,{"level":5,"seed":1}], "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 new file mode 100644 index 00000000..111f3d4b --- /dev/null +++ b/recipes/starbound/weapons/shortswords/mushroomsword.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["tungstenbar",5],["shroom",15],"phasematter"], + "output" : ["sb_mushroomsword",1,{"level":2,"seed":1,"shortdescription":"Magic Shroom Sword","animationPartVariants":{"blade":1,"handle":15}}], + "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 new file mode 100644 index 00000000..a289e1c4 --- /dev/null +++ b/recipes/starbound/weapons/shortswords/mushroomsword2.recipe @@ -0,0 +1,5 @@ +{ + "input" : [["tungstenbar",5],["shroom",15],"venomsample"], + "output" : ["sb_mushroomsword2",1,{"level":2,"seed":1}], + "groups" : ["craftinganvil","weapons","all"] +} \ No newline at end of file diff --git a/recipes/starbound/weapons/shortswords/t1knife.recipe b/recipes/starbound/weapons/shortswords/t1knife.recipe index c85cfe08..6b8b94d1 100644 --- a/recipes/starbound/weapons/shortswords/t1knife.recipe +++ b/recipes/starbound/weapons/shortswords/t1knife.recipe @@ -1,5 +1,5 @@ { - "input" : [["ironbar",5],["darkwoodmaterial",2]], - "output" : "sb_huntingknife", - "groups" : ["craftingfarm","hunting"] -} \ No newline at end of file + "input": [["ironbar", 5], ["darkwoodmaterial", 2]], + "output": "sb_huntingknife", + "groups": ["craftingfarm", "hunting", "all"] +} diff --git a/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt b/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt index f03feff0..f2baecd2 100644 --- a/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt +++ b/recipes/starbound/weapons/shortswords/undergrowthtrimmer.txt @@ -1,5 +1,5 @@ { - "input" : [["durasteelbar",5],["wildvines",30]], + "input" : [["durasteelbar",5],["wildvines",15]], "output" : ["sb_undergrowthtrimmer",1,{"level":4,"seed":1}], "groups" : ["craftinganvil2","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 75f0a7b7..1bd9230c 100644 --- a/recipes/starbound/weapons/spears/frostspear.recipe +++ b/recipes/starbound/weapons/spears/frostspear.recipe @@ -1,5 +1,5 @@ { - "input" : [["titaniumbar",10],["snowflake",20]], + "input" : [["titaniumbar",10],["snowflake",25]], "output" : ["sb_frostspear",1,{"level":3,"seed":1}], "groups" : ["weapons","craftinganvil2","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/hackman.recipe b/recipes/starbound/weapons/spears/hackman.recipe index b306d5f4..647fd4be 100644 --- a/recipes/starbound/weapons/spears/hackman.recipe +++ b/recipes/starbound/weapons/spears/hackman.recipe @@ -1,5 +1,5 @@ { - "input" : [["refinedviolium",10],["crystal",15],["crystalplant",5]], + "input" : [["refinedviolium",10],["crystal",12],["crystalplant",12]], "output" : ["sb_hackman",1,{"level":5,"seed":1}], "groups" : ["craftingseparator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/spears/sabertoothspear.recipe b/recipes/starbound/weapons/spears/sabertoothspear.recipe index 446d45be..a7f42b8b 100644 --- a/recipes/starbound/weapons/spears/sabertoothspear.recipe +++ b/recipes/starbound/weapons/spears/sabertoothspear.recipe @@ -1,5 +1,5 @@ { - "input" : [["tungstenbar",10],["tarball",10],["bone",10]], + "input" : [["tungstenbar",10],["tarball",12],["bone",12]], "output" : ["sb_sabertoothspear",1,{"level":2,"seed":1}], "groups" : ["weapons","craftinganvil","all"] } \ No newline at end of file diff --git a/recipes/starbound/weapons/staves/uraniumrodstaff.recipe b/recipes/starbound/weapons/staves/uraniumrodstaff.recipe index 18b1b80f..9a4ef9b9 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",5]], + "input" : [["sb_refinedrubium",6],["durasteelbar",6],"battery",["uraniumrod",6],["toxicwaste",25]], "output" : ["sb_uraniumrodstaff",1,{"level":5,"seed":1}], "groups" : ["craftingmanipulator","weapons","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/mechanics/dpstestdummy.recipe b/recipes/starbound/wire/mechanics/dpstestdummy.recipe new file mode 100644 index 00000000..a1ef3c99 --- /dev/null +++ b/recipes/starbound/wire/mechanics/dpstestdummy.recipe @@ -0,0 +1,5 @@ +{ + "input": ["scarecrow", "wire", "smallbattery", "siliconboard", "stickofram"], + "output": "sb_dpstestdummy", + "groups": ["craftingwiring", "mechanics", "all"] +} diff --git a/recipes/starbound/wire/forcepad.recipe b/recipes/starbound/wire/mechanics/forcepad.recipe similarity index 100% rename from recipes/starbound/wire/forcepad.recipe rename to recipes/starbound/wire/mechanics/forcepad.recipe diff --git a/recipes/starbound/wire/mechanicalelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorlong.recipe similarity index 100% rename from recipes/starbound/wire/mechanicalelevatorlong.recipe rename to recipes/starbound/wire/mechanics/furniture/mechanicalelevatorlong.recipe diff --git a/recipes/starbound/wire/mechanicalelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture/mechanicalelevatorshort.recipe similarity index 100% rename from recipes/starbound/wire/mechanicalelevatorshort.recipe rename to recipes/starbound/wire/mechanics/furniture/mechanicalelevatorshort.recipe diff --git a/recipes/starbound/wire/steelelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture/steelelevatorlong.recipe similarity index 88% rename from recipes/starbound/wire/steelelevatorlong.recipe rename to recipes/starbound/wire/mechanics/furniture/steelelevatorlong.recipe index a4c199bc..b173e996 100644 --- a/recipes/starbound/wire/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","craftingfurniture2","all"] + "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/steelelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture/steelelevatorshort.recipe similarity index 88% rename from recipes/starbound/wire/steelelevatorshort.recipe rename to recipes/starbound/wire/mechanics/furniture/steelelevatorshort.recipe index 6fad934f..501a9d9c 100644 --- a/recipes/starbound/wire/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","craftingfurniture2","all"] + "groups" : ["craftingwiring","mechanics","decoration","craftingfurniture","all"] } \ No newline at end of file diff --git a/recipes/starbound/wire/woodenelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture/woodenelevatorlong.recipe similarity index 100% rename from recipes/starbound/wire/woodenelevatorlong.recipe rename to recipes/starbound/wire/mechanics/furniture/woodenelevatorlong.recipe diff --git a/recipes/starbound/wire/woodenelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture/woodenelevatorshort.recipe similarity index 100% rename from recipes/starbound/wire/woodenelevatorshort.recipe rename to recipes/starbound/wire/mechanics/furniture/woodenelevatorshort.recipe diff --git a/recipes/starbound/wire/durasteelelevatorlong.recipe b/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorlong.recipe similarity index 100% rename from recipes/starbound/wire/durasteelelevatorlong.recipe rename to recipes/starbound/wire/mechanics/furniture2/durasteelelevatorlong.recipe diff --git a/recipes/starbound/wire/durasteelelevatorshort.recipe b/recipes/starbound/wire/mechanics/furniture2/durasteelelevatorshort.recipe similarity index 100% rename from recipes/starbound/wire/durasteelelevatorshort.recipe rename to recipes/starbound/wire/mechanics/furniture2/durasteelelevatorshort.recipe diff --git a/recipes/starbound/wire/pump.recipe b/recipes/starbound/wire/mechanics/pump.recipe similarity index 100% rename from recipes/starbound/wire/pump.recipe rename to recipes/starbound/wire/mechanics/pump.recipe diff --git a/recipes/starbound/wire/standingturret.recipe b/recipes/starbound/wire/mechanics/standingturret.recipe similarity index 100% rename from recipes/starbound/wire/standingturret.recipe rename to recipes/starbound/wire/mechanics/standingturret.recipe diff --git a/recipes/starbound/wire/switches/ironswitch.recipe b/recipes/starbound/wire/switches/ironswitch.recipe new file mode 100644 index 00000000..c8c096f1 --- /dev/null +++ b/recipes/starbound/wire/switches/ironswitch.recipe @@ -0,0 +1,5 @@ +{ + "input" : ["ironbar","copperbar",["wire",5],"smallbattery"], + "output" : "ironswitch", + "groups" : ["craftingwiring", "switches", "all"] +} \ No newline at end of file diff --git a/recipes/starbound/furniture/switches/tier10switch.recipe b/recipes/starbound/wire/switches/tier10switch.recipe similarity index 100% rename from recipes/starbound/furniture/switches/tier10switch.recipe rename to recipes/starbound/wire/switches/tier10switch.recipe diff --git a/recipes/starbound/furniture/switches/tier5switch.recipe b/recipes/starbound/wire/switches/tier5switch.recipe similarity index 100% rename from recipes/starbound/furniture/switches/tier5switch.recipe rename to recipes/starbound/wire/switches/tier5switch.recipe diff --git a/recipes/starbound/furniture/switches/tier6switch.recipe b/recipes/starbound/wire/switches/tier6switch.recipe similarity index 100% rename from recipes/starbound/furniture/switches/tier6switch.recipe rename to recipes/starbound/wire/switches/tier6switch.recipe diff --git a/recipes/starbound/furniture/switches/tier7switch.recipe b/recipes/starbound/wire/switches/tier7switch.recipe similarity index 100% rename from recipes/starbound/furniture/switches/tier7switch.recipe rename to recipes/starbound/wire/switches/tier7switch.recipe diff --git a/recipes/starbound/furniture/switches/tier8switch.recipe b/recipes/starbound/wire/switches/tier8switch.recipe similarity index 100% rename from recipes/starbound/furniture/switches/tier8switch.recipe rename to recipes/starbound/wire/switches/tier8switch.recipe diff --git a/recipes/starbound/furniture/switches/tier9switch.recipe b/recipes/starbound/wire/switches/tier9switch.recipe similarity index 100% rename from recipes/starbound/furniture/switches/tier9switch.recipe rename to recipes/starbound/wire/switches/tier9switch.recipe diff --git a/sb_commands.config b/sb_commands.config index 390df325..41726c73 100644 --- a/sb_commands.config +++ b/sb_commands.config @@ -37,7 +37,7 @@ "boneboo": [20, 150], "cacti": [10, 75], "carrot": [10, 75], - "chili": [5, 40], + "chili": [15, 40], "cocoa": [15, 120], "coconut": [15, 120], "chocolate": [15, 120], @@ -73,6 +73,7 @@ "wartweed": [10, 75], "wheat": [10, 50], "sb_poisoncreep": [15, 120], + "sb_butter": [10, 50], "alienmeat": [20, 25], "rawbacon": [10, 25], diff --git a/sb_commands.lua b/sb_commands.lua index 1a8d10a5..d40d044c 100644 --- a/sb_commands.lua +++ b/sb_commands.lua @@ -5,7 +5,6 @@ local ini = 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 ---find a better way to gsub. perferably when not exhsusted local function cutColors(text) return string.gsub(string.gsub(text, "(%^.-%;)", ""),("\n"),"") end local function findPlayer(id) @@ -18,7 +17,6 @@ local function findPlayer(id) return false end ---function v.spawnProjectile(clientId, arguments) return "/spawnitem copperore" end --[[function v.whisper(you,args) local text = root.assetJson("/sb_commands.config") local them, msg = args[1], "" args[1]="" for i,v in ipairs(args) do msg=msg..v.." " end @@ -47,13 +45,7 @@ function v.itemID(_,it,detailed) local text = root.assetJson("/sb_commands.confi local item = root.itemConfig(it) if detailed then return sb.printJson(item,1) end --todo: loop with values in keys - local out = string.format("\n^green;Directory:^reset; ^#fff;%s%s.%s^reset;\n^green;Rarity: ^#%s;%s^reset;\n^yellow;Name: ^reset;%s\n^yellow;Category: ^reset;%s\n^yellow;Description: ^reset;%s\n^yellow;Two-Handed: ^reset;%s\n^yellow;Type: ^reset;%s\n^green;Max Stack:^reset; %s\n^green;No. Recipes:^reset; %s\n^green;Tags:^reset; %s\n^green;Tooltip Kind:^reset; %s\n^green;Fields:^reset; %s\n^green;Scripts:^reset; %s",item.directory, item.config.itemName, text.itemTypes[root.itemType(it)] or root.itemType(it),rarities[string.lower(item.config.rarity)],item.config.rarity,item.config.shortdescription,item.config.category,item.config.description,item.config.twoHanded,root.itemType(it),item.config.maxStack or root.assetJson("/items/defaultParameters.config:defaultMaxStack").." (default)",#root.recipesForItem(it),sb.printJson(root.itemTags(it)),item.config.tooltipKind,sb.printJson(item.config.tooltipFields),sb.printJson(item.config.scripts)) - ---[[ if detailed then out=out.."\n" - for param,value in pairs(item.config) do - if type(value) ~= "string" and type(value)~="bool" and type(value)~="int" and type(value)~="float" and type(value)~="double" then value=sb.printJson(value) end--table.unpack(value) end--"" end--sb.printJson(value) or "" end - out=string.format(out.."^orange;%s: %s\n",param,value) - end end]]-- + local out = string.format("\n^green;Directory:^reset; ^#fff;%s%s.%s^reset;\n^green;Rarity: ^#%s;%s^reset;\n^yellow;Name: ^reset;%s\n^yellow;Category: ^reset;%s\n^yellow;Description: ^reset;%s\n^yellow;Two-Handed: ^reset;%s\n^yellow;Type: ^reset;%s\n^green;Max Stack:^reset; %s\n^green;No. Recipes:^reset; %s\n^green;Tags:^reset; %s\n^green;Tooltip Kind:^reset; %s\n^green;Fields:^reset; %s\n^green;Scripts:^reset; %s",item.directory, item.config.itemName, text.itemTypes[root.itemType(it)] or root.itemType(it),rarities[string.lower(item.config.rarity)],item.config.rarity,item.config.shortdescription,item.config.category,item.config.description,item.config.twoHanded,root.itemType(it),item.config.maxStack or root.assetJson("/items/defaultParameters.config:defaultMaxStack").." (default)",#root.recipesForItem(it),sb.printJson(root.itemTags(it)),item.config.tooltipKind,sb.printJson(item.config.tooltipFields),sb.printJson(item.config.scripts)) return out end end @@ -117,19 +109,19 @@ function v.sb_rarity(_,it) local text = root.assetJson("/sb_commands.config") recipe = recipe[dr].input local rarities = { - common = 1, - uncommon = 2, - rare = 3, - legendary = 4, - essential = 5 + common = 1, + uncommon = 2, + rare = 3, + legendary = 4, + essential = 5 } local rarityNames = { - "^#f6f6f6;Common", - "^#77ee67;Uncommon", - "^#6ba8ec;Rare", - "^#bb5beb;Legendary", - "^#c3c53e;Essential" + "^#f6f6f6;Common", + "^#77ee67;Uncommon", + "^#6ba8ec;Rare", + "^#bb5beb;Legendary", + "^#c3c53e;Essential" } it = root.itemConfig(it).config diff --git a/sb_definitions/crossbow.config b/sb_definitions/crossbow.config new file mode 100644 index 00000000..5d4cb79f --- /dev/null +++ b/sb_definitions/crossbow.config @@ -0,0 +1,76 @@ +{ + "maxStack": 1, + "price": 620, + "muzzleOffset": [-0.3, 0.199], + "baseOffset": [-1.55, 0], + "tooltipKind": "sb_gun", + "category": "crossbow", + "description": "", + "twoHanded": true, + "level": 1, + "scripts": ["/items/active/weapons/ranged/gun.lua"], + "animation": "/items/active/starbound/guns/randomgenerated/gun.animation", + "animationParts": { + "muzzleFlash": "" + }, + "animationCustom": { + "sounds": { + "fire": ["/sfx/gun/crossbow1.ogg"] + } + }, + + "elementalType": "physical", + "primaryAbilityType": "sb_gun2", + "altAbilityType": "sb_burst", + "primaryAbility": { + "projectileType": ["woodenbolt"], + "fireSounds": ["/sfx/gun/crossbow1.ogg", "/sfx/gun/sniper2.ogg", "/sfx/gun/sniper3.ogg", "/sfx/gun/sniper4.ogg"], + "fireTime": [0.6, 1.6], + "baseDps": [5, 5.5], + "energyUsage": [6, 12], + "inaccuracy": 0, + "projectileParameters": { + "knockbackRange": [15, 20] + }, + "stances": { + "idle": {}, + "fire": {}, + "cooldown": { + "duration": 0.25 + } + } + }, + "altAbility": { + "baseDps": 4.5, + "stances": { + "fire": { + "recoil": true + } + } + }, + + "builderConfig": [{ + "nameGenerator": "crossbownames.config:nameGen", + "animationParts": { + "barrel": { + "path": "barrel/.png", + "variants": 3, + "paletteSwap": true + }, + "butt": { + "path": "butt/.png", + "variants": 3, + "paletteSwap": true + }, + "middle": { + "path": "middle/.png", + "variants": 3, + "paletteSwap": true + } + }, + "palette": "/items/active/starbound/colors/crossbow.weaponcolors", + "iconDrawables": ["butt", "middle", "barrel"], + "gunParts": ["butt", "middle", "barrel"] + } + ] +} diff --git a/sb_definitions/techchest.config b/sb_definitions/techchest.config deleted file mode 100644 index 63b4b11a..00000000 --- a/sb_definitions/techchest.config +++ /dev/null @@ -1,34 +0,0 @@ -{ - "colonyTags": ["storage"], - "printable": false, - "objectType": "container", - "tooltipKind": "sb_container", - "scripts": ["/scripts/sb_container.lua"], - "category": "storage", - "description" : "A chest with bright glowing markings throughout.", - "race": "generic", - - "apexDescription": "A chest for storing tech.", - "avianDescription": "A solid tech chest. It glows.", - "floranDescription": "Glowy box hold Floran thingsss.", - "glitchDescription": "Resolute. I endeavour to fill this chest.", - "humanDescription": "A basic, dependable tech chest.", - "hylotlDescription": "A chest in which I can store tech.", - "novakidDescription" : "Ooh, I bet it's chock full o' valuables.", - - "inventoryIcon": "icons.png:", - "orientations": [{ - "dualImage": "tiertechchest.png:.", - "imagePosition": [-8, 0], - - "spaceScan": 0.1, - "anchors": ["bottom"] - } - ], - - "openSounds": ["/sfx/objects/chest_small_open.ogg"], - "closeSounds": ["/sfx/objects/chest_small_close.ogg"], - "uiConfig": "/interface/sb_chests/chest.config", - "frameCooldown": 5, - "autoCloseCooldown": 3600 -} diff --git a/sb_projectiles.config b/sb_projectiles.config index 8dbfa480..ca125b7f 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"}], "assetmissing" : "Unknown", "bouncybullet" : "Bouncy Bullet", "explosivebullet" : "Explosive Bullet", "fast" : "Fast Bullet", "standardbullet" : "Bullet", "huntingbullet" : "Hunting Bullet", - "piercingbullet" : ["Piercing Bullet",{"rarity":"uncommon"}] + "piercingbullet" : ["Piercing Bullet",{"rarity":"uncommon"}], "sb_homingbullet" : ["Homing Bullet",{"rarity":"uncommon"}] } \ No newline at end of file diff --git a/sb_uimessages/blueprints/blueprintKnown.currency b/sb_uimessages/blueprints/blueprintKnown.currency new file mode 100644 index 00000000..c69f4991 --- /dev/null +++ b/sb_uimessages/blueprints/blueprintKnown.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:blueprintKnown", + "shortdescription": " Blueprint already known.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/blueprints/blueprintsKnown.currency b/sb_uimessages/blueprints/blueprintsKnown.currency new file mode 100644 index 00000000..dc46f4a9 --- /dev/null +++ b/sb_uimessages/blueprints/blueprintsKnown.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:blueprintsKnown", + "shortdescription": " Blueprints already known.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/d10.currency b/sb_uimessages/hunger/d10.currency new file mode 100644 index 00000000..02471274 --- /dev/null +++ b/sb_uimessages/hunger/d10.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:d10", + "shortdescription": " ^#d5ab36;Can barely stand...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/d100.currency b/sb_uimessages/hunger/d100.currency new file mode 100644 index 00000000..f9e88c1d --- /dev/null +++ b/sb_uimessages/hunger/d100.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:d100", + "shortdescription": " ^#d5ab36;Still full.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/d15.currency b/sb_uimessages/hunger/d15.currency new file mode 100644 index 00000000..44cae465 --- /dev/null +++ b/sb_uimessages/hunger/d15.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:d15", + "shortdescription": " ^#d5ab36;Can't take it much longer...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/d2.currency b/sb_uimessages/hunger/d2.currency new file mode 100644 index 00000000..7de5fedf --- /dev/null +++ b/sb_uimessages/hunger/d2.currency @@ -0,0 +1,10 @@ +{ + "itemName" : "sb_uimessage:d2", + "shortdescription" : " ^#d5ab36;Goodbye cruel world...^clear;", + "currency" : "sb_uimessage", + "rarity" : "rare", + "value" : 0, + "pickupSoundsSmall" : [""], + "pickupSoundsMedium" : [""], + "pickupSoundsLarge" : [""] +} diff --git a/sb_uimessages/hunger/d25.currency b/sb_uimessages/hunger/d25.currency new file mode 100644 index 00000000..6f4ba50c --- /dev/null +++ b/sb_uimessages/hunger/d25.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:d25", + "shortdescription": " ^#d5ab36;Sooooo hungry...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/d5.currency b/sb_uimessages/hunger/d5.currency new file mode 100644 index 00000000..9222b7ff --- /dev/null +++ b/sb_uimessages/hunger/d5.currency @@ -0,0 +1,10 @@ +{ + "itemName" : "sb_uimessage:d5", + "shortdescription" : " ^#d5ab36;I see a light...^clear;", + "currency" : "sb_uimessage", + "rarity" : "rare", + "value" : 0, + "pickupSoundsSmall" : [""], + "pickupSoundsMedium" : [""], + "pickupSoundsLarge" : [""] +} diff --git a/sb_uimessages/hunger/d50.currency b/sb_uimessages/hunger/d50.currency new file mode 100644 index 00000000..583c94b0 --- /dev/null +++ b/sb_uimessages/hunger/d50.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:d50", + "shortdescription": " ^#d5ab36;Getting pretty hungry...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/d75.currency b/sb_uimessages/hunger/d75.currency new file mode 100644 index 00000000..73a41f0d --- /dev/null +++ b/sb_uimessages/hunger/d75.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:d75", + "shortdescription": " ^#d5ab36;Getting peckish.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u10.currency b/sb_uimessages/hunger/u10.currency new file mode 100644 index 00000000..8405b60d --- /dev/null +++ b/sb_uimessages/hunger/u10.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u10", + "shortdescription": " ^#d5ab36;More, more!^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u100.currency b/sb_uimessages/hunger/u100.currency new file mode 100644 index 00000000..c073ecac --- /dev/null +++ b/sb_uimessages/hunger/u100.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u100", + "shortdescription": " ^#d5ab36;Mmm, full.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u15.currency b/sb_uimessages/hunger/u15.currency new file mode 100644 index 00000000..0a2c8856 --- /dev/null +++ b/sb_uimessages/hunger/u15.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u15", + "shortdescription": " ^#d5ab36;Must find more food...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u2.currency b/sb_uimessages/hunger/u2.currency new file mode 100644 index 00000000..ac77f627 --- /dev/null +++ b/sb_uimessages/hunger/u2.currency @@ -0,0 +1,11 @@ +{ + "itemName": "sb_uimessage:u2", + //"shortdescription" : " Awake. Head throbbing. Vision blurry.^clear;", + "shortdescription": " ^#d5ab36;Is this a joke?^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u25.currency b/sb_uimessages/hunger/u25.currency new file mode 100644 index 00000000..314e5448 --- /dev/null +++ b/sb_uimessages/hunger/u25.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u25", + "shortdescription": " ^#d5ab36;Need more...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u5.currency b/sb_uimessages/hunger/u5.currency new file mode 100644 index 00000000..bbf09954 --- /dev/null +++ b/sb_uimessages/hunger/u5.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u5", + "shortdescription": " ^#d5ab36;I'll die if I don't get some more...^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u50.currency b/sb_uimessages/hunger/u50.currency new file mode 100644 index 00000000..8c9a0390 --- /dev/null +++ b/sb_uimessages/hunger/u50.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u50", + "shortdescription": " ^#d5ab36;Still hungry.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/hunger/u75.currency b/sb_uimessages/hunger/u75.currency new file mode 100644 index 00000000..f9ce7020 --- /dev/null +++ b/sb_uimessages/hunger/u75.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:u75", + "shortdescription": " ^#d5ab36;That's better.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/tech/newTech.currency b/sb_uimessages/tech/newTech.currency new file mode 100644 index 00000000..9863532a --- /dev/null +++ b/sb_uimessages/tech/newTech.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:newTech", + "shortdescription": " New tech available.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/tech/vehicle_appear2.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/tech/techAlreadyEquipped.currency b/sb_uimessages/tech/techAlreadyEquipped.currency new file mode 100644 index 00000000..e550c663 --- /dev/null +++ b/sb_uimessages/tech/techAlreadyEquipped.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:techAlreadyEquipped", + "shortdescription": " Tech already equipped.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/clickon_error.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/tech/techFail.currency b/sb_uimessages/tech/techFail.currency new file mode 100644 index 00000000..6b56a0e7 --- /dev/null +++ b/sb_uimessages/tech/techFail.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:techFail", + "shortdescription": " Tech incompatible.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/clickon_error.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/tech/techKnown.currency b/sb_uimessages/tech/techKnown.currency new file mode 100644 index 00000000..95e14f9d --- /dev/null +++ b/sb_uimessages/tech/techKnown.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:techKnown", + "shortdescription": " Tech already known.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/energy_out2.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/tech/techNotBinded.currency b/sb_uimessages/tech/techNotBinded.currency new file mode 100644 index 00000000..522f7b4e --- /dev/null +++ b/sb_uimessages/tech/techNotBinded.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:techNotBinded", + "shortdescription": " Can't swap from non-binded tech.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/clickon_error.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/tech/techNotKnown.currency b/sb_uimessages/tech/techNotKnown.currency new file mode 100644 index 00000000..565e6a29 --- /dev/null +++ b/sb_uimessages/tech/techNotKnown.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:techNotKnown", + "shortdescription": " Tech not known.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/energy_out2.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/unsorted/areaProtected.currency b/sb_uimessages/unsorted/areaProtected.currency new file mode 100644 index 00000000..b163fec5 --- /dev/null +++ b/sb_uimessages/unsorted/areaProtected.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:areaProtected", + "shortdescription": " Can't build here.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/unsorted/enhancementApplied.currency b/sb_uimessages/unsorted/enhancementApplied.currency new file mode 100644 index 00000000..fac0e8a4 --- /dev/null +++ b/sb_uimessages/unsorted/enhancementApplied.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:enhancementApplied", + "shortdescription": " Enhancement already applied.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": ["/sfx/interface/clickon_error.ogg"], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/unsorted/noEffect.currency b/sb_uimessages/unsorted/noEffect.currency new file mode 100644 index 00000000..b0866064 --- /dev/null +++ b/sb_uimessages/unsorted/noEffect.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:noEffect", + "shortdescription": " There's no effect.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/sb_uimessages/unsorted/noSpaceForObject.currency b/sb_uimessages/unsorted/noSpaceForObject.currency new file mode 100644 index 00000000..71462e4b --- /dev/null +++ b/sb_uimessages/unsorted/noSpaceForObject.currency @@ -0,0 +1,10 @@ +{ + "itemName": "sb_uimessage:noSpaceForObject", + "shortdescription": " Not enough free space.^clear;", + "currency": "sb_uimessage", + "rarity": "rare", + "value": 0, + "pickupSoundsSmall": [""], + "pickupSoundsMedium": [""], + "pickupSoundsLarge": [""] +} diff --git a/scripts/actions/monsters/sb_farmable.lua b/scripts/actions/monsters/sb_farmable.lua index b5bfa8cb..d357bc5d 100644 --- a/scripts/actions/monsters/sb_farmable.lua +++ b/scripts/actions/monsters/sb_farmable.lua @@ -2,14 +2,17 @@ require "/scripts/vec2.lua" local ini = init or function() end function init() ini() 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 "") - if s == monster.type() then s = feed.."fluffalo" spawnPosition[2] = spawnPosition[2]+1 end - world.spawnMonster(s, spawnPosition, {level = monster.level() or 1, aggressive = false, evolveTime = config.getParameter("evolveTime",-1)}) --monster.seed monster.uniqueParameters - monster.setDropPool(nil) - monster.setDeathParticleBurst(nil) - monster.setDeathSound(nil) - status.setResource("health", 0) + local spawnPosition = vec2.add(mcontroller.position(), vec2.mul({0,0}, {mcontroller.facingDirection(), 1})) + local s = feed.."fluffalo"..(config.getParameter("behavior","") == "farmablebaby" and "baby" or "") + if s == monster.type() then + s = feed.."fluffalo" + spawnPosition[2] = spawnPosition[2]+1 + end + world.spawnMonster(s, spawnPosition, {level = monster.level() or 1, aggressive = false, evolveTime = config.getParameter("evolveTime",-1)}) --monster.seed monster.uniqueParameters + monster.setDropPool(nil) + monster.setDeathParticleBurst(nil) + monster.setDeathSound(nil) + status.setResource("health", 0) return true end) end \ No newline at end of file diff --git a/scripts/activeitem/sb_swing.lua b/scripts/activeitem/sb_swing.lua index 58194b39..b572c048 100644 --- a/scripts/activeitem/sb_swing.lua +++ b/scripts/activeitem/sb_swing.lua @@ -1,15 +1,34 @@ function swingInit() - pi = -math.pi/2 - swing = 0.15 - firing = false - activeItem.setArmAngle(pi) + activeItem.setArmAngle(-math.pi / 2) + swingStart = config.getParameter("swingStart", -60) * math.pi / 180 + swingFinish = config.getParameter("swingFinish", 40) * math.pi / 180 + currentSwing = swingStart + currentAngle = -swingStart + useTime = config.getParameter("useTime", 0.1) + autoFire = config.getParameter("autoFire") end -function animateSwing(i) activeItem.setArmAngle(pi) script.setUpdateDelta(i or 0) end -function update(dt,f,s) - if f == "primary" and not firing then firing = true end - if firing then - swing = math.max(0, swing - dt) - activeItem.setArmAngle(pi * (swing / 0.15)) - if swing <= 0 then swingAction(dt,f,s) end + +function update(dt, fireMode, shiftHeld) + aimAngle, aimDirection = activeItem.aimAngleAndDirection(0, activeItem.ownerAimPosition()) + activeItem.setFacingDirection(aimDirection) + + if not useTimer and fireMode == "primary" and not justUsed then + useTimer = useTime + justUsed = autoFire and true or false end + + if useTimer then + useTimer = useTimer - dt + currentAngle = ((currentSwing - swingFinish) * useTimer / 0.15 * 1)/2.4 + activeItem.setArmAngle(currentAngle) + + if currentAngle >= swingFinish then + swingAction(dt, fireMode, shiftHeld) + activeItem.setArmAngle(-math.pi / 2) + currentAngle = -swingStart + currentSwing = swingStart + useTimer = nil + end + end + justUsed = fireMode == "primary" and not autoFire end \ No newline at end of file diff --git a/scripts/augments/sb_copybook.lua b/scripts/augments/sb_copybook.lua index 4e23dcb3..c52f1dda 100644 --- a/scripts/augments/sb_copybook.lua +++ b/scripts/augments/sb_copybook.lua @@ -2,12 +2,26 @@ require "/scripts/augments/item.lua" function apply(input) local output = Item.new(input) - local exchange = 0 - local defaults = {"codex","sb_copybook",{}} - local maxStack = output:instanceValue("maxStack",root.itemConfig(output.name).config.maxStack or root.assetJson("/items/defaultParameters.config:defaultMaxStack")) - local category = output:instanceValue("category","") - if (string.lower(category) == config.getParameter("sb_copybookTypes",defaults)[1]) or output:instanceValue(config.getParameter("sb_copybooktypes",defaults)[2],false) or output.name == config.getParameter("sb_copybooktypes",defaults)[3] then - if output.count < maxStack then exchange = 1 end - output.count = output.count + exchange end - return output:descriptor(), exchange + if output:instanceValue("sb_uncopyable") or string.sub(output.name, -7) == "-recipe" then return output:descriptor(), 0 end --Blueprints aren't stackable nor do they have a maxStack value + local count = 0 + local maxStack = output:instanceValue("maxStack", root.assetJson("/items/defaultParameters.config:defaultMaxStack")) + local conditions = config.getParameter("sb_copybookConditions") + if output.count < maxStack then + if conditions then + if hasValue(string.lower(output:instanceValue("category", "")), conditions.categories or {}) or hasValue(output.name, conditions.itemTags or {}, true) then + count = 1 + output.count = output.count + 1 + end + end + end + return output:descriptor(), count +end + +function hasValue(target, values, checkTags) + local valid = false + for i = 1, #values do + valid = checkTags and root.itemHasTag(target, values[i]) or (target == values[i]) + if valid then break end + end + return valid end \ No newline at end of file diff --git a/scripts/augments/sb_dye.lua b/scripts/augments/sb_dye.lua index 1217c864..7086f473 100644 --- a/scripts/augments/sb_dye.lua +++ b/scripts/augments/sb_dye.lua @@ -1,20 +1,28 @@ -require "/scripts/augments/item.lua" local appl = apply or function(a) return a end function apply(input) local output = Item.new(input) local used = false - if output:instanceValue("sb_dyeable",false) then - local dyeDirectives = not config.getParameter("dyeColorIndex",true) and config.getParameter("dyeDirectives",{}) or config.getParameter("sb_dyeDirectives") or 0 - if type(dyeDirectives) == "table" then dyeDirectives = "?"..paletteSwapDirective(dyeDirectives) end + if output:instanceValue("sb_dyeable", false) then + local dyeDirectives = not config.getParameter("dyeColorIndex", true) and config.getParameter("dyeDirectives", {}) or config.getParameter("sb_dyeDirectives") or 0 + if type(dyeDirectives) == "table" then + dyeDirectives = "?"..paletteSwapDirective(dyeDirectives) + end if dyeDirectives == 0 then local defaultDirectives = root.itemConfig(output:descriptor().name).config.directives or "" - used = output:instanceValue("directives")~=defaultDirectives - output:setInstanceValue("directives",defaultDirectives) goto a end - if dyeDirectives and output:instanceValue("sb_backingDirectives","")..dyeDirectives..output:instanceValue("sb_extraDirectives","") ~= output:instanceValue("directives","") then - output:setInstanceValue("directives", output:instanceValue("sb_backingDirectives","")..dyeDirectives..output:instanceValue("sb_extraDirectives","")) - local inventoryIcon = output:instanceValue("inventoryIcon") - used = true - end else return appl(input) end - ::a:: - return output:descriptor(), config.getParameter("sb_reusable",used) and 1 or 0 + used = output:instanceValue("directives") ~= defaultDirectives + if used then + output:setInstanceValue("directives", defaultDirectives) + end + goto finished + end + local newDirectives = output:instanceValue("sb_backingDirectives", "")..dyeDirectives..output:instanceValue("sb_extraDirectives", "") + if dyeDirectives and newDirectives ~= output:instanceValue("directives", "") then + output:setInstanceValue("directives", newDirectives) + used = true + end + else + return appl(input) + end + ::finished:: + return output:descriptor(), config.getParameter("sb_reusable", used) and 1 or 0 end \ No newline at end of file diff --git a/scripts/augments/sb_flashfreeze.lua b/scripts/augments/sb_flashfreeze.lua new file mode 100644 index 00000000..a5625301 --- /dev/null +++ b/scripts/augments/sb_flashfreeze.lua @@ -0,0 +1,64 @@ +require "/scripts/augments/item.lua" +require "/scripts/sb_assetmissing.lua" + +function apply(input) + local output = Item.new(input) + if output:instanceValue("sb_unfreezeable") then return output:descriptor(), 0 end + local item = root.itemConfig(output.name) + local directory = item.directory + item = item.config + if item.itemAgingScripts and not output:instanceValue("sb_preserved2") then --I'd like to check for a rotTimeMultiplier in case some non-food items use a rotting script, but it defaults to 1 so not every item has it, and that's far more likely than someone implementing decaying isotopes in a popular mod + local pp = config.getParameter("persistentParameters") + for i = 1, #pp do + output:setInstanceValue(pp[i], output:instanceValue(pp[i])) + end + output.name = "sb_preservedfood" + output.parameters.originalItemName = item.name + + local icon = output.parameters.inventoryIcon + local fade = config.getParameter("fade","?fade=f9ed88;0.05") + if icon then + icon = type(icon) == "string" and sb_pathToImage(icon, directory)..fade or icon + if type(icon) == "table" then + for i = 1, #icon do + icon[i].image = sb_pathToImage(icon[i].image, directory)..fade + end + end + end + output:setInstanceValue("inventoryIcon",icon) + local newParams = config.getParameter("applyParameters",{}) + for k, v in pairs(newParams) do output:setInstanceValue(k,v) end + newParams = config.getParameter("uniqueApplyParameters")[item.category or "other"] + if newParams then for k, v in pairs(newParams) do output:setInstanceValue(k,v) end end --fix for only items with a category parameter (not config) working + + if item.foodValue then + local foodValue = config.getParameter("foodValueReduction") + foodValue = math.floor(item.foodValue * foodValue) + output:setInstanceValue("foodValue", foodValue) + + local fields = output:instanceValue("tooltipFields",{}) + foodValue = "Food: "..math.floor(foodValue,1) + fields.foodAmountLabel = foodValue + fields.foodValueLabel = foodValue + output:setInstanceValue("tooltipFields",fields) + end + + local subtitles = root.assetJson("/items/categories.config:labels") + local category = output:instanceValue("category", "other") + local subtitle = output:instanceValue("subtitle") + category = subtitle or category + if category == "preparedFood" then category = "food" end + category = string.gsub(category:gsub("sb_",""),"^%l", string.upper) + output.parameters.subtitle = "sb_preserved"..category + + local maxStack = item.maxStack or 0 + if maxStack > root.assetJson("/items/defaultParameters.config:defaultMaxStack") then + output.parameters.maxStack = maxStack + end + output.parameters.timeToRot = nil + output.parameters.animation = nil + output.parameters.scripts = nil + + return output:descriptor(), 1 + end +end \ No newline at end of file diff --git a/scripts/augments/sb_module.lua b/scripts/augments/sb_module.lua index 03f9cf76..c5e41c72 100644 --- a/scripts/augments/sb_module.lua +++ b/scripts/augments/sb_module.lua @@ -1,8 +1,23 @@ require "/scripts/augments/item.lua" require "/scripts/sb_assetmissing.lua" - +sb_conditions={} +sb_conditions["not"] = function(data) + return output:instanceValue(data[2], data[3]) == data[3] +end function apply(input) - local output = Item.new(input) + output = Item.new(input) + + local current = config.getParameter("sb_moduleConditions") + if current then + for i = 1, #current do + if sb_conditions[current[i][1]](current[i]) then + sb.logInfo("Stopping") + return + end + end + end + sb.logInfo("Going") + if output.name == config.getParameter("sb_moduleDont",{}) then return output:descriptor(), 0 end if output and config.getParameter("sb_module") then local p = config.getParameter("sb_module") for i, v in pairs(p) do output:setInstanceValue(i,v) end end if config.getParameter("sb_moduleFind") then if not string.find(output.name,config.getParameter("sb_moduleFind")) then return output:descriptor(), 0 end end @@ -13,7 +28,14 @@ function apply(input) if config.getParameter("sb_moduleItemStack") then output.count=output.count+config.getParameter("price",0)+1 end if config.getParameter("sb_modulePreserveIcon") then output:setInstanceValue("inventoryIcon",output.config.codexIcon or sb_assetmissing(sb_pathToImage(output.config.inventoryIcon,root.itemConfig(output.name).directory))) end if config.getParameter("sb_level") then output:setInstanceValue("level",output:instanceValue("level",0)+config.getParameter("price",0)) end - if config.getParameter("sb_moduleItemAppend") then output.name = sb_itemExists(output.name..config.getParameter("sb_moduleItemAppend")) and output.name..config.getParameter("sb_moduleItemAppend") or output.name end + if config.getParameter("sb_moduleAppend") then + local a = config.getParameter("sb_moduleAppend") + for k, v in pairs(a) do + if output:instanceValue(k) then + output:setInstanceValue(k, output:instanceValue(k)..v) + end + end + end if config.getParameter("sb_moduleLog") then sb.logInfo(sb.printJson(output,1)) end if config.getParameter("sb_moduleItem") then output.name=config.getParameter("sb_moduleItem") output:setInstanceValue("itemName",config.getParameter("sb_moduleItem")) end if config.getParameter("sb_moduleNoParams") then local c = config.getParameter("sb_moduleForceCount",output.count) output = Item.new(root.createItem(output.name)) output.count = c output:setInstanceValue("itemName",config.getParameter("sb_moduleItem")) end diff --git a/scripts/augments/sb_ore.lua b/scripts/augments/sb_ore.lua deleted file mode 100644 index 85704495..00000000 --- a/scripts/augments/sb_ore.lua +++ /dev/null @@ -1,22 +0,0 @@ -require "/scripts/augments/item.lua" - -function apply(input) - local ore = config.getParameter("durabilityRegen",0) - local output = Item.new(input) - local count = 1 - if ore then - local type = root.itemConfig(output.name).config.sb_repairType or nil - local canRepair = type == config.getParameter("sb_repairType",nil) -- == (ore < 0) - if canRepair then - local base = root.itemConfig(output.name).config.durability or 0 - if output:instanceValue("durabilityHit", nil) then - if (ore > 0) and output:instanceValue("durabilityHit") <= 0 then output:setInstanceValue("durabilityHit",0) count = 0 end - if (ore < 0) and output:instanceValue("durabilityHit") >= base then output:setInstanceValue("durabilityHit",base) count = 0 end - if count == 1 then output:setInstanceValue("durabilityHit",output:instanceValue("durabilityHit") - ore) end - if (ore > 0) and output:instanceValue("durabilityHit") <= 0 then output:setInstanceValue("durabilityHit",0) end - if (ore < 0) and output:instanceValue("durabilityHit") >= base then output:setInstanceValue("durabilityHit",base) end - return output:descriptor(), count - end - end - end -end \ No newline at end of file diff --git a/scripts/augments/sb_preservatives.lua b/scripts/augments/sb_preservatives.lua index 0e49b0ae..71adefad 100644 --- a/scripts/augments/sb_preservatives.lua +++ b/scripts/augments/sb_preservatives.lua @@ -1,52 +1,33 @@ require "/scripts/augments/item.lua" -require "/scripts/sb_assetmissing.lua" function apply(input) local output = Item.new(input) - local item = root.itemConfig(output.name) - local directory = item.directory - item = item.config - if item.itemAgingScripts and not output:instanceValue("sb_preserved2") then --I'd like to check for a rotTimeMultiplier in case some non-food items use a rotting script, but it defaults to 1 so not every item has it, and that's far more likely than someone implementing decaying isotopes in a popular mod - local pp = config.getParameter("persistentParameters") - for i = 1, #pp do - output:setInstanceValue(pp[i], output:instanceValue(pp[i])) - end - output.name = "sb_preservedfood" - - local icon = output.parameters.inventoryIcon - local fade = config.getParameter("fade","?fade=f9ed88;0.05") - if icon then - icon = type(icon) == "string" and sb_pathToImage(icon, directory)..fade or icon - if type(icon) == "table" then - for i = 1, #icon do - icon[i].image = sb_pathToImage(icon[i].image, directory)..fade + if output:instanceValue("sb_unpreserveable") then return output:descriptor(), 0 end + local item = root.itemConfig(output.name).config + local itemAgingScripts = item.itemAgingScripts or {} + if next(itemAgingScripts) then + local timeToRot = root.assetJson("/items/rotting.config:baseTimeToRot") * (output.parameters.rottingMultiplier or output.config.rottingMultiplier or 1) + if output.parameters.timeToRot < timeToRot then + --Check if there are any other tooltipFields. If not, delete the whole thing so it stacks with items that havent generated theirs, otherwise just remove the rotTimeLabel + local fields = 0 + if output.parameters.tooltipFields then --Oh, woe is me, for # cannot return the size of a table. + for _, _ in pairs(output.parameters.tooltipFields) do + fields = fields + 1 + if fields > 1 then break end + end + if fields > 1 then + require(itemAgingScripts[1]) + if getRotTimeDescription then + rotTimeLabel = getRotTimeDescription(timeToRot) --If this causes issues, run ageItem + end + output.parameters.tooltipFields.rotTimeLabel = rotTimeLabel --If we don't get a rotTimeLabel, does it really matter if we toss the old one out? end end + output.parameters.timeToRot = nil + if not rotTimeLabel then + output.parameters.tooltipFields = nil + end + return output:descriptor(), 1 end - output:setInstanceValue("inventoryIcon",icon) - local category = item.category - local newParams = config.getParameter("applyParameters",{}) - for k, v in pairs(newParams) do output:setInstanceValue(k,v) end - newParams = config.getParameter(category.."ApplyParameters") - if newParams then for k, v in pairs(newParams) do output:setInstanceValue(k,v) end end --fix for only items with a category parameter working - - if item.foodValue then - local foodValue = config.getParameter("foodValueReduction") - foodValue = item.foodValue * foodValue - output:setInstanceValue("foodValue", foodValue) - - local fields = output:instanceValue("tooltipFields",{}) - foodValue = "Food: "..math.floor(foodValue,1) - fields.foodAmountLabel = foodValue - fields.foodValueLabel = foodValue - output:setInstanceValue("tooltipFields",fields) - end - - output.parameters.maxStack = root.assetJson("/items/defaultParameters.config:defaultMaxStack") - output.parameters.timeToRot = nil - output.parameters.animation = nil - output.parameters.scripts = nil - - return output:descriptor(), 1 end end \ No newline at end of file diff --git a/scripts/augments/sb_repair.lua b/scripts/augments/sb_repair.lua new file mode 100644 index 00000000..7b7fa927 --- /dev/null +++ b/scripts/augments/sb_repair.lua @@ -0,0 +1,22 @@ +require "/scripts/augments/item.lua" +--TODO: check the item type instead of having different tools. activeitems are reversed +--Maybe we could make them repair percentages instead +function apply(input) + local output = Item.new(input) + if output:instanceValue("sb_unrepairable") then return output:descriptor(), 0 end + local durabilityRegen = config.getParameter("durabilityRegen", 0) + local count = 1 + if durabilityRegen then + if (root.itemConfig(output.name).config.sb_repairType or nil) == config.getParameter("sb_repairType", nil) then --We could have it check primaryAbility.class for BeamMine if other mods add laser miners... + local baseDurability = root.itemConfig(output.name).config.durability or 0 + if output:instanceValue("durabilityHit", nil) then + if (durabilityRegen > 0) and output:instanceValue("durabilityHit") <= 0 then output:setInstanceValue("durabilityHit",0) count = 0 end + if (durabilityRegen < 0) and output:instanceValue("durabilityHit") >= baseDurability then output:setInstanceValue("durabilityHit",baseDurability) count = 0 end + if count == 1 then output:setInstanceValue("durabilityHit", output:instanceValue("durabilityHit") - durabilityRegen) end + if (durabilityRegen > 0) and output:instanceValue("durabilityHit") <= 0 then output:setInstanceValue("durabilityHit",0) end + if (durabilityRegen < 0) and output:instanceValue("durabilityHit") >= baseDurability then output:setInstanceValue("durabilityHit",baseDurability) end + return output:descriptor(), count + end + end + end +end \ No newline at end of file diff --git a/scripts/augments/sb_upgrade.lua b/scripts/augments/sb_upgrade.lua index 84792f98..f0347640 100644 --- a/scripts/augments/sb_upgrade.lua +++ b/scripts/augments/sb_upgrade.lua @@ -8,10 +8,13 @@ function apply(input) local upgradeable = false local tags = output:instanceValue("itemTags",{}) + local upgradeTags = config.getParameter("upgradeTags",{"weapon","shield"}) for i = 1, #tags do - if tags[i] == "weapon" then - upgradeable = true - break + for j = 1, #upgradeTags do + if tags[i] == upgradeTags[j] then + upgradeable = true + break + end end end diff --git a/scripts/companions/sb_capturable.lua b/scripts/companions/sb_capturable.lua deleted file mode 100644 index afa01639..00000000 --- a/scripts/companions/sb_capturable.lua +++ /dev/null @@ -1,365 +0,0 @@ -require "/scripts/companions/util.lua" -require "/scripts/achievements.lua" ---require "/scripts/companions/capturable.lua" - --- Functions for entities that can be captured with a capturepod -betabound_capturable = {} - -local ini = init or function () end -function init() ini() - --if betabound_capturable.wasRelocated() then monster.setDisplayNametag(true) end - self.killCount = status.stat("sb_killCount",0) - sb_doLeveling = false --status.isResource("sb_killCount") --- if sb_doLeveling then monster.setDisplayNametag(true) end - self.petInflictedDamage = damageListener("inflictedDamage", petInflictedDamageCallback) - --- message.setHandler("betabound_pet.genname", function () return root.generateName("/celestial/anomalynames.config:nameGen",monster.seed()) --and planet name... - -- end) - - message.setHandler("betabound_pet.attemptCapture", function (_, _, ...) --- self.shouldDie = false - return betabound_capturable.attemptCapture(...) - end) - - message.setHandler("betabound_pet.attemptRelocate", function (_, _, ...) - return betabound_capturable.attemptRelocate(...) - end) - - message.setHandler("betabound_pet.returnToPod", function(_, _, ...) - local status = betabound_capturable.captureStatus() - betabound_capturable.recall() - return status - end) - - message.setHandler("betabound_pet.status", function(_, _, persistentEffects, damageTeam) - if persistentEffects then - status.setPersistentEffects("owner", persistentEffects) - end - if damageTeam then - monster.setDamageTeam(damageTeam) - end - return { status = betabound_capturable.captureStatus() } - end) - - local initialStatus = config.getParameter("initialStatus") - - if initialStatus then setCurrentStatus(initialStatus, "owner") end - if betabound_capturable.podUuid() then betabound_capturable.startReleaseAnimation() end - - if betabound_capturable.wasRelocated() and not storage.spawned then - status.addEphemeralEffect("monsterrelocatespawn") - storage = config.getParameter("relocateStorage", {}) - storage.spawned = true - end -end - -function betabound_capturable.startReleaseAnimation() - status.addEphemeralEffect("monsterrelease") - animator.setAnimationState("releaseParticles", "on") -end - -function betabound_capturable.update(dt) - if sb_doLeveling then self.petInflictedDamage:update() end - if betabound_capturable.ownerUuid() then - if not betabound_capturable.optName() then - -- monster.setName("Pet") - end - end - - if config.getParameter("uniqueId") then - if entity.uniqueId() == nil then - world.setUniqueId(entity.id(), config.getParameter("uniqueId")) - else - assert(entity.uniqueId() == config.getParameter("uniqueId")) - end - end - - if betabound_capturable.despawnTimer then - betabound_capturable.despawnTimer = betabound_capturable.despawnTimer - dt - if betabound_capturable.despawnTimer <= 0 then - betabound_capturable.despawn() - end - else - local spawner = betabound_capturable.tetherUniqueId() or betabound_capturable.ownerUuid() - if spawner then - if not world.entityExists(world.loadUniqueEntity(spawner)) then - betabound_capturable.recall() - end - end - end - - if betabound_capturable.confirmRelocate then - if betabound_capturable.confirmRelocate:finished() then - if betabound_capturable.confirmRelocate:result() then - betabound_capturable.despawnTimer = 0.3 - else - status.removeEphemeralEffect("monsterrelocate") - status.addEphemeralEffect("monsterrelocatespawn") - end - betabound_capturable.confirmRelocate = nil - end - end -end - -function betabound_capturable.die() - monster.setDropPool(nil) - monster.setDeathParticleBurst(nil) - monster.setDeathSound(nil) - self.deathBehavior = nil - self.shouldDie = true - status.addEphemeralEffect("monsterdespawn") -end - --- Extricate this pet from its pod until the next time the pod is 'healed'. -function betabound_capturable.disassociate() - local podUuid = betabound_capturable.podUuid() - if betabound_capturable.ownerUuid() and podUuid then - betabound_capturable.messageOwner("pets.disassociatePet", podUuid, entity.uniqueId()) - betabound_capturable.disassociated = true - end -end - --- Associate another monster with this monster's pod. -function betabound_capturable.associate(pet) - assert(betabound_capturable.ownerUuid()) - local podUuid = config.getParameter("podUuid") - betabound_capturable.messageOwner("pets.associatePet", podUuid, pet) -end - -function betabound_capturable.tetherUniqueId() return config.getParameter("tetherUniqueId") end -function betabound_capturable.ownerUuid() return config.getParameter("ownerUuid") end -function betabound_capturable.podUuid() if betabound_capturable.disassociated then return nil end return config.getParameter("podUuid") end -function betabound_capturable.messageOwner(message, ...) world.sendEntityMessage(betabound_capturable.tetherUniqueId() or betabound_capturable.ownerUuid(), message, ...) end - -function betabound_capturable.captureStatus() - local currentStatus = getCurrentStatus() - -- Compute some artificial stats for displaying in the inventory, next to the - -- pet slot: - local stats = currentStatus.stats ---sb.logInfo("\n\n%s",stats) - stats.defense = stats.protection - stats.attack = 0 - local touchDamageConfig = config.getParameter("touchDamage") - if touchDamageConfig then - stats.attack = touchDamageConfig.damage - stats.attack = stats.attack * (config.getParameter("touchDamageMultiplier") or 1) - stats.attack = stats.attack * root.evalFunction("monsterLevelPowerMultiplier", monster.level()) - stats.attack = stats.attack * stats.powerMultiplier - end - - return currentStatus -end - -function betabound_capturable.recall() - animator.burstParticleEmitter("captureParticles") - status.addEphemeralEffect("monstercapture") - --betabound_capturable.despawnTimer = 0.5 - betabound_capturable.die() -end - -function betabound_capturable.despawn() - monster.setDropPool(nil) - monster.setDeathParticleBurst(nil) - - local projectileTarget = betabound_capturable.tetherUniqueId() or betabound_capturable.ownerUuid() - if projectileTarget then - projectileTarget = world.loadUniqueEntity(projectileTarget) - if not projectileTarget or not world.entityExists(projectileTarget) then - projectileTarget = nil - end - end - if projectileTarget then - local projectiles = 5 - for i = 1, projectiles do - local angle = math.pi * 2 / projectiles * i - local direction = { math.sin(angle), math.cos(angle) } - world.spawnProjectile("monstercaptureenergy", entity.position(), entity.id(), direction, false, { - target = projectileTarget - }) - end - end - - betabound_capturable.justCaptured = true -end - -function betabound_capturable.attemptCapture(podOwner) - -- Try to capture the monster. If successful, the monster is killed and the - -- pet configuration is returned. - if betabound_capturable.capturable() then - local petInfo = betabound_capturable.generatePet() - - recordEvent(podOwner, "captureMonster", entityEventFields(entity.id()), worldEventFields(), {monsterLevel = monster.level()}) - - betabound_capturable.recall() - return petInfo - end - return nil -end - -function betabound_capturable.wasRelocated() - return config.getParameter("wasRelocated", false) -end - -function betabound_capturable.attemptRelocate(sourceEntity) - if config.getParameter("relocatable", false) and not betabound_capturable.confirmRelocate then - --The point that the monster will scale toward - local scaleOffsetPart = config.getParameter("scaleOffsetPart", "body") - local attachPoint = vec2.div(animator.partPoint(scaleOffsetPart, "offset") or {0, 0}, 2) -- divide by two because partPoint adds offset to offset - local petInfo = { - monsterType = monster.type(), - collisionPoly = mcontroller.collisionPoly(), - parameters = monster.uniqueParameters(), - attachPoint = attachPoint - } - for k,v in pairs(config.getParameter("relocateParameters", {})) do - petInfo.parameters[k] = v - end - petInfo.parameters.relocateStorage = storage - petInfo.parameters.seed = monster.seed() - - status.addEphemeralEffect("monsterrelocate") - betabound_capturable.confirmRelocate = world.sendEntityMessage(sourceEntity, "confirmRelocate", entity.id(), petInfo) - return true - end -end - -function betabound_capturable.capturable(capturer) ---sb.logInfo("[BETABOUND] If you're reading this, please let us know!") --watch it activate with vanilla pods... - if betabound_capturable.ownerUuid() or storage.respawner then return false end - if betabound_capturable.wasRelocated() then return true end - local isCapturable = config.getParameter("capturable") - if not isCapturable then return false end - - local captureHealthFraction = config.getParameter("captureHealthFraction", 0.5) - local healthFraction = status.resource("health") / status.resourceMax("health") - if healthFraction > captureHealthFraction then return root.assetJson("/betabound.config:healthyCapture") end - - return true -end - -function betabound_capturable.optName() - local name = world.entityName(entity.id()) - if name == "" then - return nil - end - return name -end - -function betabound_capturable.generatePet() - local parameters = monster.uniqueParameters() - parameters.aggressive = true - parameters.wasRelocated = true - - parameters.seed = monster.seed() --- parameters.level = sb_level or monster.level() --- parameters.sb_killCount = self.killCount or 0 - - local poly = mcontroller.collisionPoly() - if #poly <= 0 then poly = nil end - - local monsterType = config.getParameter("capturedMonsterType", monster.type()) - local name = config.getParameter("capturedMonsterName", betabound_capturable.optName()) - local captureCollectables = config.getParameter("captureCollectables") - local statusStats = betabound_capturable.captureStatus() - statusStats.stats.sb_killCount = (status.stat("sb_killCount") or 0) - - - return { - name = name, - description = world.entityDescription(entity.id()), - portrait = world.entityPortrait(entity.id(), "full"), - collisionPoly = poly, - wasRelocated = true, - status = statusStats, - collectables = captureCollectables, - config = { - type = monsterType, - level = monster.level() + (status.stat("sb_level") or 0), - parameters = parameters - } - } -end - -function betabound_capturable.capturable(n) -if config.getParameter("relocatable",false) or config.getParameter("capturable",false) then -return (betabound_capturable.wasRelocated() or ((status.resource("health") / status.resourceMax("health") <= n))) -end end - - -function betabound_capturable.attemptCapture(n) - if betabound_capturable.capturable(n) then - local petInfo = betabound_capturable.generatePet() - betabound_capturable.recall() - return petInfo - end - return nil -end - -function petInflictedDamageCallback(notifications) - for _,notification in ipairs(notifications) do - if notification.hitType == "Kill" then - if not world.entityExists(notification.targetEntityId) then -self.killCount = self.killCount + 1 --- monster.uniqueParameters().level = monster.level() --- monster.uniqueParameters().killCount = self.killCount -if self.killCount >= 10 then sb_levelUp() end --CHANGE TO TEN ---sb.logInfo("CAPTURE POD: "..self.killCount.."/10 KILLS.\nGleapgreas is now level "..(monster.level()+1).."!") ---status.setStatusProperty("killCount",self.killCount) ---status.setResource("sb_killCount",self.killCount) ---sb.logInfo(sb.print(objectType)) - if entityType == "object" then ---sb.logInfo("object died") - elseif entityType == "npc" or entityType == "monster" or entityType == "player" then ---sb.logInfo("player, monster, or npc died") - end - end - end -end end - -function sb_getLevel() ---sb.logWarn("\n\nSBGETLEVEL CALLED!!!!\n\n") -return sb_level or 1 -end - -function sb_levelUp() ---sb.logInfo("\n\nLEVELUP CALLED\n\n") -local ran = math.random(1,#sb_statBonuses[1]) -sb_statBonuses[1][math.random(1,ran)] = sb_statBonuses[2][math.random(1,ran)] - local parameters = monster.uniqueParameters() - if status.isResource("health") then status.setResourcePercentage("health",1) end --sb.logInfo("FULLHEAL") - status.addEphemeralEffect("sb_levelup") --- parameters.level = monster.level() --- sb_level = parameters.level - self.killCount = 0 - parameters.steant = "AK" ---[[ -parameters.status.stats.attack = stats.status.stats.attack + sb_statBonuses[1][1] -parameters.status.stats.powerMultiplier = stats.status.stats.powerMultiplier + sb_statBonuses[1][2] -parameters.status.stats.defense = stats.status.stats.defense + sb_statBonuses[1][3] -parameters.status.stats.protection = stats.status.stats.protection + sb_statBonuses[1][4] -parameters.status.stats.fireResistance = stats.status.stats.fireResistance + sb_statBonuses[1][5] -parameters.status.stats.iceResistance = stats.status.stats.iceResistance + sb_statBonuses[1][6] -parameters.status.stats.electricResistance = stats.status.stats.electricResistance + sb_statBonuses[1][7] -parameters.status.stats.poisonResistance = stats.status.stats.poisonResistance + sb_statBonuses[1][8] -parameters.status.stats.physicalResistance = stats.status.stats.physicalResistance + sb_statBonuses[1][9] -]]-- - --[[ local poly = mcontroller.collisionPoly() - if #poly <= 0 then poly = nil end - - local monsterType = config.getParameter("capturedMonsterType", monster.type()) - local name = config.getParameter("capturedMonsterName", betabound_capturable.optName()) - local captureCollectables = config.getParameter("captureCollectables") - - return { - name = name, - description = world.entityDescription(entity.id()), - portrait = world.entityPortrait(entity.id(), "full"), - collisionPoly = poly, - status = betabound_capturable.captureStatus(), - collectables = captureCollectables, - config = { - type = monsterType, - parameters = parameters - } - }]]-- -end \ No newline at end of file diff --git a/scripts/companions/sb_crittercapturable.lua b/scripts/companions/sb_crittercapturable.lua deleted file mode 100644 index 6a71ccc2..00000000 --- a/scripts/companions/sb_crittercapturable.lua +++ /dev/null @@ -1,347 +0,0 @@ ---I'm not happy about having to replace this file either. -require "/scripts/companions/util.lua" -require "/scripts/achievements.lua" ---require "/scripts/companions/capturable.lua" - --- Functions for entities that can be captured with a capturepod -betabound_capturable = {} ---betabound_capturable.init() -local ini = init or function () end ---function betabound_capturable.init() -function init() -ini() -sb_statBonuses = {{0,0,0,0,0,0,0,0},{0.3,0.1,0.3,0.3,0.1,0.1,0.1,0.1}} -if betabound_capturable.wasRelocated() then monster.setDisplayNametag(true) end -self.killCount = monster.uniqueParameters().sb_killCount or 0 --config.getParameter("sb_killCount",0) -sb_doLeveling = monster.uniqueParameters().sb_betabound or false -self.petInflictedDamage = damageListener("inflictedDamage", petInflictedDamageCallback) - message.setHandler("betabound_pet.attemptCritterCapture", function (_, _, ...) - return betabound_capturable.attemptCapture(...) - end) - message.setHandler("betabound_pet.attemptCritterCapture", function (_, _, ...) - return betabound_capturable.attemptCapture(...) - end) - message.setHandler("betabound_pet.attemptRelocate", function (_, _, ...) - return betabound_capturable.attemptRelocate(...) - end) - message.setHandler("betabound_pet.returnToPod", function(_, _, ...) - local status = betabound_capturable.captureStatus() - betabound_capturable.recall() - return status - end) - message.setHandler("betabound_pet.status", function(_, _, persistentEffects, damageTeam) - if persistentEffects then - status.setPersistentEffects("owner", persistentEffects) - end - if damageTeam then - monster.setDamageTeam(damageTeam) - end - return { status = betabound_capturable.captureStatus() } - end) - - local initialStatus = config.getParameter("initialStatus") - if initialStatus then - setCurrentStatus(initialStatus, "owner") - end - - if betabound_capturable.podUuid() then - betabound_capturable.startReleaseAnimation() - end - - if betabound_capturable.wasRelocated() and not storage.spawned then - status.addEphemeralEffect("monsterrelocatespawn") - storage = config.getParameter("relocateStorage", {}) - storage.spawned = true - end -end - -function betabound_capturable.startReleaseAnimation() - status.addEphemeralEffect("monsterrelease") - animator.setAnimationState("releaseParticles", "on") -end - -function betabound_capturable.update(dt) -if sb_doLeveling then self.petInflictedDamage:update() end - if betabound_capturable.ownerUuid() then - if not betabound_capturable.optName() then - monster.setName("Pet") - end - monster.setDisplayNametag(true) - end - - if config.getParameter("uniqueId") then - if entity.uniqueId() == nil then - world.setUniqueId(entity.id(), config.getParameter("uniqueId")) - else - assert(entity.uniqueId() == config.getParameter("uniqueId")) - end - end - - if betabound_capturable.despawnTimer then - betabound_capturable.despawnTimer = betabound_capturable.despawnTimer - dt - if betabound_capturable.despawnTimer <= 0 then - betabound_capturable.despawn() - end - else - local spawner = betabound_capturable.tetherUniqueId() or betabound_capturable.ownerUuid() - if spawner then - if not world.entityExists(world.loadUniqueEntity(spawner)) then - betabound_capturable.recall() - end - end - end - - if betabound_capturable.confirmRelocate then - if betabound_capturable.confirmRelocate:finished() then - if betabound_capturable.confirmRelocate:result() then - betabound_capturable.despawnTimer = 0.3 - else - status.removeEphemeralEffect("monsterrelocate") - status.addEphemeralEffect("monsterrelocatespawn") - end - betabound_capturable.confirmRelocate = nil - end - end -end - -function betabound_capturable.die() - - monster.setDropPool(nil) - monster.setDeathParticleBurst(nil) - monster.setDeathSound(nil) - self.deathBehavior = nil - self.shouldDie = true - status.addEphemeralEffect("monsterdespawn") -end - --- Extricate this pet from its pod until the next time the pod is 'healed'. -function betabound_capturable.disassociate() - local podUuid = betabound_capturable.podUuid() - if betabound_capturable.ownerUuid() and podUuid then - betabound_capturable.messageOwner("pets.disassociatePet", podUuid, entity.uniqueId()) - betabound_capturable.disassociated = true - end -end - --- Associate another monster with this monster's pod. -function betabound_capturable.associate(pet) - assert(betabound_capturable.ownerUuid()) - local podUuid = config.getParameter("podUuid") - betabound_capturable.messageOwner("pets.associatePet", podUuid, pet) -end - -function betabound_capturable.tetherUniqueId() - return config.getParameter("tetherUniqueId") -end - -function betabound_capturable.ownerUuid() - return config.getParameter("ownerUuid") -end - -function betabound_capturable.podUuid() - if betabound_capturable.disassociated then - return nil - end - return config.getParameter("podUuid") -end - -function betabound_capturable.messageOwner(message, ...) - world.sendEntityMessage(betabound_capturable.tetherUniqueId() or betabound_capturable.ownerUuid(), message, ...) -end - -function betabound_capturable.captureStatus() - local currentStatus = getCurrentStatus() - -- Compute some artificial stats for displaying in the inventory, next to the - -- pet slot: - local stats = currentStatus.stats - stats.defense = stats.protection - stats.attack = 0 - local touchDamageConfig = config.getParameter("touchDamage") - if touchDamageConfig then - stats.attack = touchDamageConfig.damage - stats.attack = stats.attack * (config.getParameter("touchDamageMultiplier") or 1) - stats.attack = stats.attack * root.evalFunction("monsterLevelPowerMultiplier", monster.level()) - stats.attack = stats.attack * stats.powerMultiplier - end - - return currentStatus -end - -function betabound_capturable.recall() - animator.burstParticleEmitter("captureParticles") - status.addEphemeralEffect("monstercapture") - --betabound_capturable.despawnTimer = 0.5 - betabound_capturable.die() -end - -function betabound_capturable.despawn() - monster.setDropPool(nil) - monster.setDeathParticleBurst(nil) - - local projectileTarget = betabound_capturable.tetherUniqueId() or betabound_capturable.ownerUuid() - if projectileTarget then - projectileTarget = world.loadUniqueEntity(projectileTarget) - if not projectileTarget or not world.entityExists(projectileTarget) then - projectileTarget = nil - end - end - if projectileTarget then - local projectiles = 5 - for i = 1, projectiles do - local angle = math.pi * 2 / projectiles * i - local direction = { math.sin(angle), math.cos(angle) } - world.spawnProjectile("monstercaptureenergy", entity.position(), entity.id(), direction, false, { - target = projectileTarget - }) - end - end - - betabound_capturable.justCaptured = true -end - -function betabound_capturable.attemptCapture(podOwner) - -- Try to capture the monster. If successful, the monster is killed and the - -- pet configuration is returned. - if betabound_capturable.capturable() then - local petInfo = betabound_capturable.generatePet() - - recordEvent(podOwner, "captureMonster", entityEventFields(entity.id()), worldEventFields(), { - monsterLevel = monster.level() - }) - - betabound_capturable.recall() - return petInfo - end - return nil -end - -function betabound_capturable.wasRelocated() - return config.getParameter("wasRelocated", false) -end - -function betabound_capturable.attemptRelocate(sourceEntity) - if config.getParameter("relocatable", false) and not betabound_capturable.confirmRelocate then - --The point that the monster will scale toward - local scaleOffsetPart = config.getParameter("scaleOffsetPart", "body") - local attachPoint = vec2.div(animator.partPoint(scaleOffsetPart, "offset") or {0, 0}, 2) -- divide by two because partPoint adds offset to offset - local petInfo = { - monsterType = monster.type(), - collisionPoly = mcontroller.collisionPoly(), - parameters = monster.uniqueParameters(), - attachPoint = attachPoint - } - for k,v in pairs(config.getParameter("relocateParameters", {})) do - petInfo.parameters[k] = v - end - petInfo.parameters.relocateStorage = storage - petInfo.parameters.seed = monster.seed() - - status.addEphemeralEffect("monsterrelocate") - betabound_capturable.confirmRelocate = world.sendEntityMessage(sourceEntity, "confirmRelocate", entity.id(), petInfo) - return true - end -end - -function betabound_capturable.capturable(capturer) ---sb.logInfo("YOLO") - if betabound_capturable.ownerUuid() or storage.respawner then - return false - end - - if betabound_capturable.wasRelocated() then return true end - - local isCapturable = config.getParameter("capturable") - if not isCapturable then - return false - end - - local captureHealthFraction = config.getParameter("captureHealthFraction", 0.5) - local healthFraction = status.resource("health") / status.resourceMax("health") - if healthFraction > captureHealthFraction then - return root.assetJson("/betabound.config:healthyCapture") - end - - return true -end - -function betabound_capturable.optName() - local name = world.entityName(entity.id()) - if name == "" then - return nil - end - return name -end - -function betabound_capturable.generatePet() - local parameters = monster.uniqueParameters() - parameters.aggressive = true - - parameters.seed = monster.seed() - parameters.level = sb_level or monster.level() - parameters.sb_killCount = self.killCount or 0 - - local poly = mcontroller.collisionPoly() - if #poly <= 0 then poly = nil end - - local monsterType = config.getParameter("capturedMonsterType", monster.type()) - local name = config.getParameter("capturedMonsterName", betabound_capturable.optName()) - local captureCollectables = config.getParameter("captureCollectables") - - - - return { - name = name, - description = world.entityDescription(entity.id()), - portrait = world.entityPortrait(entity.id(), "full"), - collisionPoly = poly, - status = betabound_capturable.captureStatus(), - collectables = captureCollectables, - config = { - type = monsterType, - parameters = parameters - } - } -end - -function betabound_capturable.capturable(n) -return config.getParameter("relocatable",true) -end - - -function betabound_capturable.attemptCapture(n) - if betabound_capturable.capturable(n) then - local petInfo = betabound_capturable.generatePet() - betabound_capturable.recall() - return petInfo - end - return nil -end - -function petInflictedDamageCallback(notifications) - for _,notification in ipairs(notifications) do - if notification.hitType == "Kill" then - if world.entityExists(notification.targetEntityId) then -self.killCount = self.killCount + 1 - monster.uniqueParameters().level = monster.level() - monster.uniqueParameters().killCount = self.killCount -if self.killCount >= 10 then sb_levelUp() end --CHANGE TO TEN ---sb.logInfo("CAPTURE POD: "..self.killCount.."/10 KILLS.\nGleapppTestUBRggRenamePls is now level "..(monster.level()+1).."!") ---status.setStatusProperty("killCount",self.killCount) ---status.setResource("sb_killCount",self.killCount) -sb.print(objectType) - if entityType == "object" then ---sb.logInfo("object died") - elseif entityType == "npc" or entityType == "monster" or entityType == "player" then ---sb.logInfo("player, monster, or npc died") - end - end - end -end end - -function sb_getLevel() -return sb_level or 1 -end - -function sb_levelUp() - -end \ No newline at end of file diff --git a/scripts/player/sb_blueprints.lua b/scripts/player/sb_blueprints.lua index 4e94f02b..87999cc8 100644 --- a/scripts/player/sb_blueprints.lua +++ b/scripts/player/sb_blueprints.lua @@ -22,26 +22,26 @@ function update(dt) local s = swapSlotItem; swapSlotItem = nil s.name = "sb_blueprint" s.parameters = { - sb_recipe = recipe.config.recipe, - price = (recipe.config.price or root.assetJson("/items/defaultParameters.config:defaultPrice")) * root.assetJson("/items/defaultParameters.config:blueprintPriceFactor") or 0.5, - shortdescription = recipe.config.shortdescription or "Blueprint", - description = recipe.config.description or "Used for crafting.", - rarity = recipe.config.rarity or "uncommon", - inventoryIcon = jarray() + sb_recipe = recipe.config.recipe, + price = (recipe.config.price or root.assetJson("/items/defaultParameters.config:defaultPrice")) * root.assetJson("/items/defaultParameters.config:blueprintPriceFactor") or 0.5, + shortdescription = recipe.config.shortdescription or "Blueprint", + description = recipe.config.description or "Used for crafting.", + rarity = recipe.config.rarity or "uncommon", + inventoryIcon = jarray() } if type(recipe.config.inventoryIcon) == "table" then - for i = 1, #recipe.config.inventoryIcon do - table.insert(s.parameters.inventoryIcon, { - image = sb_assetmissing(sb_pathToImage(recipe.config.inventoryIcon[i].image, recipe.directory), - root.assetJson("/items/defaultParameters.config:missingIcon") or "/objects/generic/perfectlygenericitem/perfectlygenericitemicon.png") - }) - end + for i = 1, #recipe.config.inventoryIcon do + table.insert(s.parameters.inventoryIcon, { + image = sb_assetmissing(sb_pathToImage(recipe.config.inventoryIcon[i].image, recipe.directory), + root.assetJson("/items/defaultParameters.config:missingIcon") or "/objects/generic/perfectlygenericitem/perfectlygenericitemicon.png") + }) + end else - table.insert(s.parameters.inventoryIcon, { - image = sb_assetmissing(sb_pathToImage(recipe.config.inventoryIcon, recipe.directory), - root.assetJson("/items/defaultParameters.config:missingIcon") or "/objects/generic/perfectlygenericitem/perfectlygenericitemicon.png") - }) + table.insert(s.parameters.inventoryIcon, { + image = sb_assetmissing(sb_pathToImage(recipe.config.inventoryIcon, recipe.directory), + root.assetJson("/items/defaultParameters.config:missingIcon") or "/objects/generic/perfectlygenericitem/perfectlygenericitemicon.png") + }) end table.insert(s.parameters.inventoryIcon, {position = {5.5,-4}, image = "/items/generic/unlock/sb_blueprints.png:"..string.lower(s.parameters.rarity)}) diff --git a/scripts/sb_uimessage.lua b/scripts/sb_uimessage.lua index db97166d..9529fc85 100644 --- a/scripts/sb_uimessage.lua +++ b/scripts/sb_uimessage.lua @@ -1,3 +1,3 @@ function sb_uiMessage(n) -player.giveItem({name="sb_uimessage"..n,count=1,parameters={value=0,timeToLive=1,consumeOnPickup=true}}) + player.giveItem({name="sb_uimessage:"..n,count=1,parameters={value=0,timeToLive=1,consumeOnPickup=true}}) end \ No newline at end of file diff --git a/spawntypes/sb_uniques.spawntypes b/spawntypes/sb_uniques.spawntypes index 2ae90ad6..f69c6b72 100644 --- a/spawntypes/sb_uniques.spawntypes +++ b/spawntypes/sb_uniques.spawntypes @@ -1,24 +1,32 @@ -[ - // unique monsters - - // HECK BIOME - - { - "name" : "sb_heckblob", - - "spawnParameters" : { - "area" : "surface", - "region" : "all", - "time" : "all" +[{ + "name": "sb_heckblob", + "spawnParameters": { + "area": "surface", + "region": "all", + "time": "all" }, - - "groupSize" : [1, 3], - "spawnChance" : 0.08, - "monsterType" : [ + "groupSize": [1, 3], + "spawnChance": 0.08, + "monsterType": [ [1, "sb_heckblob"] ], - "monsterParameters" : { - "aggressive" : true + "monsterParameters": { + "aggressive": true + } + }, { + "name": "sb_bonebird", + "spawnParameters": { + "area": "air", + "region": "all", + "time": "all" + }, + "groupSize": [1, 1], + "spawnChance": 0.02, + "monsterType": [ + [1, "bonebird"] + ], + "monsterParameters": { + "aggressive": true } } -] \ No newline at end of file +] diff --git a/spawntypes/uniques.spawntypes.patch b/spawntypes/uniques.spawntypes.patch index 3b02abf5..1e6de3d6 100644 --- a/spawntypes/uniques.spawntypes.patch +++ b/spawntypes/uniques.spawntypes.patch @@ -20,5 +20,15 @@ "op": "add", "path": "/2/monsterType/-", "value": [0.99,"sb_poptop"] + }], + //Fix for ooglers not spawning in bone caves + [{ + "op": "test", + "path": "/7/spawnParameters/region", + "value": "exposed" + },{ + "op": "replace", + "path": "/7/spawnParameters/region", + "value": "all" }] ] \ No newline at end of file diff --git a/species/human.species.patch b/species/human.species.patch index dabb8f2e..0b4d801d 100644 --- a/species/human.species.patch +++ b/species/human.species.patch @@ -1,21 +1,36 @@ [ +{"op":"add","path":"/genders/0/hair/-","value":"sb_male17"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem5"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem8"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem14"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem20"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem21"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem28"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem35"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem36"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem38"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem41"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem53"}, +{"op":"add","path":"/genders/1/hair/-","value":"sb_fem54"}, + + {"op":"add","path":"/genders/0/shirt/-","value":"tshirtchest"}, {"op":"add","path":"/genders/0/shirt/-","value":"sb_shirtshort1chest"}, {"op":"add","path":"/genders/0/shirt/-","value":"sb_shirtlong1chest"}, {"op":"add","path":"/genders/0/shirt/-","value":"sb_coolchest"}, {"op":"add","path":"/genders/0/shirt/-","value":"sb_workoutchest"}, -{"op":"add","path":"/genders/0/shirt/-","value":"sb_sweatervestchest"}, +{"op":"add","path":"/genders/0/shirt/-","value":"sb_workchest"}, {"op":"add","path":"/genders/1/shirt/-","value":"tshirtchest"}, {"op":"add","path":"/genders/1/shirt/-","value":"sb_shirtshort1chest"}, {"op":"add","path":"/genders/1/shirt/-","value":"sb_shirtlong1chest"}, {"op":"add","path":"/genders/1/shirt/-","value":"sb_coolchest"}, {"op":"add","path":"/genders/1/shirt/-","value":"sb_workoutchest"}, -{"op":"add","path":"/genders/1/shirt/-","value":"sb_sweatervestchest"}, +{"op":"add","path":"/genders/1/shirt/-","value":"sb_workchest"}, -{"op":"add","path":"/genders/0/pants/-","value":"sb_sweatervestlegs"}, -{"op":"add","path":"/genders/1/pants/-","value":"sb_sweatervestlegs"}, +{"op":"add","path":"/genders/0/pants/-","value":"sb_worklegs"}, +{"op":"add","path":"/genders/1/pants/-","value":"sb_worklegs"}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_applepie"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_candy"}}, @@ -28,7 +43,6 @@ {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_burrito"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_chilistew"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_hamsandwich"}}, -{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_soup"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_icecream"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_humantier1dagger"}}, @@ -99,8 +113,8 @@ {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_coolchest"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_workoutchest"}}, -{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_sweatervestchest"}}, -{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_sweatervestlegs"}}, +{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_workchest"}}, +{"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_worklegs"}}, {"op":"add","path":"/defaultBlueprints/tier1/-","value":{"item":"sb_techstation_human"}}, diff --git a/species/sb_recipes.config b/species/sb_recipes.config index 716ea8f3..2c29a68b 100644 --- a/species/sb_recipes.config +++ b/species/sb_recipes.config @@ -1,5 +1,5 @@ { - "species" : ["avian","glitch","human","floran","apex","hylotl","novakEEid"], + "species" : ["avian","glitch","human","floran","apex","hylotl","novakid"], "unknownSpeciesRecipes" : "human", "weaponTiers" : [1, 4], "branchingWeaponTiers" : 2, diff --git a/stats/effects/electricblock/electricblock.statuseffect.patch b/stats/effects/electricblock/electricblock.statuseffect.patch deleted file mode 100644 index a296c3f8..00000000 --- a/stats/effects/electricblock/electricblock.statuseffect.patch +++ /dev/null @@ -1 +0,0 @@ -[{"op":"test","path":"/icon","value":"/interface/statuses/electricblock.png"},{"op":"replace","path":"/icon","value":"/interface/statuses/sb_electricblock2.png"}] diff --git a/stats/effects/heal/sb_gauzeheal.statuseffect b/stats/effects/heal/sb_gauzeheal.statuseffect index 6ff20279..9addd8f4 100644 --- a/stats/effects/heal/sb_gauzeheal.statuseffect +++ b/stats/effects/heal/sb_gauzeheal.statuseffect @@ -1,12 +1,12 @@ { - "name" : "sb_gauzeheal", - "effectConfig" : { - "healAmount" : 75, - "emissionRate" : 7.5 + "name": "sb_gauzeheal", + "effectConfig": { + "healAmount": 75, + "emissionRate": 7.5 }, - "defaultDuration" : 1, - "scripts" : ["heal.lua"], - "animationConfig" : "heal.animation", - "label" : "Healing", - "icon" : "/interface/statuses/heal.png" -} \ No newline at end of file + "defaultDuration": 1, + "scripts": ["heal.lua"], + "animationConfig": "heal.animation", + "label": "Healing", + "icon": "/interface/statuses/heal.png" +} diff --git a/stats/effects/maxenergyboost/sb_maxenergyboost15.statuseffect b/stats/effects/maxenergyboost/sb_maxenergyboost15.statuseffect new file mode 100644 index 00000000..226d637c --- /dev/null +++ b/stats/effects/maxenergyboost/sb_maxenergyboost15.statuseffect @@ -0,0 +1,8 @@ +{ + "name" : "sb_maxenergyboost15", + "effectConfig" : {"energyAmount":15}, + "defaultDuration" : 60, + "scripts" : ["maxenergyboost.lua"], + "label" : "Bonus Energy", + "icon" : "/interface/statuses/maxenergy.png" +} \ No newline at end of file diff --git a/stats/effects/maxenergyboost/sb_maxenergyboost20.statuseffect b/stats/effects/maxenergyboost/sb_maxenergyboost20.statuseffect new file mode 100644 index 00000000..5a981dc7 --- /dev/null +++ b/stats/effects/maxenergyboost/sb_maxenergyboost20.statuseffect @@ -0,0 +1,8 @@ +{ + "name" : "sb_maxenergyboost20", + "effectConfig" : {"energyAmount":20}, + "defaultDuration" : 60, + "scripts" : ["maxenergyboost.lua"], + "label" : "Bonus Energy", + "icon" : "/interface/statuses/maxenergy.png" +} \ No newline at end of file diff --git a/stats/effects/maxenergyboost/sb_maxenergyboost40.statuseffect b/stats/effects/maxenergyboost/sb_maxenergyboost40.statuseffect new file mode 100644 index 00000000..8b9f46b5 --- /dev/null +++ b/stats/effects/maxenergyboost/sb_maxenergyboost40.statuseffect @@ -0,0 +1,8 @@ +{ + "name" : "sb_maxenergyboost40", + "effectConfig" : {"energyAmount":40}, + "defaultDuration" : 60, + "scripts" : ["maxenergyboost.lua"], + "label" : "Bonus Energy", + "icon" : "/interface/statuses/maxenergy.png" +} \ No newline at end of file diff --git a/stats/effects/regeneration/sb_regeneration5.statuseffect b/stats/effects/regeneration/sb_regeneration5.statuseffect new file mode 100644 index 00000000..5e21332a --- /dev/null +++ b/stats/effects/regeneration/sb_regeneration5.statuseffect @@ -0,0 +1,12 @@ +{ + "name": "sb_regeneration5", + "blockingStat": "healingStatusImmunity", + "effectConfig": { + "healTime": 20 + }, + "defaultDuration": 5, + "scripts": ["regeneration.lua"], + "animationConfig": "regeneration.animation", + "label": "Regeneration", + "icon": "/interface/statuses/heal.png" +} diff --git a/stats/effects/wet/sb_wet.lua b/stats/effects/wet/sb_wet.lua new file mode 100644 index 00000000..4f8bd505 --- /dev/null +++ b/stats/effects/wet/sb_wet.lua @@ -0,0 +1,20 @@ +local ini = init or function() end +local updat = update or function() end + +function init() ini() + sb_entityId = entity.id() + effect.setParentDirectives("fade=0072ff=0.1") + effect.addStatModifierGroup({ + {stat = "jumpModifier", amount = -0.1} + }) +end + +function update(dt) updat(dt) + if math.random(25) == 1 then + world.spawnProjectile("sb_wet", mcontroller.position(), sb_entityId) + end + mcontroller.controlModifiers({ + speedModifier = 0.9, + airJumpModifier = 0.9 + }) +end \ No newline at end of file diff --git a/stats/effects/wet/sb_wet.projectile b/stats/effects/wet/sb_wet.projectile new file mode 100644 index 00000000..34c73171 --- /dev/null +++ b/stats/effects/wet/sb_wet.projectile @@ -0,0 +1,18 @@ +{ + "projectileName": "sb_wet", + "physics": "rain", + "image": "/projectiles/weather/water/water.png", + "animationCycle": 0.5, + "frameNumber": 2, + "damagePoly": [[-30, -30], [30, -30], [30, 30], [-30, 30]], + "damageKind": "hidden", + "actionOnReap": [{ + "action": "applySurfaceMod", + "previousMod": "tilleddry", + "newMod": "tilled" + } + ], + "onlyHitTerrain": true, + "hydrophobic": true, + "masterOnly": true +} diff --git a/stats/effects/wet/wet.statuseffect.patch b/stats/effects/wet/wet.statuseffect.patch new file mode 100644 index 00000000..1960f103 --- /dev/null +++ b/stats/effects/wet/wet.statuseffect.patch @@ -0,0 +1,4 @@ +[ +[{"op":"test","path":"/scripts"},{"op":"add","path":"/scripts/-","value":"sb_wet.lua"}], +[{"op":"test","path":"/defaultDuration","value":2},{"op":"replace","path":"/defaultDuration","value":8}] +] \ No newline at end of file diff --git a/stats/sb_effects/capturedmonster.lua b/stats/sb_effects/capturedmonster.lua deleted file mode 100644 index e69de29b..00000000 diff --git a/stats/sb_effects/capturedmonster.statuseffect b/stats/sb_effects/capturedmonster.statuseffect deleted file mode 100644 index 1c2ec667..00000000 --- a/stats/sb_effects/capturedmonster.statuseffect +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name" : "sb_capturedmonster", - "effectConfig" : {}, - "defaultDuration" : 20, - - "icon" : "/items/throwables/sb_filledcapturepod.png", - "label" : "This effect is used to keep track of a captured monster's kills and levels.", - "scripts" : [] -//"scripts" : ["capturedmonster.lua"] -} \ No newline at end of file diff --git a/stats/sb_effects/entity.lua b/stats/sb_effects/entity.lua deleted file mode 100644 index cfecd8dd..00000000 --- a/stats/sb_effects/entity.lua +++ /dev/null @@ -1 +0,0 @@ -function init() math.betabound_entity = _ENV.entity end \ No newline at end of file diff --git a/stats/sb_effects/entity.statuseffect b/stats/sb_effects/entity.statuseffect deleted file mode 100644 index 06177745..00000000 --- a/stats/sb_effects/entity.statuseffect +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name" : "sb_entity", - "effectConfig" : {}, - "defaultDuration" : 1, - "scripts" : ["entity.lua"] -} \ No newline at end of file diff --git a/stats/sb_effects/fooddepletionsuppressed.statuseffect b/stats/sb_effects/fooddepletionsuppressed.statuseffect index 2ef9838b..3d58f05d 100644 --- a/stats/sb_effects/fooddepletionsuppressed.statuseffect +++ b/stats/sb_effects/fooddepletionsuppressed.statuseffect @@ -1,5 +1,5 @@ { - "name" : "sb_fooddepletionsuppressed", //dontstarve removed by cinemas - "defaultDuration" : 120, - "scripts" : ["/stats/effects/dontstarve/dontstarve.lua"] -} \ No newline at end of file + "name": "sb_fooddepletionsuppressed", //dontstarve removed by cinemas + "defaultDuration": 120, + "scripts": ["/stats/effects/dontstarve/dontstarve.lua"] +} diff --git a/stats/sb_effects/frozenburning.lua b/stats/sb_effects/frozenburning.lua index 89ecbaf2..120b67a2 100644 --- a/stats/sb_effects/frozenburning.lua +++ b/stats/sb_effects/frozenburning.lua @@ -28,7 +28,7 @@ function update(dt) status.applySelfDamageRequest({ damageType = "IgnoresDef", damage = math.floor(status.resourceMax("health") * tickDamagePercentage) + 3, - damageSourceKind = "sb_frozenburning_"..(math.random(2)==1 and "fire" or "ice"), + damageSourceKind = "sb_frozenburning", sourceEntityId = id }) end diff --git a/stats/sb_effects/instant/directdamage.statuseffect b/stats/sb_effects/instant/directdamage.statuseffect index 7dbf21fd..0eb62661 100644 --- a/stats/sb_effects/instant/directdamage.statuseffect +++ b/stats/sb_effects/instant/directdamage.statuseffect @@ -1,5 +1,5 @@ { - "name" : "sb_directdamage", - "defaultDuration" : 10, - "scripts" : ["directdamage.lua"] -} \ No newline at end of file + "name": "sb_directdamage", + "defaultDuration": 10, + "scripts": ["directdamage.lua"] +} diff --git a/stats/sb_effects/instant/energy.statuseffect b/stats/sb_effects/instant/energy.statuseffect index 4a82aac7..4e09323b 100644 --- a/stats/sb_effects/instant/energy.statuseffect +++ b/stats/sb_effects/instant/energy.statuseffect @@ -1,6 +1,10 @@ { - "name" : "sb_energy", - "effectConfig" : {"text":"^shadow,green;+%s Energy","textOffset":0.3,"resource":"energy"}, - "defaultDuration" : 10, - "scripts" : ["instant.lua"] -} \ No newline at end of file + "name": "sb_energy", + "effectConfig": { + "text": "^shadow,green;+%s Energy", + "textOffset": 0.3, + "resource": "energy" + }, + "defaultDuration": 10, + "scripts": ["instant.lua"] +} diff --git a/stats/sb_effects/instant/food.statuseffect b/stats/sb_effects/instant/food.statuseffect index 9d917d7b..58da0063 100644 --- a/stats/sb_effects/instant/food.statuseffect +++ b/stats/sb_effects/instant/food.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_food", - "effectConfig" : {}, - "defaultDuration" : 10, - "scripts" : ["food.lua"] + "name": "sb_food", + "effectConfig": {}, + "defaultDuration": 10, + "scripts": ["food.lua"] } diff --git a/stats/sb_effects/instant/health.statuseffect b/stats/sb_effects/instant/health.statuseffect index 4fbf8fef..6c255bea 100644 --- a/stats/sb_effects/instant/health.statuseffect +++ b/stats/sb_effects/instant/health.statuseffect @@ -1,6 +1,9 @@ { - "name" : "sb_health", - "effectConfig" : {"text":"^shadow,#f00;+%s Health","textOffset":0.9}, - "defaultDuration" : 10, - "scripts" : ["instant.lua"] -} \ No newline at end of file + "name": "sb_health", + "effectConfig": { + "text": "^shadow,#f00;+%s Health", + "textOffset": 0.9 + }, + "defaultDuration": 10, + "scripts": ["instant.lua"] +} diff --git a/stats/sb_effects/instant/instant.lua b/stats/sb_effects/instant/instant.lua index b9a42ecd..5f01700e 100644 --- a/stats/sb_effects/instant/instant.lua +++ b/stats/sb_effects/instant/instant.lua @@ -1,12 +1,26 @@ function init() - local a,b = math.floor(effect.duration()),mcontroller.position() - status.modifyResource(config.getParameter("resource","health"),a) - world.spawnProjectile("invisibleprojectile", - {b[1]-3,b[2]+config.getParameter("textOffset")}, - entity.id(),{0,0},false, - {damageType="nodamage",timeToLive=0,piercing=true,speed=0,power=0,actionOnReap={ - {action="particle",specification={type="text",text=string.format(config.getParameter("text"),a),fullbright=true,size=0.5,layer="front",timeToLive=0.75,destructionAction="shrink",destructionTime=0.3}}}}) - effect.expire() - update=updat updat=nil + local a, b = math.floor(effect.duration()), mcontroller.position() + status.modifyResource(config.getParameter("resource", "health"), a) + world.spawnProjectile("invisibleprojectile", + {b[1]-3, b[2] + config.getParameter("textOffset")}, entity.id(), {0, 0}, false, + {damageType="nodamage",timeToLive=0,piercing=true,speed=0,power=0, + actionOnReap = {{ + action = "particle", + specification = { + type = "text", + text = string.format(config.getParameter("text"), a), + fullbright = true, + size = 0.5, + layer = "front", + timeToLive = 0.75, + destructionAction = "shrink", + destructionTime = 0.3 + } + } + } + } + ) + effect.expire() + update=updat; updat=nil end function updat() effect.expire() end \ No newline at end of file diff --git a/stats/sb_effects/instant/restoration.statuseffect b/stats/sb_effects/instant/restoration.statuseffect index 0fe7ed0e..d0143061 100644 --- a/stats/sb_effects/instant/restoration.statuseffect +++ b/stats/sb_effects/instant/restoration.statuseffect @@ -1,8 +1,8 @@ { - "name" : "sb_restoration", - "effectConfig" : { - "effects" : ["sb_health","sb_energy"] + "name": "sb_restoration", + "effectConfig": { + "effects": ["sb_health", "sb_energy"] }, - "defaultDuration" : 10, - "scripts" : ["/stats/sb_effects/effects.lua"] -} \ No newline at end of file + "defaultDuration": 10, + "scripts": ["/stats/sb_effects/effects.lua"] +} diff --git a/stats/sb_effects/ladder.statuseffect b/stats/sb_effects/ladder.statuseffect index c3a24007..a415e482 100644 --- a/stats/sb_effects/ladder.statuseffect +++ b/stats/sb_effects/ladder.statuseffect @@ -1,7 +1,7 @@ { - "name" : "sb_ladder", - "defaultDuration" : 0.3, - "scripts" : ["ladder.lua"], - "label" : "Safe Fall", - "icon" : "/interface/statuses/nofalldamage.png" -} \ No newline at end of file + "name": "sb_ladder", + "defaultDuration": 0.3, + "scripts": ["ladder.lua"], + "label": "Safe Fall", + "icon": "/interface/statuses/nofalldamage.png" +} diff --git a/stats/sb_effects/levelup.animation b/stats/sb_effects/levelup.animation deleted file mode 100644 index dc895975..00000000 --- a/stats/sb_effects/levelup.animation +++ /dev/null @@ -1,10 +0,0 @@ -{ - "sounds" : {"beep" : ["/sfx/statuseffects/powerup.ogg"]}, - "particleEmitters" : { - "message" : { - "active" : true, - "emissionRate" : 0, - "particles" : [{"particle" : "sb_monsterlevelup"}] - } - } -} \ No newline at end of file diff --git a/stats/sb_effects/levelup.statuseffect b/stats/sb_effects/levelup.statuseffect deleted file mode 100644 index 93d3208b..00000000 --- a/stats/sb_effects/levelup.statuseffect +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name" : "sb_levelup", - "effectConfig" : {}, - "defaultDuration" : 0.5, - "animationConfig" : "levelup.animation", - "icon" : "/items/throwables/sb_filledcapturepod.png", - "label" : "This effect is used to level up captured monsters.", - "scripts" : [] -} diff --git a/stats/sb_effects/movement/jellied.statuseffect b/stats/sb_effects/movement/jellyslow.statuseffect similarity index 100% rename from stats/sb_effects/movement/jellied.statuseffect rename to stats/sb_effects/movement/jellyslow.statuseffect diff --git a/stats/sb_effects/outpost.lua b/stats/sb_effects/outpost.lua index 91ce0da9..46f8e0fc 100644 --- a/stats/sb_effects/outpost.lua +++ b/stats/sb_effects/outpost.lua @@ -1,57 +1,21 @@ require("/scripts/sb_assetmissing.lua") function month(n) local a=(os.time()-os.time{year=2000,month=1,day=1})/31557600 return n==math.ceil((a-math.floor(a))*12) end function init() - local spawnNpc = world.spawnNpc if entity.entityType() ~= "player" and status.statusProperty("sb_outpostnpcspawner") ~= true then - positions = { - {412,614}, --excon - {360,611}, --refugee - {374,627}, --scientist - {508,611}, --mechanic - {508,611}, --promoter - {416,611}, --warrior - {404,611}, --hater (was 508,610) - {412,614}, --mercenary (seed was 14) - {377,614}, --forge - {286,611}, --santa - {356,641}, --garbage - {200,616} --kennel - } + positions = config.getParameter("positions") + positions = sb_itemExists("anom_outpostelliotassistant") and positions["anom"] or positions["default"] - if sb_itemExists("anom_outpostelliotassistant") then - positions = { - {412,614}, --excon - {360,611}, --refugee - {374,627}, --scientist - {508,610}, --mechanic - {508,610}, --promoter - {416,611}, --warrior - {710,611}, --hater - {412,614}, --mercenary (seed was 14) - {377,614}, --forge - {286,611}, --santa - {444,580}, --garbage - {0,0} --kennel - } + local npcs = config.getParameter("npcs") + for i = 1, #npcs do + local npc = npcs[i] + world.spawnNpc(positions[i], npc[1], npc[2], 1, npc[3]) end - ---could loop spawning of npcs or move to config file - spawnNpc(positions[1],"human","outposthumanexcon",1,46) - spawnNpc(positions[2],"avian","outpostavianrefugee",1,25) - spawnNpc(positions[4],"apex","outpostapexscientist",1,7) - spawnNpc(positions[5],"glitch","outpostglitchmechanic",1,28) - spawnNpc(positions[5],"penguin","outpostpenguinpromoter",1,28) - spawnNpc(positions[6],"hylotl","outposthylotlwarrior",1,9) - spawnNpc(positions[7],"hylotl","sb_outposthylotlfloranhater",1,28) --was 508,610 - spawnNpc(positions[8],"glitch","outpostglitchmercenary",1,41) --was 14 - spawnNpc(entity.position(),"floran","sb_outpostfloranscholar",1,57) - - if month(2) then world.spawnItem("heartforge-recipe",positions[9]) elseif month(12) then world.spawnNpc(positions[10],"human","santa",100) end - if world.objectAt(positions[11]) then - if world.containerAddItems(world.objectAt(positions[11]),"comedyscript") == {} then - world.spawnItem("comedyscript",positions[9]) + if month(2) then world.spawnItem("heartforge-recipe",positions[10]) elseif month(12) then world.spawnNpc(positions[11],"human","santa",100) end + if world.objectAt(positions[12]) then + if world.containerAddItems(world.objectAt(positions[12]),"comedyscript") == {} then + world.spawnItem("comedyscript",positions[10]) end end @@ -60,5 +24,5 @@ end function update() if not world.universeFlagSet("sb_hylotlwarriorE2") then script.setUpdateDelta(0) return end - if positions then if world.spawnVehicle("sb_kennel",positions[12]) then script.setUpdateDelta(0) return end end + if positions then if world.spawnVehicle("sb_kennel",positions[13]) then script.setUpdateDelta(0) return end end end \ No newline at end of file diff --git a/stats/sb_effects/outpost.statuseffect b/stats/sb_effects/outpost.statuseffect index a60d50c1..c543f733 100644 --- a/stats/sb_effects/outpost.statuseffect +++ b/stats/sb_effects/outpost.statuseffect @@ -1,8 +1,51 @@ { - "name" : "sb_outpostnpcspawner", - "effectConfig" : {}, - "defaultDuration" : 1, - "icon" : "/interface/bookmarks/icons/outpost.png", - "label" : "This effect is used to populate the Outpost with some NPC's and quest items.", - "scripts" : ["outpost.lua"] -} \ No newline at end of file + "name": "sb_outpostnpcspawner", + //Other mods can just patch the default positions + "effectConfig": { + "npcs": [ + ["human", "outposthumanexcon", 46], + ["avian", "outpostavianrefugee", 25], + ["apex", "outpostapexscientist", 7], + ["glitch", "outpostglitchmechanic", 28], + ["penguin", "outpostpenguinpromoter", 28], + ["hylotl", "outposthylotlwarrior", 9], + ["hylotl", "sb_outposthylotlfloranhater", 28], + ["glitch", "outpostglitchmercenary", 41], //was 14 + ["floran", "sb_outpostfloranscholar", 57] + ], + "positions": { + "default": [ + [412, 614], //excon + [360, 611], //refugee + [374, 627], //scientist + [508, 611], //mechanic + [508, 611], //promoter + [416, 611], //warrior + [404, 611], //hater (was 508,610) + [412, 614], //mercenary (seed was 14) + [328, 611], //scholar + [377, 614], //forge + backup comedy script location + [286, 611], //santa + [356, 641], //garbage + [200, 616]//kennel + ], + "anom": [ + [412, 612], //excon + [360, 611], //refugee + [374, 627], //scientist + [508, 610], //mechanic + [508, 610], //promoter + [416, 611], //warrior + [710, 611], //hater + [412, 614], //mercenary + [412, 614], //scholar + [377, 614], //forge + [0, 0], //santa + [444, 580], //garbage + [0, 0]//kennel + ] + } + }, + "defaultDuration": 1, + "scripts": ["outpost.lua"] +} diff --git a/stats/sb_player_primary.lua b/stats/sb_player_primary.lua index bb579a59..b9915c6c 100644 --- a/stats/sb_player_primary.lua +++ b/stats/sb_player_primary.lua @@ -11,7 +11,7 @@ function init() ini() player = math.betabound_player sb_shieldAlpha = {0,0,0} sb_lastHunger = math.floor(status.resourcePercentage("food")*100) - sb_lastHungerMessage = "-d100" + sb_lastHungerMessage = "d100" sb_hungerBenchmarks = {2,5,10,15,25,50,75,100} sb_hungerPopups = root.assetJson("/betabound.config:hungerPopups") end @@ -34,7 +34,7 @@ function update(dt) updat(dt) if hunger ~= sb_lastHunger then for i = 1, #sb_hungerBenchmarks-1 do if hunger > sb_hungerBenchmarks[i] and hunger < sb_hungerBenchmarks[i+1] then - local id = "-"..(hunger > sb_lastHunger and "u" or "d")..sb_hungerBenchmarks[i+1] + local id = (hunger > sb_lastHunger and "u" or "d")..sb_hungerBenchmarks[i+1] if sb_lastHungerMessage ~= id then if player then sb_uiMessage(id) end sb_lastHungerMessage = id diff --git a/tech/dash/sb_sprint.lua b/tech/dash/sb_sprint.lua new file mode 100644 index 00000000..76a3782b --- /dev/null +++ b/tech/dash/sb_sprint.lua @@ -0,0 +1,10 @@ +local ini = init or function() end + +function init() + status.sb_setPersistentEffects = status.setPersistentEffects + status.setPersistentEffects = function(effectCategory, effects) + if effectCategory == "movementAbility" then return end + return status.sb_setPersistentEffects(effectCategory, effects) + end + ini() +end \ No newline at end of file diff --git a/tech/dash/sprint.tech.patch b/tech/dash/sprint.tech.patch new file mode 100644 index 00000000..d910a173 --- /dev/null +++ b/tech/dash/sprint.tech.patch @@ -0,0 +1,5 @@ +[ +[{"op":"test","path":"/description","value":"Replaces the dash with a sprint which costs energy!"},{"op":"replace","path":"/description","value":"A sustained sprint which costs energy! ^green;[A]^reset;/^green;[D]^reset;"}], +[{"op":"replace","path":"/stopAfterDash","value":false}], +[{"op":"add","path":"/scripts/-","value":"sb_sprint.lua"}] +] \ No newline at end of file diff --git a/tech/starbound/air.png b/tech/starbound/air.png index 12e9e550..b1e81680 100644 Binary files a/tech/starbound/air.png and b/tech/starbound/air.png differ diff --git a/tech/starbound/automobile/car/foreground.png b/tech/starbound/automobile/car/foreground.png index 5b576415..77e64f8e 100644 Binary files a/tech/starbound/automobile/car/foreground.png and b/tech/starbound/automobile/car/foreground.png differ diff --git a/tech/starbound/automobile/jeep/background.png b/tech/starbound/automobile/jeep/background.png index 99081632..86ab6f39 100644 Binary files a/tech/starbound/automobile/jeep/background.png and b/tech/starbound/automobile/jeep/background.png differ diff --git a/tech/starbound/automobile/jeep/foreground.png b/tech/starbound/automobile/jeep/foreground.png index bedf6c1b..20465423 100644 Binary files a/tech/starbound/automobile/jeep/foreground.png and b/tech/starbound/automobile/jeep/foreground.png differ diff --git a/tech/starbound/automobile/jeep/humanjeep.tech b/tech/starbound/automobile/jeep/humanjeep.tech index f0187e7e..f98f67e2 100644 --- a/tech/starbound/automobile/jeep/humanjeep.tech +++ b/tech/starbound/automobile/jeep/humanjeep.tech @@ -1,48 +1,48 @@ { - "name" : "sb_humanjeep", - "type" : "head", - "scripts" : ["/tech/starbound/vehicle.lua"], - "animator" : "humanjeep.animation", - "rarity" : "legendary", - "icon" : "/tech/starbound/humanjeep.png", - "description" : "^#0F0;[F]^reset; Traverses rough terrain quicker. It can also jump!", - "shortDescription" : "Jeep", + "name": "sb_humanjeep", + "type": "head", + "scripts": ["/tech/starbound/vehicle.lua"], + "animator": "humanjeep.animation", + "rarity": "legendary", + "icon": "/tech/starbound/humanjeep.png", + "description": "^#0F0;[F]^reset; Traverses rough terrain quicker. It can also jump!", + "shortDescription": "Jeep", - "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]], - "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]], + "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 } }, - "energyCostPerSecond" : 0.5, - "warpDirectives" : "?fade=CCF=0.25", - "mechTransformPositionChange" : [0, 0.5], -//"parentOffset" : [-1, 0.7], - "mechAction" : "honk", - "mechCollisionTest" : [-3.5, -2.5, 3.5, 3], - "mechAimLimit" : 40, - "mechFireCycle" : 1, - "mechProjectile" : "carhorn", - "mechProjectileConfig" : { - "power" : 0 + "energyCostPerSecond": 0.5, + "warpDirectives": "?fade=CCF=0.25", + "mechTransformPositionChange": [0, 0.5], + //"parentOffset" : [-1, 0.7], + "mechAction": "honk", + "mechCollisionTest": [-3.5, -2.5, 3.5, 3], + "mechAimLimit": 40, + "mechFireCycle": 1, + "mechProjectile": "carhorn", + "mechProjectileConfig": { + "power": 0 } -} \ No newline at end of file +} diff --git a/tech/starbound/automobile/jeep/warp.png b/tech/starbound/automobile/jeep/warp.png index 12ba7b38..15f7228a 100644 Binary files a/tech/starbound/automobile/jeep/warp.png and b/tech/starbound/automobile/jeep/warp.png differ diff --git a/tech/starbound/banana.png b/tech/starbound/banana.png index 59fb16ff..00d4f63a 100644 Binary files a/tech/starbound/banana.png and b/tech/starbound/banana.png differ diff --git a/tech/starbound/banana2.png b/tech/starbound/banana2.png deleted file mode 100644 index c8e7e19d..00000000 Binary files a/tech/starbound/banana2.png and /dev/null differ diff --git a/tech/starbound/banana3.png b/tech/starbound/banana3.png index 7d393901..d3d1d2a1 100644 Binary files a/tech/starbound/banana3.png and b/tech/starbound/banana3.png differ diff --git a/tech/starbound/bio/enhancedhealing.statuseffect b/tech/starbound/bio/enhancedhealing.statuseffect index 9f37f178..cb99fa5c 100644 --- a/tech/starbound/bio/enhancedhealing.statuseffect +++ b/tech/starbound/bio/enhancedhealing.statuseffect @@ -1,8 +1,10 @@ { - "name" : "sb_enhancedhealingtech", - "defaultDuration" : 5, - "effectConfig" : {"tech":"sb_enhancedhealing"}, - "scripts" : ["enhancedhealing.lua"], - "label" : "Enhanced Healing", - "icon" : "/tech/starbound/enhancedhealing.png" -} \ No newline at end of file + "name": "sb_enhancedhealingtech", + "defaultDuration": 5, + "effectConfig": { + "tech": "sb_enhancedhealing" + }, + "scripts": ["enhancedhealing.lua"], + "label": "Enhanced Healing", + "icon": "/tech/starbound/enhancedhealing.png" +} diff --git a/tech/starbound/bio/forcefield.statuseffect b/tech/starbound/bio/forcefield.statuseffect index 0b7248cc..f6124a1d 100644 --- a/tech/starbound/bio/forcefield.statuseffect +++ b/tech/starbound/bio/forcefield.statuseffect @@ -1,12 +1,12 @@ { - "name" : "sb_forcefieldtech", - "effectConfig" : { - "directives" : "?border=1;0001;0000?border=1;007eff37;0000", - "forceFieldStrength" : 0.3 + "name": "sb_forcefieldtech", + "effectConfig": { + "directives": "?border=1;0001;0000?border=1;007eff37;0000", + "forceFieldStrength": 0.3 }, - "defaultDuration" : 5, + "defaultDuration": 5, - "scripts" : ["forcefield.lua"], - "label" : "Force Field", - "icon" : "/tech/starbound/forcefield.png" -} \ No newline at end of file + "scripts": ["forcefield.lua"], + "label": "Force Field", + "icon": "/tech/starbound/forcefield.png" +} diff --git a/tech/starbound/bio/spiked.statuseffect b/tech/starbound/bio/spiked.statuseffect index aca59611..50fb5ba1 100644 --- a/tech/starbound/bio/spiked.statuseffect +++ b/tech/starbound/bio/spiked.statuseffect @@ -1,8 +1,10 @@ { - "name" : "sb_spikedtech", - "defaultDuration" : 5, - "effectConfig" : {"tech":"sb_spiked"}, - "scripts" : ["spiked.lua"], - "label" : "Spikes", - "icon" : "/tech/starbound/spiked.png" -} \ No newline at end of file + "name": "sb_spikedtech", + "defaultDuration": 5, + "effectConfig": { + "tech": "sb_spiked" + }, + "scripts": ["spiked.lua"], + "label": "Spikes", + "icon": "/tech/starbound/spiked.png" +} diff --git a/tech/starbound/bio/tank.statuseffect b/tech/starbound/bio/tank.statuseffect index 267e6749..be08fd82 100644 --- a/tech/starbound/bio/tank.statuseffect +++ b/tech/starbound/bio/tank.statuseffect @@ -1,13 +1,13 @@ { - "name" : "sb_tanktech", - "effectConfig" : { - "tech" : "sb_tank" + "name": "sb_tanktech", + "effectConfig": { + "tech": "sb_tank" }, - "defaultDuration" : 5, + "defaultDuration": 5, - "scripts" : ["tank.lua"], - "animationConfig" : "tank.animation", + "scripts": ["tank.lua"], + "animationConfig": "tank.animation", - "label" : "Tanky", - "icon" : "/tech/starbound/tank.png" -} \ No newline at end of file + "label": "Tanky", + "icon": "/tech/starbound/tank.png" +} diff --git a/tech/starbound/bio/vamp.statuseffect b/tech/starbound/bio/vamp.statuseffect index 3e56b975..5083f57c 100644 --- a/tech/starbound/bio/vamp.statuseffect +++ b/tech/starbound/bio/vamp.statuseffect @@ -1,8 +1,10 @@ { - "name" : "sb_vamptech", - "defaultDuration" : 5, - "effectConfig" : {"tech":"sb_vamp"}, - "scripts" : ["vamp.lua"], - "label" : "Vampiric", - "icon" : "/tech/starbound/vamp.png" -} \ No newline at end of file + "name": "sb_vamptech", + "defaultDuration": 5, + "effectConfig": { + "tech": "sb_vamp" + }, + "scripts": ["vamp.lua"], + "label": "Vampiric", + "icon": "/tech/starbound/vamp.png" +} diff --git a/tech/starbound/blink/blinkin.png b/tech/starbound/blink/blinkin.png index 64c44284..3c367d13 100644 Binary files a/tech/starbound/blink/blinkin.png and b/tech/starbound/blink/blinkin.png differ diff --git a/tech/starbound/blink/blinkout.png b/tech/starbound/blink/blinkout.png index 381fa762..c22c4ad7 100644 Binary files a/tech/starbound/blink/blinkout.png and b/tech/starbound/blink/blinkout.png differ diff --git a/tech/starbound/boat.png b/tech/starbound/boat.png index 6e61ba90..b8a99d23 100644 Binary files a/tech/starbound/boat.png and b/tech/starbound/boat.png differ diff --git a/tech/starbound/booster.png b/tech/starbound/booster.png index 97fad52c..3aae22a9 100644 Binary files a/tech/starbound/booster.png and b/tech/starbound/booster.png differ diff --git a/tech/starbound/booster/bubble.png b/tech/starbound/booster/bubble.png index 707337bf..59393f34 100644 Binary files a/tech/starbound/booster/bubble.png and b/tech/starbound/booster/bubble.png differ diff --git a/tech/starbound/booster/bubbleboost.tech b/tech/starbound/booster/bubbleboost.tech index 0b70557b..07c2985f 100644 --- a/tech/starbound/booster/bubbleboost.tech +++ b/tech/starbound/booster/bubbleboost.tech @@ -11,6 +11,7 @@ "scripts" : ["booster.lua"], "animator" : "bubbleboost.animation", + "chipCost" : 10, "boostControlForce" : 300, "boostSpeed" : 40, diff --git a/tech/starbound/booster/butterfly.png b/tech/starbound/booster/butterfly.png index 27c493fc..cfdd2138 100644 Binary files a/tech/starbound/booster/butterfly.png and b/tech/starbound/booster/butterfly.png differ diff --git a/tech/starbound/booster/butterflyboost.tech b/tech/starbound/booster/butterflyboost.tech index d0dfd4a8..e0c1987b 100644 --- a/tech/starbound/booster/butterflyboost.tech +++ b/tech/starbound/booster/butterflyboost.tech @@ -10,6 +10,7 @@ "scripts" : ["booster.lua"], "animator" : "butterflyboost.animation", + "chipCost" : 10, "boostControlForce" : 750, "boostSpeed" : 30, diff --git a/tech/starbound/booster/particlethrust.tech b/tech/starbound/booster/particlethrust.tech index 25166538..7b179b24 100644 --- a/tech/starbound/booster/particlethrust.tech +++ b/tech/starbound/booster/particlethrust.tech @@ -9,6 +9,7 @@ "scripts" : ["booster.lua"], "animator" : "particlethrust.animation", + "chipCost" : 10, "boostControlForce" : 750, "boostSpeed" : 20, diff --git a/tech/starbound/bounce.png b/tech/starbound/bounce.png index 65b5df6a..c7e6d5cf 100644 Binary files a/tech/starbound/bounce.png and b/tech/starbound/bounce.png differ diff --git a/tech/starbound/bounce/bounce.lua b/tech/starbound/bounce/bounce.lua index ffce71bb..22ddaa4a 100644 --- a/tech/starbound/bounce/bounce.lua +++ b/tech/starbound/bounce/bounce.lua @@ -14,12 +14,12 @@ function update(args) local action = input(args) if action == "activate" - and not tech.parentLounging() - and world.resolvePolyCollision(bounceCollisionPoly, mcontroller.position(), 1) - and status.overConsumeResource("energy", energyUsageRate * args.dt) then - - activate() - elseif action == "deactivate" or (active and not status.overConsumeResource("energy", energyUsageRate * args.dt)) then + and not tech.parentLounging() + and world.resolvePolyCollision(bounceCollisionPoly, mcontroller.position(), 1) + and status.overConsumeResource("energy", energyUsageRate * args.dt) then + activate() + elseif action == "deactivate" + or (active and (not status.overConsumeResource("energy", energyUsageRate * args.dt) or tech.parentLounging())) then deactivate() end diff --git a/tech/starbound/bounce/bounce.tech b/tech/starbound/bounce/bounce.tech index c0b4e5ad..b79b10d6 100644 --- a/tech/starbound/bounce/bounce.tech +++ b/tech/starbound/bounce/bounce.tech @@ -1,19 +1,19 @@ { - "name" : "sb_bounce", - "type" : "head", + "name": "sb_bounce", + "type": "head", - "rarity" : "Legendary", - "icon" : "/tech/starbound/bounce.png", - "description" : "Generates a kinetic reversal field that reflects the ground. ^#0f0;[F]", - "sb_briefDescription" : "Generates a kinetic reversal field. ^#0f0;[F]", - "shortDescription" : "Bouncy", - "chipCost" : 3, + "rarity": "Legendary", + "icon": "/tech/starbound/bounce.png", + "description": "Generates a kinetic reversal field that reflects the ground. ^#0f0;[F]", + "sb_briefDescription": "Generates a kinetic reversal field. ^#0f0;[F]", + "shortDescription": "Bouncy", + "chipCost": 3, - "scripts" : ["bounce.lua"], - "scriptDelta" : 1, - "animator" : "bounce.animation", + "scripts": ["bounce.lua"], + "scriptDelta": 1, + "animator": "bounce.animation", - "energyUsageRate" : 8, - "bounceCollisionPoly" : [[-1.25, 2.5], [1.25, 2.5], [2.5, 1.25], [2.5, -1.25], [1.25, -2.5], [-1.25, -2.5], [-2.5, -1.25], [-2.5, 1.25]], - "bounceFactor" : 0.9 -} \ No newline at end of file + "energyUsageRate": 16, + "bounceCollisionPoly": [[-1.25, 2.5], [1.25, 2.5], [2.5, 1.25], [2.5, -1.25], [1.25, -2.5], [-1.25, -2.5], [-2.5, -1.25], [-2.5, 1.25]], + "bounceFactor": 0.9 +} diff --git a/tech/starbound/bounce/bubble.png b/tech/starbound/bounce/bubble.png index 165edd03..f71c7f20 100644 Binary files a/tech/starbound/bounce/bubble.png and b/tech/starbound/bounce/bubble.png differ diff --git a/tech/starbound/convert.png b/tech/starbound/convert.png index 8428615f..dd97e480 100644 Binary files a/tech/starbound/convert.png and b/tech/starbound/convert.png differ diff --git a/tech/starbound/dash.png b/tech/starbound/dash.png index 07f5cae3..c008e50d 100644 Binary files a/tech/starbound/dash.png and b/tech/starbound/dash.png differ diff --git a/tech/starbound/dash/dash.tech b/tech/starbound/dash/dash.tech index d53c0443..a12d343f 100644 --- a/tech/starbound/dash/dash.tech +++ b/tech/starbound/dash/dash.tech @@ -1,23 +1,23 @@ { - "name" : "sb_dash", - "type" : "body", + "name": "sb_dash", + "type": "body", - "rarity" : "Legendary", - "icon" : "/tech/starbound/dash.png", - "description" : "Double tap ^green;[A]^reset; or ^green;[D] ^reset;to dash!", - "sb_longDescription" : "You can dash while crouching.", - "shortDescription" : "Energy Dash", - "chipCost" : 10, + "rarity": "Legendary", + "icon": "/tech/starbound/dash.png", + "description": "A dash which uses energy and has no cooldown! ^green;[A]^reset;/^green;[D]^reset;", + "sb_longDescription": "You can dash while crouching.", + "shortDescription": "Energy Dash", + "chipCost": 10, - "scripts" : ["dash.lua"], - "animator" : "dash.animation", + "scripts": ["dash.lua"], + "animator": "dash.animation", - "maximumDoubleTapTime" : 0.2, - "dashControlForce" : 2000,//600, - "dashSpeed" : 40, - "dashDuration" : 0.3, - "energyUsage" : 35, - "stopAfterDash" : false, - "groundOnly" : false, - "canCrouchDash" : true -} \ No newline at end of file + "maximumDoubleTapTime": 0.2, + "dashControlForce": 2000, //600, + "dashSpeed": 40, + "dashDuration": 0.3, + "energyUsage": 35, + "stopAfterDash": false, + "groundOnly": false, + "canCrouchDash": true +} diff --git a/tech/starbound/dash/recharge.png b/tech/starbound/dash/recharge.png index 927e620b..d1533fdb 100644 Binary files a/tech/starbound/dash/recharge.png and b/tech/starbound/dash/recharge.png differ diff --git a/tech/starbound/doublejump.png b/tech/starbound/doublejump.png index 459b22d0..cf0c9bf6 100644 Binary files a/tech/starbound/doublejump.png and b/tech/starbound/doublejump.png differ diff --git a/tech/starbound/enhancedhealing.png b/tech/starbound/enhancedhealing.png index 9787f727..089fdc81 100644 Binary files a/tech/starbound/enhancedhealing.png and b/tech/starbound/enhancedhealing.png differ diff --git a/tech/starbound/equip.lua b/tech/starbound/equip.lua index 97c7ca41..957712c3 100644 --- a/tech/starbound/equip.lua +++ b/tech/starbound/equip.lua @@ -23,19 +23,33 @@ function equipTech() local tec = root.techType(tech) == "Suit" and player.getProperty("sb_bioimplant") or player.equippedTech(root.techConfig(tech).type) if tec ~= nil then if ownsTech() then - local suit = root.techType(tech) == "Suit" and true - if (tech ~= tec) then - activeItem.setInstanceValue("durabilityHit",0) - if not suit then - player.equipTech(tech) - else - world.sendEntityMessage(player.id(),"sb_implant",tech) - end - animator.playSound("success") - else sb_uiMessage(9) end --wearing that - else sb_uiMessage(5) end --does not own tech - else if ownsTech() then player.equipTech(tech) activeItem.setInstanceValue("durabilityHit",0) animator.playSound("success") else sb_uiMessage(5) end end --not wearing, not owned - else sb_uiMessage(3) end --does not exist + local suit = root.techType(tech) == "Suit" and true + if (tech ~= tec) then + activeItem.setInstanceValue("durabilityHit",0) + if not suit then + player.equipTech(tech) + else + world.sendEntityMessage(player.id(),"sb_implant",tech) + end + animator.playSound("success") + else + sb_uiMessage("techAlreadyEquipped") + end + else + sb_uiMessage("techNotKnown") + end + else + if ownsTech() then + player.equipTech(tech) + activeItem.setInstanceValue("durabilityHit", 0) + animator.playSound("success") + else + sb_uiMessage("techNotKnown") --Not wearing and not owned + end + end + else + sb_uiMessage("techFail") + end end function ownsTech() return contains(player.enabledTechs(), tech) or contains(player.getProperty("sb_bioimplants",{}), tech) end \ No newline at end of file diff --git a/tech/starbound/explosiveprotection.png b/tech/starbound/explosiveprotection.png index 56ae5130..571f5039 100644 Binary files a/tech/starbound/explosiveprotection.png and b/tech/starbound/explosiveprotection.png differ diff --git a/tech/starbound/explosiveprotection/explosiveprotection.statuseffect b/tech/starbound/explosiveprotection/explosiveprotection.statuseffect index 6f495a5c..e1e11822 100644 --- a/tech/starbound/explosiveprotection/explosiveprotection.statuseffect +++ b/tech/starbound/explosiveprotection/explosiveprotection.statuseffect @@ -1,9 +1,11 @@ { - "name" : "sb_explosiveprotectiontech", - "defaultDuration" : 5, - "animationConfig" : "explosiveprotection.animation", - "effectConfig" : {"tech":"sb_explosiveprotection"}, - "scripts" : ["explosiveprotection.lua"], - "label" : "Explosive Defence", - "icon" : "/tech/starbound/explosiveprotection.png" -} \ No newline at end of file + "name": "sb_explosiveprotectiontech", + "defaultDuration": 5, + "animationConfig": "explosiveprotection.animation", + "effectConfig": { + "tech": "sb_explosiveprotection" + }, + "scripts": ["explosiveprotection.lua"], + "label": "Explosive Defence", + "icon": "/tech/starbound/explosiveprotection.png" +} diff --git a/tech/starbound/flyingjump.png b/tech/starbound/flyingjump.png index 3795dec6..8358b3df 100644 Binary files a/tech/starbound/flyingjump.png and b/tech/starbound/flyingjump.png differ diff --git a/tech/starbound/ftlboost.png b/tech/starbound/ftlboost.png index d6cb3035..57bb6d50 100644 Binary files a/tech/starbound/ftlboost.png and b/tech/starbound/ftlboost.png differ diff --git a/tech/starbound/glitchmech.png b/tech/starbound/glitchmech.png index be04818e..26858941 100644 Binary files a/tech/starbound/glitchmech.png and b/tech/starbound/glitchmech.png differ diff --git a/tech/starbound/glow.png b/tech/starbound/glow.png index f1339a93..be92953d 100644 Binary files a/tech/starbound/glow.png and b/tech/starbound/glow.png differ diff --git a/tech/starbound/gravity.png b/tech/starbound/gravity.png index f4687a7c..d1a03549 100644 Binary files a/tech/starbound/gravity.png and b/tech/starbound/gravity.png differ diff --git a/tech/starbound/gravityball.png b/tech/starbound/gravityball.png index 2f0e0358..50d01612 100644 Binary files a/tech/starbound/gravityball.png and b/tech/starbound/gravityball.png differ diff --git a/tech/starbound/gravitybubble.png b/tech/starbound/gravitybubble.png index f0551c05..3284bd63 100644 Binary files a/tech/starbound/gravitybubble.png and b/tech/starbound/gravitybubble.png differ diff --git a/tech/starbound/groundsmash.png b/tech/starbound/groundsmash.png index b3f044b5..aa634ae2 100644 Binary files a/tech/starbound/groundsmash.png and b/tech/starbound/groundsmash.png differ diff --git a/tech/starbound/groundsmash/groundsmashdamage.statuseffect b/tech/starbound/groundsmash/groundsmashdamage.statuseffect index 128478cc..f3415286 100644 --- a/tech/starbound/groundsmash/groundsmashdamage.statuseffect +++ b/tech/starbound/groundsmash/groundsmashdamage.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_groundsmashdamage", - "effectConfig" : {}, - "defaultDuration" : 0.1, - "scripts" : ["groundsmashdamage.lua"] -} \ No newline at end of file + "name": "sb_groundsmashdamage", + "effectConfig": {}, + "defaultDuration": 0.1, + "scripts": ["groundsmashdamage.lua"] +} diff --git a/tech/starbound/groundsmash/groundsmashknockback.statuseffect b/tech/starbound/groundsmash/groundsmashknockback.statuseffect index a1cb6d2f..793d7f0e 100644 --- a/tech/starbound/groundsmash/groundsmashknockback.statuseffect +++ b/tech/starbound/groundsmash/groundsmashknockback.statuseffect @@ -1,6 +1,8 @@ { - "name" : "sb_groundsmashknockbackX", - "effectConfig" : {"X":"X"}, - "defaultDuration" : 0.1, - "scripts" : ["groundsmashknockback.lua"] -} \ No newline at end of file + "name": "sb_groundsmashknockbackX", + "effectConfig": { + "X": "X" + }, + "defaultDuration": 0.1, + "scripts": ["groundsmashknockback.lua"] +} diff --git a/tech/starbound/groundsmash/groundsmashknockbackY.statuseffect b/tech/starbound/groundsmash/groundsmashknockbackY.statuseffect index c2235274..599426fe 100644 --- a/tech/starbound/groundsmash/groundsmashknockbackY.statuseffect +++ b/tech/starbound/groundsmash/groundsmashknockbackY.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_groundsmashknockbackY", - "effectConfig" : {}, - "defaultDuration" : 0.1, - "scripts" : ["groundsmashknockback.lua"] -} \ No newline at end of file + "name": "sb_groundsmashknockbackY", + "effectConfig": {}, + "defaultDuration": 0.1, + "scripts": ["groundsmashknockback.lua"] +} diff --git a/tech/starbound/hover.png b/tech/starbound/hover.png index f0551c05..3284bd63 100644 Binary files a/tech/starbound/hover.png and b/tech/starbound/hover.png differ diff --git a/tech/starbound/humancar.png b/tech/starbound/humancar.png index c51ba8f2..9e651cf5 100644 Binary files a/tech/starbound/humancar.png and b/tech/starbound/humancar.png differ diff --git a/tech/starbound/humanjeep.png b/tech/starbound/humanjeep.png index 4b492e0d..b24138c8 100644 Binary files a/tech/starbound/humanjeep.png and b/tech/starbound/humanjeep.png differ diff --git a/tech/starbound/humanmech.png b/tech/starbound/humanmech.png index 1210595e..d2f227d9 100644 Binary files a/tech/starbound/humanmech.png and b/tech/starbound/humanmech.png differ diff --git a/tech/starbound/jetpack/hover.animation b/tech/starbound/jetpack/hover.animation index 142d8885..fa24c338 100644 --- a/tech/starbound/jetpack/hover.animation +++ b/tech/starbound/jetpack/hover.animation @@ -24,13 +24,13 @@ "jetpackParticles" : { "emissionRate" : 14, "particles" : [ - {"particle":"defaultblue","offset":[0.2,-2]}, - {"particle":"defaultblue","offset":[0.2,-2]}, - {"particle":"defaultblue","offset":[0.2,-2]}, - {"particle":"defaultblue","offset":[0.2,-2]}, - {"particle":"defaultblue","offset":[0.2,-2]}, - {"particle":"defaultblue","offset":[0.2,-2]}, - {"particle":"defaultblue","offset":[0.2,-2]} + {"particle":"defaultblue","offset":[0.2,-2]}, + {"particle":"defaultblue","offset":[0.2,-2]}, + {"particle":"defaultblue","offset":[0.2,-2]}, + {"particle":"defaultblue","offset":[0.2,-2]}, + {"particle":"defaultblue","offset":[0.2,-2]}, + {"particle":"defaultblue","offset":[0.2,-2]}, + {"particle":"defaultblue","offset":[0.2,-2]} ] } }, diff --git a/tech/starbound/jetpack/rocketboots.tech b/tech/starbound/jetpack/rocketboots.tech index 440e9d9b..57a770f9 100644 --- a/tech/starbound/jetpack/rocketboots.tech +++ b/tech/starbound/jetpack/rocketboots.tech @@ -1,17 +1,18 @@ { - "name" : "sb_rocketboots", - "type" : "legs", + "name": "sb_rocketboots", + "type": "legs", - "rarity" : "Legendary", - "icon" : "/tech/starbound/rocketboots.png", - "description" : "Press and hold ^#0f0;[SPACE]^reset; midair to activate the rocket boots!", - "sb_briefDescription" : "Press and hold ^#0f0;[SPACE]^reset; midair to fly!", - "shortDescription" : "Rocket Boots", + "rarity": "Legendary", + "icon": "/tech/starbound/rocketboots.png", + "description": "Press and hold ^#0f0;[SPACE]^reset; midair to activate the rocket boots!", + "sb_briefDescription": "Press and hold ^#0f0;[SPACE]^reset; midair to fly!", + "shortDescription": "Rocket Boots", + "chipCost": 6, - "scripts" : ["jetpack.lua"], - "animator" : "rocketboots.animation", + "scripts": ["jetpack.lua"], + "animator": "rocketboots.animation", - "jetpackSpeed" : 20, - "jetpackControlForce" : 250, - "energyUsagePerSecond" : 43 -} \ No newline at end of file + "jetpackSpeed": 20, + "jetpackControlForce": 250, + "energyUsagePerSecond": 43 +} diff --git a/tech/starbound/lockin.lua b/tech/starbound/lockin.lua index b3f5b8cc..a54d5abe 100644 --- a/tech/starbound/lockin.lua +++ b/tech/starbound/lockin.lua @@ -27,23 +27,34 @@ function lockinTech() local tec = root.techType(tech[1]) ~= "Suit" and player.equippedTech(root.techConfig(tech[1]).type) or player.getProperty("sb_bioimplant") if tec ~= nil then if ownsTech() then - suit = root.techType(tec) == "Suit" and true - if (tech[1] == tec) or (tech[2] == tec) then - activeItem.setInstanceValue("durabilityHit",0) - local e = {tech[2],tech[1]} - activeItem.setInstanceValue("techModules",e) - local f = config.getParameter("tooltipFields",nil) - if f then e = {objectBImage = f.objectCImage, objectCImage = f.objectBImage,objectImage=""} - activeItem.setInstanceValue("tooltipFields",e) end - if not suit then - player.equipTech(tech[2]) - else - world.sendEntityMessage(player.id(),"sb_implant",tech[2]) end - animator.playSound("success") - else sb_uiMessage(6) end - else sb_uiMessage(5) end - else sb_uiMessage(6) end - else sb_uiMessage(3) end tech = config.getParameter("techModules") + suit = root.techType(tec) == "Suit" and true + if (tech[1] == tec) or (tech[2] == tec) then + activeItem.setInstanceValue("durabilityHit",0) + local e = {tech[2],tech[1]} + activeItem.setInstanceValue("techModules",e) + local f = config.getParameter("tooltipFields",nil) + if f then + e = {objectBImage = f.objectCImage, objectCImage = f.objectBImage,objectImage=""} + activeItem.setInstanceValue("tooltipFields",e) + end + if not suit then + player.equipTech(tech[2]) + else + world.sendEntityMessage(player.id(),"sb_implant",tech[2]) end + animator.playSound("success") + else + sb_uiMessage("techNotBinded") + end + else + sb_uiMessage("techNotKnown") + end + else + sb_uiMessage("techNotBinded") + end + else + sb_uiMessage("techFail") + end + tech = config.getParameter("techModules") end function ownsTech() return contains(player.enabledTechs(), tech[2]) or contains(player.getProperty("sb_bioimplants",{}), tech[2]) end \ No newline at end of file diff --git a/tech/starbound/magnet.png b/tech/starbound/magnet.png index e0af7079..49e47713 100644 Binary files a/tech/starbound/magnet.png and b/tech/starbound/magnet.png differ diff --git a/tech/starbound/magnet/magnet.statuseffect b/tech/starbound/magnet/magnet.statuseffect index cad75a2c..7df43c8d 100644 --- a/tech/starbound/magnet/magnet.statuseffect +++ b/tech/starbound/magnet/magnet.statuseffect @@ -1,8 +1,8 @@ { - "name" : "sb_magnet", - "effectConfig" : {}, - "defaultDuration" : 1, - "scripts" : ["magnet.lua"], - "label" : "Magnetic", - "icon" : "/tech/starbound/magnet.png" -} \ No newline at end of file + "name": "sb_magnet", + "effectConfig": {}, + "defaultDuration": 1, + "scripts": ["magnet.lua"], + "label": "Magnetic", + "icon": "/tech/starbound/magnet.png" +} diff --git a/tech/starbound/magnet/magnet.tech b/tech/starbound/magnet/magnet.tech index 84347c7f..67fc1982 100644 --- a/tech/starbound/magnet/magnet.tech +++ b/tech/starbound/magnet/magnet.tech @@ -1,14 +1,14 @@ { - "name" : "sb_magnet", - "type" : "head", - "icon" : "/tech/starbound/magnet.png", - "scripts" : [], - "sb_effect" : "sb_magnet", - "sb_suitImage" : "?replace;73daff=fa0000;27abff=db0000;117ee4=bc0000;1f45d4=770000;002b72=580000;001522=390000", -//"sb_suitImage" : "?replace;73daff=ececec;27abff=ccc;117ee4=bdbdbd;1f45d4=aeaeae;002b72=9f9f9f;001522=909090", - "rarity" : "Legendary", - "chipCost" : 8, - "description" : "Provides the wearer with the ability to attract nearby items.", - "sb_longDescription" : "Dropping items may be difficult...", - "shortDescription" : "Magnetic" -} \ No newline at end of file + "name": "sb_magnet", + "type": "head", + "icon": "/tech/starbound/magnet.png", + "scripts": [], + "sb_effect": "sb_magnet", + "sb_suitImage": "?replace;73daff=fa0000;27abff=db0000;117ee4=bc0000;1f45d4=770000;002b72=580000;001522=390000", + //"sb_suitImage" : "?replace;73daff=ececec;27abff=ccc;117ee4=bdbdbd;1f45d4=aeaeae;002b72=9f9f9f;001522=909090", + "rarity": "Legendary", + "chipCost": 8, + "description": "Provides the wearer with the ability to attract nearby items.", + "sb_longDescription": "Dropping items may be difficult...", + "shortDescription": "Magnetic" +} diff --git a/tech/starbound/mech/apex/mechbleg.png b/tech/starbound/mech/apex/mechbleg.png index f7efe364..6c324e0d 100644 Binary files a/tech/starbound/mech/apex/mechbleg.png and b/tech/starbound/mech/apex/mechbleg.png differ diff --git a/tech/starbound/mech/apex/mechbody.png b/tech/starbound/mech/apex/mechbody.png index ebbaab9a..d654ccc7 100644 Binary files a/tech/starbound/mech/apex/mechbody.png and b/tech/starbound/mech/apex/mechbody.png differ diff --git a/tech/starbound/mech/apex/mechfleg.png b/tech/starbound/mech/apex/mechfleg.png index acaf4c27..e8cafa29 100644 Binary files a/tech/starbound/mech/apex/mechfleg.png and b/tech/starbound/mech/apex/mechfleg.png differ diff --git a/tech/starbound/mech/glitch/emechgun.png b/tech/starbound/mech/glitch/emechgun.png index 44ff844e..3ebd8b77 100644 Binary files a/tech/starbound/mech/glitch/emechgun.png and b/tech/starbound/mech/glitch/emechgun.png differ diff --git a/tech/starbound/mech/glitch/mechbackground.png b/tech/starbound/mech/glitch/mechbackground.png index 4753291d..a4979557 100644 Binary files a/tech/starbound/mech/glitch/mechbackground.png and b/tech/starbound/mech/glitch/mechbackground.png differ diff --git a/tech/starbound/mech/glitch/mechbleg.png b/tech/starbound/mech/glitch/mechbleg.png index 19bb77bf..68d3ef37 100644 Binary files a/tech/starbound/mech/glitch/mechbleg.png and b/tech/starbound/mech/glitch/mechbleg.png differ diff --git a/tech/starbound/mech/glitch/mechbody.png b/tech/starbound/mech/glitch/mechbody.png index a8dd80e1..632e3c1c 100644 Binary files a/tech/starbound/mech/glitch/mechbody.png and b/tech/starbound/mech/glitch/mechbody.png differ diff --git a/tech/starbound/mech/glitch/mechfleg.png b/tech/starbound/mech/glitch/mechfleg.png index 23fed54c..7604c724 100644 Binary files a/tech/starbound/mech/glitch/mechfleg.png and b/tech/starbound/mech/glitch/mechfleg.png differ diff --git a/tech/starbound/mech/glitch/mechgun.png b/tech/starbound/mech/glitch/mechgun.png index 499480f1..ffdbce2d 100644 Binary files a/tech/starbound/mech/glitch/mechgun.png and b/tech/starbound/mech/glitch/mechgun.png differ diff --git a/tech/starbound/mech/human/mechbackground.png b/tech/starbound/mech/human/mechbackground.png index 4753291d..14c2609d 100644 Binary files a/tech/starbound/mech/human/mechbackground.png and b/tech/starbound/mech/human/mechbackground.png differ diff --git a/tech/starbound/mech/human/mechbleg.png b/tech/starbound/mech/human/mechbleg.png index 765fa84e..73c69ca4 100644 Binary files a/tech/starbound/mech/human/mechbleg.png and b/tech/starbound/mech/human/mechbleg.png differ diff --git a/tech/starbound/mech/human/mechbody.png b/tech/starbound/mech/human/mechbody.png index 21c0d8a4..e56a6bcf 100644 Binary files a/tech/starbound/mech/human/mechbody.png and b/tech/starbound/mech/human/mechbody.png differ diff --git a/tech/starbound/mech/human/mechfleg.png b/tech/starbound/mech/human/mechfleg.png index 2ddc3753..1625a80d 100644 Binary files a/tech/starbound/mech/human/mechfleg.png and b/tech/starbound/mech/human/mechfleg.png differ diff --git a/tech/starbound/mech/muzzle/flamemuzzle.png b/tech/starbound/mech/muzzle/flamemuzzle.png index f797ff19..55ffff77 100644 Binary files a/tech/starbound/mech/muzzle/flamemuzzle.png and b/tech/starbound/mech/muzzle/flamemuzzle.png differ diff --git a/tech/starbound/miningdrill.png b/tech/starbound/miningdrill.png index 073ddf4c..ebf6158a 100644 Binary files a/tech/starbound/miningdrill.png and b/tech/starbound/miningdrill.png differ diff --git a/tech/starbound/miningdrill/miningdrillx.png b/tech/starbound/miningdrill/miningdrillx.png index f82e7436..c1fa387f 100644 Binary files a/tech/starbound/miningdrill/miningdrillx.png and b/tech/starbound/miningdrill/miningdrillx.png differ diff --git a/tech/starbound/miningdrill/miningdrilly.png b/tech/starbound/miningdrill/miningdrilly.png index 880fc9d5..f9940e20 100644 Binary files a/tech/starbound/miningdrill/miningdrilly.png and b/tech/starbound/miningdrill/miningdrilly.png differ diff --git a/tech/starbound/mobility.png b/tech/starbound/mobility.png index 564c9556..f7222868 100644 Binary files a/tech/starbound/mobility.png and b/tech/starbound/mobility.png differ diff --git a/tech/starbound/morphball.png b/tech/starbound/morphball.png index 2ce602d7..97a4a9d0 100644 Binary files a/tech/starbound/morphball.png and b/tech/starbound/morphball.png differ diff --git a/tech/starbound/morphball/ball.png b/tech/starbound/morphball/ball.png index 2f584c71..0d0b4d1f 100644 Binary files a/tech/starbound/morphball/ball.png and b/tech/starbound/morphball/ball.png differ diff --git a/tech/starbound/morphball/waterball.png b/tech/starbound/morphball/waterball.png index 3b7739b2..cebbd828 100644 Binary files a/tech/starbound/morphball/waterball.png and b/tech/starbound/morphball/waterball.png differ diff --git a/tech/starbound/movement/gravity.statuseffect b/tech/starbound/movement/gravity.statuseffect index 21b04753..142be71c 100644 --- a/tech/starbound/movement/gravity.statuseffect +++ b/tech/starbound/movement/gravity.statuseffect @@ -1,8 +1,10 @@ { - "name" : "sb_gravitytech", - "effectConfig" : {"gravityModifier":0.3}, - "defaultDuration" : 9, - "scripts" : ["gravity.lua"], - "label" : "Light", - "icon" : "/tech/starbound/gravity.png" -} \ No newline at end of file + "name": "sb_gravitytech", + "effectConfig": { + "gravityModifier": 0.3 + }, + "defaultDuration": 9, + "scripts": ["gravity.lua"], + "label": "Light", + "icon": "/tech/starbound/gravity.png" +} diff --git a/tech/starbound/movement/jump.statuseffect b/tech/starbound/movement/jump.statuseffect index 703ddca0..595927bd 100644 --- a/tech/starbound/movement/jump.statuseffect +++ b/tech/starbound/movement/jump.statuseffect @@ -1,7 +1,7 @@ { - "name" : "sb_jumptech", - "defaultDuration" : 5, - "scripts" : ["jump.lua"], - "label" : "Jump+", - "icon" : "/tech/starbound/jump.png" -} \ No newline at end of file + "name": "sb_jumptech", + "defaultDuration": 5, + "scripts": ["jump.lua"], + "label": "Jump+", + "icon": "/tech/starbound/jump.png" +} diff --git a/tech/starbound/movement/mobility.statuseffect b/tech/starbound/movement/mobility.statuseffect index 5aa54d71..64eb2fc4 100644 --- a/tech/starbound/movement/mobility.statuseffect +++ b/tech/starbound/movement/mobility.statuseffect @@ -1,8 +1,8 @@ { - "name" : "sb_mobilitytech", - "effectConfig" : {}, - "defaultDuration" : 5, - "scripts" : ["mobility.lua"], - "label" : "Mobility+", - "icon" : "/tech/starbound/mobility.png" -} \ No newline at end of file + "name": "sb_mobilitytech", + "effectConfig": {}, + "defaultDuration": 5, + "scripts": ["mobility.lua"], + "label": "Mobility+", + "icon": "/tech/starbound/mobility.png" +} diff --git a/tech/starbound/movement/speed.statuseffect b/tech/starbound/movement/speed.statuseffect index 161d4324..88812f10 100644 --- a/tech/starbound/movement/speed.statuseffect +++ b/tech/starbound/movement/speed.statuseffect @@ -1,8 +1,12 @@ { - "name" : "sb_speedtech", - "effectConfig" : {"controlModifiers":{"speedModifier":1.5}}, - "defaultDuration" : 5, - "scripts" : ["controlmodifiers.lua"], - "label" : "Speed+", - "icon" : "/tech/starbound/speed.png" -} \ No newline at end of file + "name": "sb_speedtech", + "effectConfig": { + "controlModifiers": { + "speedModifier": 1.5 + } + }, + "defaultDuration": 5, + "scripts": ["controlmodifiers.lua"], + "label": "Speed+", + "icon": "/tech/starbound/speed.png" +} diff --git a/tech/starbound/particleboost.png b/tech/starbound/particleboost.png index d7e88142..a47b685f 100644 Binary files a/tech/starbound/particleboost.png and b/tech/starbound/particleboost.png differ diff --git a/tech/starbound/particlethrust.png b/tech/starbound/particlethrust.png index f1bf6a93..8bf71214 100644 Binary files a/tech/starbound/particlethrust.png and b/tech/starbound/particlethrust.png differ diff --git a/tech/starbound/rad.png b/tech/starbound/rad.png index 8a69f728..bc5f3808 100644 Binary files a/tech/starbound/rad.png and b/tech/starbound/rad.png differ diff --git a/tech/starbound/regen/energyregen.statuseffect b/tech/starbound/regen/energyregen.statuseffect index fb5c1d6a..299503c6 100644 --- a/tech/starbound/regen/energyregen.statuseffect +++ b/tech/starbound/regen/energyregen.statuseffect @@ -1,13 +1,13 @@ { - "name" : "sb_energyregentech", - "effectConfig" : { - "tech" : "sb_energyregen" + "name": "sb_energyregentech", + "effectConfig": { + "tech": "sb_energyregen" }, - "defaultDuration" : 5, + "defaultDuration": 5, - "scripts" : ["regen.lua"], - "animationConfig" : "energyregen.animation", + "scripts": ["regen.lua"], + "animationConfig": "energyregen.animation", - "label" : "Energy Charge", - "icon" : "/tech/starbound/energyregen.png" -} \ No newline at end of file + "label": "Energy Charge", + "icon": "/tech/starbound/energyregen.png" +} diff --git a/tech/starbound/regen/regeneration.png b/tech/starbound/regen/regeneration.png index b7a841a9..d98b9955 100644 Binary files a/tech/starbound/regen/regeneration.png and b/tech/starbound/regen/regeneration.png differ diff --git a/tech/starbound/regen/regeneration.statuseffect b/tech/starbound/regen/regeneration.statuseffect index d8bcd74f..8fa3fa1d 100644 --- a/tech/starbound/regen/regeneration.statuseffect +++ b/tech/starbound/regen/regeneration.statuseffect @@ -1,13 +1,13 @@ { - "name" : "sb_regenerationtech", - "effectConfig" : { - "tech" : "sb_regeneration" + "name": "sb_regenerationtech", + "effectConfig": { + "tech": "sb_regeneration" }, - "defaultDuration" : 5, + "defaultDuration": 5, - "scripts" : ["regen.lua"], - "animationConfig" : "regeneration.animation", + "scripts": ["regen.lua"], + "animationConfig": "regeneration.animation", - "label" : "Regeneration", - "icon" : "regeneration.png" -} \ No newline at end of file + "label": "Regeneration", + "icon": "regeneration.png" +} diff --git a/tech/starbound/rocketboots.png b/tech/starbound/rocketboots.png index 4b05b99e..8e52574b 100644 Binary files a/tech/starbound/rocketboots.png and b/tech/starbound/rocketboots.png differ diff --git a/tech/starbound/shield.png b/tech/starbound/shield.png index a83ac94b..e5a602f1 100644 Binary files a/tech/starbound/shield.png and b/tech/starbound/shield.png differ diff --git a/tech/starbound/shield/shield.statuseffect b/tech/starbound/shield/shield.statuseffect index 421e46aa..a375fc65 100644 --- a/tech/starbound/shield/shield.statuseffect +++ b/tech/starbound/shield/shield.statuseffect @@ -1,13 +1,13 @@ { - "name" : "sb_shield", - "effectConfig" : { - "tech" : "sb_shield" + "name": "sb_shield", + "effectConfig": { + "tech": "sb_shield" }, - "defaultDuration" : 5, + "defaultDuration": 5, - "scripts" : ["shield.lua"], - "animationConfig" : "shield.animation", + "scripts": ["shield.lua"], + "animationConfig": "shield.animation", - "label" : "Shield", - "icon" : "/tech/starbound/shield.png" -} \ No newline at end of file + "label": "Shield", + "icon": "/tech/starbound/shield.png" +} diff --git a/tech/starbound/shield/shieldbubble.png b/tech/starbound/shield/shieldbubble.png index 04b497f1..6f701f91 100644 Binary files a/tech/starbound/shield/shieldbubble.png and b/tech/starbound/shield/shieldbubble.png differ diff --git a/tech/starbound/skyrail.png b/tech/starbound/skyrail.png index 9834c70b..51cc9f23 100644 Binary files a/tech/starbound/skyrail.png and b/tech/starbound/skyrail.png differ diff --git a/tech/starbound/skyrail/raileffect.png b/tech/starbound/skyrail/raileffect.png index 19cd2023..f691dc4c 100644 Binary files a/tech/starbound/skyrail/raileffect.png and b/tech/starbound/skyrail/raileffect.png differ diff --git a/tech/starbound/skyrail/raileffectbg.png b/tech/starbound/skyrail/raileffectbg.png index c828fa74..61b2186b 100644 Binary files a/tech/starbound/skyrail/raileffectbg.png and b/tech/starbound/skyrail/raileffectbg.png differ diff --git a/tech/starbound/skyrail/skyrail.lua b/tech/starbound/skyrail/skyrail.lua index afe51e39..8d961465 100644 --- a/tech/starbound/skyrail/skyrail.lua +++ b/tech/starbound/skyrail/skyrail.lua @@ -2,8 +2,6 @@ require "/scripts/vec2.lua" require "/scripts/rails.lua" require "/scripts/util.lua" - - function init() --INPUT ACTION CONSTANTS @@ -68,11 +66,13 @@ end --UPDATE HANDLING: General & Offrail ------------------------------------------------------------------------------------------ function update(args) - + if self.active and tech.parentLounging() then + self.active = false + end --Handle active/unactive state of skyrail rider + calling onrail / offrail update. --if args.moves["special1"] then - if args.moves["special1"] and not self.lastAction2 then + if args.moves["special1"] and not self.lastAction2 and not tech.parentLounging() then self.active = not self.active if self.onRail then leaveRail() @@ -88,10 +88,10 @@ function update(args) update_onrail(args) tech.setParentState("Fly") else update_offrail(args) - tech.setParentState() + tech.setParentState() end else - tech.setParentState() + tech.setParentState() animator.setAnimationState("skyrail", "off") animator.setAnimationState("skyrailbg", "off") end diff --git a/tech/starbound/speed.png b/tech/starbound/speed.png index fa003d9f..db6a8a7b 100644 Binary files a/tech/starbound/speed.png and b/tech/starbound/speed.png differ diff --git a/tech/starbound/spiked.png b/tech/starbound/spiked.png index 62f00851..a3447263 100644 Binary files a/tech/starbound/spiked.png and b/tech/starbound/spiked.png differ diff --git a/tech/starbound/suits/air.statuseffect b/tech/starbound/suits/air.statuseffect index f8d6d11c..436dce87 100644 --- a/tech/starbound/suits/air.statuseffect +++ b/tech/starbound/suits/air.statuseffect @@ -1,10 +1,14 @@ { - "name" : "sb_breathprotectiontech", - "effectConfig" : { "statModifierGroup" : [ - {"stat":"breathProtection","amount":1} - ]}, - "defaultDuration" : 5, - "scripts" : ["suit.lua"], - "label" : "Oxygen Supply", - "icon" : "/tech/starbound/air.png" -} \ No newline at end of file + "name": "sb_breathprotectiontech", + "effectConfig": { + "statModifierGroup": [{ + "stat": "breathProtection", + "amount": 1 + } + ] + }, + "defaultDuration": 5, + "scripts": ["suit.lua"], + "label": "Oxygen Supply", + "icon": "/tech/starbound/air.png" +} diff --git a/tech/starbound/suits/breathprotection.tech b/tech/starbound/suits/breathprotection.tech index ccd110a2..5690207f 100644 --- a/tech/starbound/suits/breathprotection.tech +++ b/tech/starbound/suits/breathprotection.tech @@ -1,12 +1,12 @@ { - "name" : "sb_breathprotection", - "type" : "head", - "icon" : "/tech/starbound/air.png", - "scripts" : [], - "sb_effect" : "sb_breathprotectiontech", - "sb_suitImage" : "?replace;73daff=e6e6e6;27abff=c9c9c9;117ee4=aaa;1f45d4=636363", - "rarity" : "Legendary", - "chipCost" : 8, - "description" : "Provides the wearer with a constant supply of oxygen in airless environments.", - "shortDescription" : "Oxygen Supply" -} \ No newline at end of file + "name": "sb_breathprotection", + "type": "head", + "icon": "/tech/starbound/air.png", + "scripts": [], + "sb_effect": "sb_breathprotectiontech", + "sb_suitImage": "?replace;73daff=e6e6e6;27abff=c9c9c9;117ee4=aaa;1f45d4=636363", + "rarity": "Legendary", + "chipCost": 8, + "description": "Provides the wearer with a constant supply of oxygen in airless environments.", + "shortDescription": "Oxygen Supply" +} diff --git a/tech/starbound/suits/environmentalprotection.png b/tech/starbound/suits/environmentalprotection.png index da581e6d..ba91b631 100644 Binary files a/tech/starbound/suits/environmentalprotection.png and b/tech/starbound/suits/environmentalprotection.png differ diff --git a/tech/starbound/suits/environmentalprotection.statuseffect b/tech/starbound/suits/environmentalprotection.statuseffect index 4853e1e8..99634f18 100644 --- a/tech/starbound/suits/environmentalprotection.statuseffect +++ b/tech/starbound/suits/environmentalprotection.statuseffect @@ -1,13 +1,23 @@ { - "name" : "sb_environmentalprotectiontech", - "effectConfig" : { "statModifierGroup" : [ - {"stat":"breathProtection","amount":1}, - {"stat":"biomeradiationImmunity","amount":1}, - {"stat":"biomecoldImmunity","amount":1}, - {"stat":"biomeheatImmunity","amount":1} - ]}, - "defaultDuration" : 5, - "scripts" : ["suit.lua"], - "label" : "Environmental Protection", - "icon" : "environmentalprotection.png" + "name": "sb_environmentalprotectiontech", + "effectConfig": { + "statModifierGroup": [{ + "stat": "breathProtection", + "amount": 1 + }, { + "stat": "biomeradiationImmunity", + "amount": 1 + }, { + "stat": "biomecoldImmunity", + "amount": 1 + }, { + "stat": "biomeheatImmunity", + "amount": 1 + } + ] + }, + "defaultDuration": 5, + "scripts": ["suit.lua"], + "label": "Environmental Protection", + "icon": "environmentalprotection.png" } diff --git a/tech/starbound/suits/heat.png b/tech/starbound/suits/heat.png index db44241a..60899d70 100644 Binary files a/tech/starbound/suits/heat.png and b/tech/starbound/suits/heat.png differ diff --git a/tech/starbound/suits/heat.statuseffect b/tech/starbound/suits/heat.statuseffect index 5b01fd0f..bec4ab68 100644 --- a/tech/starbound/suits/heat.statuseffect +++ b/tech/starbound/suits/heat.statuseffect @@ -1,11 +1,17 @@ { - "name" : "sb_heatprotectiontech", - "effectConfig" : { "statModifierGroup" : [ - {"stat":"biomeheatImmunity","amount":1}, - {"stat":"fireResistance","amount":0.25} - ]}, - "defaultDuration" : 5, - "scripts" : ["suit.lua"], - "label" : "Heat Protection", - "icon" : "heat.png" + "name": "sb_heatprotectiontech", + "effectConfig": { + "statModifierGroup": [{ + "stat": "biomeheatImmunity", + "amount": 1 + }, { + "stat": "fireResistance", + "amount": 0.25 + } + ] + }, + "defaultDuration": 5, + "scripts": ["suit.lua"], + "label": "Heat Protection", + "icon": "heat.png" } diff --git a/tech/starbound/suits/heatprotection.tech b/tech/starbound/suits/heatprotection.tech index 831b4357..8d1686bc 100644 --- a/tech/starbound/suits/heatprotection.tech +++ b/tech/starbound/suits/heatprotection.tech @@ -1,13 +1,13 @@ { - "name" : "sb_heatprotection", - "type" : "head", - "icon" : "/tech/starbound/heat.png", - "scripts" : [], - "sb_effect" : "sb_heatprotectiontech", - "sb_suitImage" : "?replace;73daff=f7d700;27abff=e99400;117ee4=c65d00;1f45d4=8a2400;002b72=430000;001522=230000", - "rarity" : "Legendary", - "tooltipKind" : "sb_object4", - "chipCost" : 8, - "description" : "Protects the wearer from the extreme heat found on certain planets and provides fire resistance.", - "shortDescription" : "Heat Protection" -} \ No newline at end of file + "name": "sb_heatprotection", + "type": "head", + "icon": "/tech/starbound/heat.png", + "scripts": [], + "sb_effect": "sb_heatprotectiontech", + "sb_suitImage": "?replace;73daff=f7d700;27abff=e99400;117ee4=c65d00;1f45d4=8a2400;002b72=430000;001522=230000", + "rarity": "Legendary", + "tooltipKind": "sb_object4", + "chipCost": 8, + "description": "Protects the wearer from the extreme heat found on certain planets and provides fire resistance.", + "shortDescription": "Heat Protection" +} diff --git a/tech/starbound/suits/rad.png b/tech/starbound/suits/rad.png index afef0e67..76e11552 100644 Binary files a/tech/starbound/suits/rad.png and b/tech/starbound/suits/rad.png differ diff --git a/tech/starbound/suits/radprotection.statuseffect b/tech/starbound/suits/radprotection.statuseffect index 1bd4d06e..24c090ad 100644 --- a/tech/starbound/suits/radprotection.statuseffect +++ b/tech/starbound/suits/radprotection.statuseffect @@ -1,11 +1,17 @@ { - "name" : "sb_radiationprotectiontech", - "effectConfig" : { "statModifierGroup" : [ - {"stat":"biomeradiationImmunity","amount":1}, - {"stat":"poisonResistance","amount":0.25} - ]}, - "defaultDuration" : 5, - "scripts" : ["suit.lua"], - "label" : "Radiation Protection", - "icon" : "rad.png" + "name": "sb_radiationprotectiontech", + "effectConfig": { + "statModifierGroup": [{ + "stat": "biomeradiationImmunity", + "amount": 1 + }, { + "stat": "poisonResistance", + "amount": 0.25 + } + ] + }, + "defaultDuration": 5, + "scripts": ["suit.lua"], + "label": "Radiation Protection", + "icon": "rad.png" } diff --git a/tech/starbound/suits/radprotection.tech b/tech/starbound/suits/radprotection.tech index fa4c2f8e..03f1a799 100644 --- a/tech/starbound/suits/radprotection.tech +++ b/tech/starbound/suits/radprotection.tech @@ -1,14 +1,14 @@ { - "name" : "sb_radiationprotection", - "type" : "head", - "icon" : "/tech/starbound/rad.png", - "scripts" : [], -//"sb_effect" : [{"stat":"biomeradiationImmunity","amount":1}], - "sb_effect" : "sb_radiationprotectiontech", - "sb_suitImage" : "?replace;73daff=fffa64;27abff=ffd429;117ee4=e2b61a;1f45d4=ba7e17;002b72=131313;001522=000", - "rarity" : "Legendary", - "tooltipKind" : "sb_object4", - "chipCost" : 8, - "description" : "Protects the wearer from the deadly radiation found on certain planets and provides poison resistance.", - "shortDescription" : "Radiation Protection" -} \ No newline at end of file + "name": "sb_radiationprotection", + "type": "head", + "icon": "/tech/starbound/rad.png", + "scripts": [], + //"sb_effect" : [{"stat":"biomeradiationImmunity","amount":1}], + "sb_effect": "sb_radiationprotectiontech", + "sb_suitImage": "?replace;73daff=fffa64;27abff=ffd429;117ee4=e2b61a;1f45d4=ba7e17;002b72=131313;001522=000", + "rarity": "Legendary", + "tooltipKind": "sb_object4", + "chipCost": 8, + "description": "Protects the wearer from the deadly radiation found on certain planets and provides poison resistance.", + "shortDescription": "Radiation Protection" +} diff --git a/tech/starbound/superjump/rocketjump.animation b/tech/starbound/superjump/rocketjump.animation index 1f263824..a4a97537 100644 --- a/tech/starbound/superjump/rocketjump.animation +++ b/tech/starbound/superjump/rocketjump.animation @@ -1,13 +1,13 @@ { - "animatedParts" : { - "stateTypes" : { - "jumping" : { - "default" : "off", - "states" : { - "off" : {}, - "on" : { - "properties" : { - "persistentSound" : "/sfx/tools/teleport_up.ogg" + "animatedParts": { + "stateTypes": { + "jumping": { + "default": "off", + "states": { + "off": {}, + "on": { + "properties": { + "persistentSound": "/sfx/tools/teleport_up.ogg" } } } @@ -15,39 +15,56 @@ } }, - "particleEmitters" : { - "jumpParticles" : { - "emissionRate" : 40, - "particles" : [ - { - "particle" : "dash", - "flip" : true + "particleEmitters": { + "jumpParticles": { + "emissionRate": 40, + "particles": [{ + "particle": "dash", + "flip": true } ] }, - "rocketParticles" : { - "emissionRate" : 50, - "particles" : [ - {"particle":"jetboots2","offset":[-0.15,0]}, - {"particle":"jetboots","offset":[-0.15,0]}, - {"particle":"jetboots3","offset":[-0.15,0]}, - {"particle":"jetboots2","offset":[0.15,0]}, - {"particle":"jetboots","offset":[0.15,0]}, - {"particle":"jetboots3","offset":[0.15,0]} + "rocketParticles": { + "emissionRate": 50, + "particles": [{ + "particle": "jetboots2", + "offset": [-0.15, 0] + }, { + "particle": "jetboots", + "offset": [-0.15, 0] + }, { + "particle": "jetboots3", + "offset": [-0.15, 0] + }, { + "particle": "jetboots2", + "offset": [0.15, 0] + }, { + "particle": "jetboots", + "offset": [0.15, 0] + }, { + "particle": "jetboots3", + "offset": [0.15, 0] + } ] }, - "chargedParticles" : { - "emissionRate" : 20, - "particles" : [ - {"particle":"jumpboost","offset":[-0.15,0]}, - {"particle":"jetboots2","offset":[0.15,0]}, - {"particle":"jetboots3","offset":[0,0.15]} + "chargedParticles": { + "emissionRate": 20, + "particles": [{ + "particle": "jumpboost", + "offset": [-0.15, 0] + }, { + "particle": "jetboots2", + "offset": [0.15, 0] + }, { + "particle": "jetboots3", + "offset": [0, 0.15] + } ] } }, - "sounds" : { - "charge" : ["/sfx/gun/dragonhead_charge1.ogg"], - "jumpSound" : ["/sfx/tech/tech_rocketjump_release.ogg"] + "sounds": { + "charge": ["/sfx/gun/dragonhead_charge1.ogg"], + "jumpSound": ["/sfx/tech/tech_rocketjump_release.ogg"] } -} \ No newline at end of file +} diff --git a/tech/starbound/superjump/rocketjump.tech b/tech/starbound/superjump/rocketjump.tech index ae295ba8..ca1d2b45 100644 --- a/tech/starbound/superjump/rocketjump.tech +++ b/tech/starbound/superjump/rocketjump.tech @@ -1,21 +1,21 @@ { - "name" : "sb_rocketjump", - "type" : "legs", + "name": "sb_rocketjump", + "type": "legs", - "rarity" : "Legendary", - "icon" : "/tech/starbound/rocketjump.png", - "description" : "Hold ^#0f0;[SPACE]^reset; to charge a rocket-boosted leap! Unleash with ^#0f0;[W]^reset;.", - "sb_briefDescription" : "Hold ^#0f0;[SPACE]^reset; to charge a boosted leap! Unleash with ^#0f0;[W]^reset;.", - "sb_longDescription" : "Watch out for fall damage!", - "shortDescription" : "Charge Jump", - "chipCost" : 12, + "rarity": "Legendary", + "icon": "/tech/starbound/rocketjump.png", + "description": "Hold ^#0f0;[SPACE]^reset; to charge a rocket-boosted leap! Unleash with ^#0f0;[W]^reset;.", + "sb_briefDescription": "Hold ^#0f0;[SPACE]^reset; to charge a boosted leap! Unleash with ^#0f0;[W]^reset;.", + "sb_longDescription": "Watch out for fall damage!", + "shortDescription": "Charge Jump", + "chipCost": 12, - "scripts" : ["superjump.lua"], - "animator" : "rocketjump.animation", + "scripts": ["superjump.lua"], + "animator": "rocketjump.animation", - "energyUsage" : 26, - "superjumpSpeed" : 250, - "superjumpControlForce" : 900, - "superjumpTime" : 0.13, - "superJumpMaxCharge" : 10 -} \ No newline at end of file + "energyUsage": 26, + "superjumpSpeed": 250, + "superjumpControlForce": 900, + "superjumpTime": 0.13, + "superJumpMaxCharge": 10 +} diff --git a/tech/starbound/tank.png b/tech/starbound/tank.png index 06bae5de..b96559d8 100644 Binary files a/tech/starbound/tank.png and b/tech/starbound/tank.png differ diff --git a/tech/starbound/tech.activeitem b/tech/starbound/tech.activeitem index 3c22d5fd..16ae94b7 100644 --- a/tech/starbound/tech.activeitem +++ b/tech/starbound/tech.activeitem @@ -1,13 +1,14 @@ { - "itemName" : "sb_tech", - "price" : 5000, - "tooltipKind" : "sb_object", - "tooltipFields" : {"rarityLabel":""}, - "category" : "tech", - "subtitle" : "Tech (%s)", - "techModule" : "", - "description" : "This tech drive needs to have a description set.", - "shortdescription" : "Tech Drive", - "scripts" : ["tech.lua"], - "builder" : "/items/buildscripts/starbound/buildtech.lua" -} \ No newline at end of file + "itemName": "sb_tech", + "price": 1250, + "tooltipKind": "sb_object", + "tooltipFields": { + "rarityLabel": "" + }, + "category": "tech", + "subtitle": "Tech (%s)", + "description": "", + "shortdescription": "", + "scripts": ["tech.lua"], + "builder": "/items/buildscripts/starbound/buildtech.lua" +} diff --git a/tech/starbound/tech.lua b/tech/starbound/tech.lua index 3cca85c6..2f111d97 100644 --- a/tech/starbound/tech.lua +++ b/tech/starbound/tech.lua @@ -9,29 +9,30 @@ function init() swingInit() sb_cursor("power") sb_techType() suit = root.techType(tech) == "Suit" end -function swingAction() animateSwing() +function swingAction() if root.hasTech(tech) then if suit and not ownsSuit() then unlockSuit() elseif not suit and not ownsTech() then unlockTech() else - sb_uiMessage(2) + sb_uiMessage("techKnown") end - else sb_uiMessage(3) + else + sb_uiMessage("techFail") end end function unlockTech() player.makeTechAvailable(tech) player.enableTech(tech) - sb_uiMessage(1) + sb_uiMessage("newTech") item.consume(1) end function unlockSuit() if not conditions(root.techConfig(tech).sb_conditions) then - sb_uiMessage(3) + sb_uiMessage("techFail") sb.logWarn("[BETABOUND] Player attempted to learn a tech but its mod conditions have not been met: "..tech) return end @@ -42,7 +43,7 @@ function unlockSuit() suits[#suits+1] = tech player.setProperty("sb_bioimplants",suits) end - sb_uiMessage(1) + sb_uiMessage("newTech") item.consume(1) end diff --git a/tech/starbound/unscripted/berserk.statuseffect b/tech/starbound/unscripted/berserk.statuseffect index a4edde2f..edf173be 100644 --- a/tech/starbound/unscripted/berserk.statuseffect +++ b/tech/starbound/unscripted/berserk.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_berserk", - "defaultDuration" : 1, - "label" : "Berserker", - "icon" : "/tech/starbound/berserk.png" -} \ No newline at end of file + "name": "sb_berserk", + "defaultDuration": 1, + "label": "Berserker", + "icon": "/tech/starbound/berserk.png" +} diff --git a/tech/starbound/unscripted/energy.statuseffect b/tech/starbound/unscripted/energy.statuseffect index 9c45e20e..6177be2e 100644 --- a/tech/starbound/unscripted/energy.statuseffect +++ b/tech/starbound/unscripted/energy.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_energytech", - "defaultDuration" : 5, - "label" : "Energy+", - "icon" : "/tech/starbound/energy.png" -} \ No newline at end of file + "name": "sb_energytech", + "defaultDuration": 5, + "label": "Energy+", + "icon": "/tech/starbound/energy.png" +} diff --git a/tech/starbound/unscripted/glow.statuseffect b/tech/starbound/unscripted/glow.statuseffect index 897602e3..40a98824 100644 --- a/tech/starbound/unscripted/glow.statuseffect +++ b/tech/starbound/unscripted/glow.statuseffect @@ -1,7 +1,7 @@ { - "name" : "sb_glowtech", - "defaultDuration" : 5, - "animationConfig" : "glow.animation", - "label" : "Glowing", - "icon" : "/tech/starbound/glow.png" + "name": "sb_glowtech", + "defaultDuration": 5, + "animationConfig": "glow.animation", + "label": "Glowing", + "icon": "/tech/starbound/glow.png" } diff --git a/tech/starbound/unscripted/glow.tech b/tech/starbound/unscripted/glow.tech index 07df676d..b0f3c202 100644 --- a/tech/starbound/unscripted/glow.tech +++ b/tech/starbound/unscripted/glow.tech @@ -1,11 +1,11 @@ { - "name" : "sb_glow", - "type" : "head", - "icon" : "/tech/starbound/glow.png", - "scripts" : [], - "sb_effect" : "sb_glowtech", - "sb_suitImage" : "?replace;73daff=ffffe6;27abff=ffffc7;117ee4=fff03f;1f45d4=c9be06;002b72=A19320;001522=625800", - "rarity" : "Rare", - "description" : "Provides the wearer with a strong light.", - "shortDescription" : "Glow" -} \ No newline at end of file + "name": "sb_glow", + "type": "head", + "icon": "/tech/starbound/glow.png", + "scripts": [], + "sb_effect": "sb_glowtech", + "sb_suitImage": "?replace;73daff=ffffe6;27abff=ffffc7;117ee4=fff03f;1f45d4=c9be06;002b72=A19320;001522=625800", + "rarity": "Rare", + "description": "Provides the wearer with a strong light.", + "shortDescription": "Glow" +} diff --git a/tech/starbound/unscripted/grit.statuseffect b/tech/starbound/unscripted/grit.statuseffect index 0fba66cc..9c59a24f 100644 --- a/tech/starbound/unscripted/grit.statuseffect +++ b/tech/starbound/unscripted/grit.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_grittech", - "defaultDuration" : 1, - "label" : "Grit+", - "icon" : "/tech/starbound/grit.png" -} \ No newline at end of file + "name": "sb_grittech", + "defaultDuration": 1, + "label": "Grit+", + "icon": "/tech/starbound/grit.png" +} diff --git a/tech/starbound/unscripted/health.statuseffect b/tech/starbound/unscripted/health.statuseffect index 9f97605c..41e36070 100644 --- a/tech/starbound/unscripted/health.statuseffect +++ b/tech/starbound/unscripted/health.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_healthtech", - "defaultDuration" : 5, - "label" : "Health+", - "icon" : "/tech/starbound/health.png" + "name": "sb_healthtech", + "defaultDuration": 5, + "label": "Health+", + "icon": "/tech/starbound/health.png" } diff --git a/tech/starbound/unscripted/protection.statuseffect b/tech/starbound/unscripted/protection.statuseffect index f16c1171..4bc002b4 100644 --- a/tech/starbound/unscripted/protection.statuseffect +++ b/tech/starbound/unscripted/protection.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_protectiontech", - "defaultDuration" : 1, - "label" : "Protection+", - "icon" : "/tech/starbound/protection.png" -} \ No newline at end of file + "name": "sb_protectiontech", + "defaultDuration": 1, + "label": "Protection+", + "icon": "/tech/starbound/protection.png" +} diff --git a/tech/starbound/unscripted/reducefalldamage.png b/tech/starbound/unscripted/reducefalldamage.png index 8e42dd6d..24ce728f 100644 Binary files a/tech/starbound/unscripted/reducefalldamage.png and b/tech/starbound/unscripted/reducefalldamage.png differ diff --git a/tech/starbound/unscripted/reducefalldamage.statuseffect b/tech/starbound/unscripted/reducefalldamage.statuseffect index 7aa25264..0c26cdb1 100644 --- a/tech/starbound/unscripted/reducefalldamage.statuseffect +++ b/tech/starbound/unscripted/reducefalldamage.statuseffect @@ -1,6 +1,6 @@ { - "name" : "sb_reducefalldamagetech", - "defaultDuration" : 5, - "label" : "Fall Dampener", - "icon" : "reducefalldamage.png" -} \ No newline at end of file + "name": "sb_reducefalldamagetech", + "defaultDuration": 5, + "label": "Fall Dampener", + "icon": "reducefalldamage.png" +} diff --git a/tech/starbound/vamp.png b/tech/starbound/vamp.png index 3884aa42..06a87405 100644 Binary files a/tech/starbound/vamp.png and b/tech/starbound/vamp.png differ diff --git a/tech/starbound/vehicle.lua b/tech/starbound/vehicle.lua index f56ca46b..0f114835 100644 --- a/tech/starbound/vehicle.lua +++ b/tech/starbound/vehicle.lua @@ -69,7 +69,7 @@ end function update(args) local currentInput = input(args) for i = 1, polySize do world.debugText("^shadow;"..i,{entity.position()[1]+mechCustomMovementParameters.collisionPoly[i][1],entity.position()[2]+mechCustomMovementParameters.collisionPoly[i][2]},"green") end - if not active and not status.statPositive("activeMovementAbilities") and currentInput == "mechActivate" and not mcontroller.zeroG() then + if not active and not status.statPositive("activeMovementAbilities") and currentInput == "mechActivate" and not mcontroller.zeroG() and not tech.parentLounging() then mechCollisionTest = config.getParameter("mechCollisionTest") local entityPosition = entity.position() mechCollisionTest[1] = mechCollisionTest[1] + entityPosition[1] @@ -90,7 +90,7 @@ function update(args) else -- animator.playSound("fail") end - elseif active and (currentInput == "mechDeactivate") then + elseif active and ((currentInput == "mechDeactivate") or tech.parentLounging()) then uninit() end diff --git a/terrestrial_worlds.config.patch b/terrestrial_worlds.config.patch index 07d8b1c0..42a136ec 100644 --- a/terrestrial_worlds.config.patch +++ b/terrestrial_worlds.config.patch @@ -1,6 +1,5 @@ [ - - +//add bunker [{"op":"add","path":"/planetTypes/forest/layers/surface/dungeons/-","value":[1,"sb_humanbunker"]}], [{"op":"add","path":"/planetTypes/desert/layers/surface/dungeons/-","value":[1,"sb_humanbunker"]}], [{"op":"add","path":"/planetTypes/savannah/layers/surface/dungeons/-","value":[1,"sb_humanbunker"]}], @@ -12,6 +11,7 @@ [{"op":"add","path":"/planetTypes/midnight/layers/surface/dungeons/-","value":[1,"sb_humanbunker"]}], [{"op":"add","path":"/planetTypes/scorchedcity/layers/surface/dungeons/-","value":[1,"sb_humanbunker"]}], + [{"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 @@ -27,35 +27,101 @@ ,[{"op":"add","path":"/regionTypes/deepunderground/subRegion/-","value":"sb_heck"}] ,[{"op":"add","path":"/regionTypes/deepunderground/subRegion/-","value":"sb_coralcave"}] ,[{"op":"add","path":"/regionTypes/deepunderground/subRegion/-","value":"sb_crystalcave"}] +//,[{"op":"add","path":"/regionTypes/deepunderground/subRegion/-","value":"sb_sulphur"}], //MAKE BIOMES - ,[{"op":"add","path":"/regionTypes/sb_crystalline","value":{"biome":[[0,["sb_crystalline"]]],"caveLiquid":["lava"], - "blockSelector":["remixedMildSurface"],"fgCaveSelector":["surfaceCaves"],"subRegion":[],"bgCaveSelector":["empty"]}}] - - ,[{"op":"add","path":"/regionTypes/sb_rust","value":{"biome":[[0,["sb_rust"]]], - "blockSelector":["remixedMildSurface"],"fgCaveSelector":["surfaceCaves"],"subRegion":[],"bgCaveSelector":["empty"]}}] - - ,[{"op":"add","path":"/regionTypes/sb_heck","value":{"biome":[[0,["sb_heck"]]], - "fgCaveSelector":["sb_heck"],"fgOreSelector":["richVeins"],"bgOreSelector":["richVeins"], - "caveLiquid": ["water"],"caveLiquidSeedDensityRange":[1,2]}}] - - - ,[{"op": "add","path":"/regionTypes/sb_coralcave","value":{"biome":[[0,["sb_coralcave"]]], - "fgCaveSelector":["normalCaves"],"fgOreSelector":["normalVeins"],"bgOreSelector":["normalVeins"], - "caveLiquid": ["tarliquid"],"caveLiquidSeedDensityRange":[1,2]}}] - - ,[{"op": "add","path":"/regionTypes/sb_crystalcave","value":{"biome":[[0,["sb_crystalcave"]]], - "fgCaveSelector":["normalCaves"],"fgOreSelector":["normalVeins"],"bgOreSelector":["normalVeins"], - "caveLiquid": ["lava"],"caveLiquidSeedDensityRange":[1,2]}}] - + ,[{ + "op": "add", + "path": "/regionTypes/sb_crystalline", + "value": { + "biome": [[0, ["sb_crystalline"]]], + "caveLiquid": ["lava"], + "blockSelector": ["remixedMildSurface"], + "fgCaveSelector": ["surfaceCaves"], + "subRegion": [], + "bgCaveSelector": ["empty"] + } + } + ] + ,[{ + "op": "add", + "path": "/regionTypes/sb_rust", + "value": { + "biome": [[0, ["sb_rust"]]], + "blockSelector": ["remixedMildSurface"], + "fgCaveSelector": ["surfaceCaves"], + "subRegion": [], + "bgCaveSelector": ["empty"] + } + } + ], + +//underground + [{ + "op": "add", + "path": "/regionTypes/sb_heck", + "value": { + "biome": [[0, ["sb_heck"]]], + "fgCaveSelector": ["sb_heck"], + "fgOreSelector": ["richVeins"], + "bgOreSelector": ["richVeins"], + "caveLiquid": ["sb_tentaclejuice"], + "caveLiquidSeedDensityRange": [1, 2] + } + } + ] + ,[{ + "op": "add", + "path": "/regionTypes/sb_coralcave", + "value": { + "biome": [[0, ["sb_coralcave"]]], + "fgCaveSelector": ["normalCaves"], + "fgOreSelector": ["normalVeins"], + "bgOreSelector": ["normalVeins"], + "caveLiquid": ["tarliquid"], + "caveLiquidSeedDensityRange": [1, 2] + } + } + ] + ,[{ + "op": "add", + "path": "/regionTypes/sb_crystalcave", + "value": { + "biome": [[0, ["sb_crystalcave"]]], + "fgCaveSelector": ["normalCaves"], + "fgOreSelector": ["normalVeins"], + "bgOreSelector": ["normalVeins"], + "caveLiquid": ["lava"], + "caveLiquidSeedDensityRange": [1, 2] + } + } + ] + ,[{ + "op": "add", + "path": "/regionTypes/sb_sulphur", + "value": { + "biome": [[0, ["sb_sulphur"]]], + "fgCaveSelector": ["normalCaves"], + "fgOreSelector": ["normalVeins"], + "bgOreSelector": ["normalVeins"], + "caveLiquid": ["lava"], + "caveLiquidSeedDensityRange": [1, 2] + } + } + ] + +//change vanilla biomes ,[{"op":"test","path":"/regionTypes/eyepatch/caveLiquid","inverse":true}],[{"op":"add","path":"/regionTypes/eyepatch/caveLiquid","value":[]}] ,[{"op":"add","path":"/regionTypes/eyepatch/caveLiquid/-","value":"sb_tentaclejuice"}] ,[{"op":"test","path":"/regionTypes/flesh/caveLiquid","inverse":true}],[{"op":"add","path":"/regionTypes/flesh/caveLiquid","value":[]}] ,[{"op":"add","path":"/regionTypes/flesh/caveLiquid/-","value":"sb_tentaclejuice"}] +,[{"op":"test","path":"/regionTypes/fleshcaves/caveLiquid","inverse":true}],[{"op":"add","path":"/regionTypes/fleshcaves/caveLiquid","value":[]}] +,[{"op":"add","path":"/regionTypes/fleshcaves/caveLiquid/-","value":"sb_tentaclejuice"}] + ,[{ "op": "add", "path": "/planetTypes/sb_tentacle", diff --git a/tiles/materials/outpost.material.patch b/tiles/materials/outpost.material.patch index 403410ff..1c9c6782 100644 --- a/tiles/materials/outpost.material.patch +++ b/tiles/materials/outpost.material.patch @@ -1 +1 @@ -[{"op":"replace","path":"/renderTemplate","value":"/tiles/sb_pipetemplate.config"},{"op":"replace","path":"/renderParameters/texture","value":"sb_outpost.png"}] \ No newline at end of file +[{"op":"replace","path":"/renderTemplate","value":"/tiles/sb_pipetemplate.config"}] \ No newline at end of file diff --git a/tiles/materials/outposthorizontal.png b/tiles/materials/outposthorizontal.png new file mode 100644 index 00000000..fed30c86 Binary files /dev/null and b/tiles/materials/outposthorizontal.png differ diff --git a/tiles/materials/sb_brains.png b/tiles/materials/sb_brains.png index 85033123..4e6a2b20 100644 Binary files a/tiles/materials/sb_brains.png and b/tiles/materials/sb_brains.png differ diff --git a/tiles/materials/sb_chain.png b/tiles/materials/sb_chain.png index 56c27cbd..633a0458 100644 Binary files a/tiles/materials/sb_chain.png and b/tiles/materials/sb_chain.png differ diff --git a/tiles/materials/sb_concrete.png b/tiles/materials/sb_concrete.png index a264cb1f..5c32f771 100644 Binary files a/tiles/materials/sb_concrete.png and b/tiles/materials/sb_concrete.png differ diff --git a/tiles/materials/sb_hive.png b/tiles/materials/sb_hive.png index d5e30403..b0cb3eff 100644 Binary files a/tiles/materials/sb_hive.png and b/tiles/materials/sb_hive.png differ diff --git a/tiles/materials/sb_outpost.png b/tiles/materials/sb_outpost.png deleted file mode 100644 index dbdec931..00000000 Binary files a/tiles/materials/sb_outpost.png and /dev/null differ diff --git a/tiles/mods/platinum.png b/tiles/mods/platinum.png index 74bbf78f..21a3405d 100644 Binary files a/tiles/mods/platinum.png and b/tiles/mods/platinum.png differ diff --git a/tiles/mods/plutonium.png b/tiles/mods/plutonium.png index 3c876524..bde58edc 100644 Binary files a/tiles/mods/plutonium.png and b/tiles/mods/plutonium.png differ diff --git a/tiles/mods/sb_cerulium.png b/tiles/mods/sb_cerulium.png index 1d8a0144..989d76dc 100644 Binary files a/tiles/mods/sb_cerulium.png and b/tiles/mods/sb_cerulium.png differ diff --git a/tiles/mods/sb_fossil.png b/tiles/mods/sb_fossil.png index 378fb986..4c1fc228 100644 Binary files a/tiles/mods/sb_fossil.png and b/tiles/mods/sb_fossil.png differ diff --git a/tiles/mods/sb_rubium.png b/tiles/mods/sb_rubium.png index 1d876647..a80cd74f 100644 Binary files a/tiles/mods/sb_rubium.png and b/tiles/mods/sb_rubium.png differ diff --git a/tiles/mods/sulphur.png b/tiles/mods/sulphur.png index 85f89c90..227e06b0 100644 Binary files a/tiles/mods/sulphur.png and b/tiles/mods/sulphur.png differ diff --git a/tiles/mods/uranium.png b/tiles/mods/uranium.png index c754e9d7..ca83280d 100644 Binary files a/tiles/mods/uranium.png and b/tiles/mods/uranium.png differ diff --git a/tiles/skyrail/skyrail_asc.png b/tiles/skyrail/skyrail_asc.png index 813fb7f8..dda5c5c1 100644 Binary files a/tiles/skyrail/skyrail_asc.png and b/tiles/skyrail/skyrail_asc.png differ diff --git a/tiles/skyrail/skyrail_boost.png b/tiles/skyrail/skyrail_boost.png index 39152fc6..033bd7e3 100644 Binary files a/tiles/skyrail/skyrail_boost.png and b/tiles/skyrail/skyrail_boost.png differ diff --git a/tiles/skyrail/skyrail_break.png b/tiles/skyrail/skyrail_break.png index a8aa5e96..b530b3ac 100644 Binary files a/tiles/skyrail/skyrail_break.png and b/tiles/skyrail/skyrail_break.png differ diff --git a/tiles/skyrail/skyrail_desc.png b/tiles/skyrail/skyrail_desc.png index e45442c1..511e305e 100644 Binary files a/tiles/skyrail/skyrail_desc.png and b/tiles/skyrail/skyrail_desc.png differ diff --git a/tiles/skyrail/skyrail_dioder.png b/tiles/skyrail/skyrail_dioder.png index 13ca4c5a..4cca4b5f 100644 Binary files a/tiles/skyrail/skyrail_dioder.png and b/tiles/skyrail/skyrail_dioder.png differ diff --git a/tiles/skyrail/skyrailplatform.png b/tiles/skyrail/skyrailplatform.png index 54575428..afbe2796 100644 Binary files a/tiles/skyrail/skyrailplatform.png and b/tiles/skyrail/skyrailplatform.png differ diff --git a/treasure/Missions/miningtreasure1.treasurepools.patch b/treasure/Missions/miningtreasure1.treasurepools.patch index 470a5ae9..71300d28 100644 --- a/treasure/Missions/miningtreasure1.treasurepools.patch +++ b/treasure/Missions/miningtreasure1.treasurepools.patch @@ -6,7 +6,7 @@ {"op":"add","path":"/miningtreasure/0/1/pool/-","value":{"weight":0.02,"item":"miningdoor-recipe"}}, {"op":"add","path":"/miningtreasure/0/1/pool/-","value":{"weight":0.02,"item":"miningverticaldoor-recipe"}}], -[{"op":"add","path":"/translator1Pool/0/1/fill/-","value":{"item":["sb_filledcrittercapturepod",1,{"projectileConfig":{"actionOnReap":[{"offset":[0,0],"type":"blackcat","arguments":{"damageTeamType":"friendly","wasRelocated":true},"action":"spawnmonster"},{"name":"sb_crittercapturepod","action":"item","offset":[0,0]}],"speed":40}}]}}], +[{"op":"add","path":"/translator1Pool/0/1/fill/-","value":{"item":["sb_filledcrittercapturepod",1,{"projectileConfig":{"actionOnReap":[{"offset":[0,0],"type":"blackcat","arguments":{"persistent":true,"damageTeamType":"friendly","wasRelocated":true},"action":"spawnmonster"},{"name":"capturepod","action":"item","offset":[0,0]}],"speed":40}}]}}], [{"op":"add","path":"/lunarbaseRare1/0/1/fill/-","value":{"pool":"miningtreasure"}},{"op":"add","path":"/lunarbaseRare1/0/1/fill/-","value":{"pool":"miningtreasure"}}], [{"op":"add","path":"/lunarbaseRare2/0/1/fill/-","value":{"pool":"miningtreasure"}},{"op":"add","path":"/lunarbaseRare2/0/1/fill/-","value":{"pool":"miningtreasure"}}], diff --git a/treasure/biome.treasurepools.patch b/treasure/biome.treasurepools.patch index 49df0889..7ffe78d7 100644 --- a/treasure/biome.treasurepools.patch +++ b/treasure/biome.treasurepools.patch @@ -34,6 +34,7 @@ // ================================ ,[{"op":"test","path":"/oceanTreasure/0/1/pool/0/item/0","value":"waterballoon"},{"op":"test","path":"/oceanTreasure/0/1/pool/0/weight","value":1.0},{"op":"replace","path":"/oceanTreasure/0/1/pool/0/weight","value":0.5}] ,[{"op":"add","path":"/oceanTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_watersword"}}] +,[{"op":"add","path":"/oceanTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_watersword-recipe"}}] ,[{"op":"add","path":"/oceanTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_oceantrident"}}] ,[{"op":"add","path":"/oceanTreasure/0/1/pool/-","value":{"weight":0.3,"item":"harpoongun"}}] ,[{"op":"add","path":"/oceanTreasure/0/1/pool/-","value":{"weight":0.3,"item":"harpoongun-recipe"}}] @@ -58,7 +59,9 @@ //,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.6,"item":["sb_corrosivegrenade",2]}}] ,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.5,"item":["sb_corrosivegrenade",5]}}] //4 ,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.2,"item":["sb_corrosivegrenade",6]}}] //5 +,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_corrosivegrenade-recipe"}}] ,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_corrosivegun"}}] +,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_corrosivegun-recipe"}}] ,[{"op":"add","path":"/alienTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_alienlaser"}}] @@ -95,7 +98,9 @@ // Mushroom // ================================ ,[{"op":"add","path":"/mushroomTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_mushroomsword"}}] +,[{"op":"add","path":"/mushroomTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_mushroomsword-recipe"}}] ,[{"op":"add","path":"/mushroomTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_mushroomsword2"}}] +,[{"op":"add","path":"/mushroomTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_mushroomsword2-recipe"}}] ,[{"op":"add","path":"/mushroomTreasure/0/1/pool/-","value":{"weight":0.3,"item":"mushroomshield-recipe"}}] ,[{"op":"add","path":"/mushroomTreasure/0/1/pool/-","value":{"weight":0.3,"item":"mushroomhead-recipe"}}] @@ -114,11 +119,13 @@ // ================================ ,[{"op":"test","path":"/oasisTreasure/0/1/pool/9/weight","value":0.01},{"op":"test","path":"/oasisTreasure/0/1/pool/9/item","value":"oasisbed"},{"op":"replace","path":"/oasisTreasure/0/1/pool/9/weight","value":0.3}] ,[{"op":"add","path":"/oasisTreasure/0/1/pool/-","value":{"weight":0.3,"item":"deckchair"}}] +,[{"op":"add","path":"/oasisTreasure/0/1/pool/-","value":{"weight":0.5,"item":["sb_throwingreed",5]}}] // ================================ // Tar // ================================ ,[{"op":"add","path":"/tarTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_tarhammer"}}] +,[{"op":"add","path":"/tarTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_tarhammer-recipe"}}] ,[{"op":"add","path":"/tarTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_sabertoothspear"}}] ,[{"op":"add","path":"/tarTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_sabertoothspear-recipe"}}] @@ -127,6 +134,7 @@ // ================================ ,[{"op":"add","path":"/rainbowTreasure/0/1/pool/-","value":{"weight":0.2,"item":"bubblegun"}}] ,[{"op":"add","path":"/rainbowTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_rainbowsword"}}] +,[{"op":"add","path":"/rainbowTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_rainbowsword-recipe"}}] ,[{"op":"add","path":"/rainbowTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_crayonred-recipe"}}] ,[{"op":"add","path":"/rainbowTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_crayonblue-recipe"}}] ,[{"op":"add","path":"/rainbowTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_crayonyellow-recipe"}}] @@ -147,6 +155,8 @@ ,[{"op":"add","path":"/boneTreasure/0/1/pool/-","value":{"weight":0.05,"item":["bonematerial",10]}}] //already in bone caves //,[{"op":"add","path":"/boneTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_bonesword"}}] ,[{"op":"add","path":"/boneTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_bonepistol"}}] +,[{"op":"add","path":"/boneTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_bonehammer"}}] +,[{"op":"add","path":"/boneTreasure/0/1/pool/-","value":{"weight":0.2,"item":"sb_bonehammer-recipe"}}] @@ -161,12 +171,9 @@ // ================================ // Bio Luminescent // ================================ -,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.5,"item":["sb_glowfibreorange",3]}}] -,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.5,"item":["sb_glowfibreyellow",3]}}] -,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.5,"item":["sb_glowfibreblue",3]}}] -,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.5,"item":["sb_glowfibregreen",3]}}] ,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_glowchest-recipe"}}] ,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_firesword"}}] +,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.3,"item":"sb_firesword-recipe"}}] ,[{"op":"add","path":"/bioluminescenceTreasure/0/1/pool/-","value":{"weight":0.3,"item":"lightbow-recipe"}}] //giant flower diff --git a/treasure/common.treasurepools.patch b/treasure/common.treasurepools.patch index db9a10f5..05b9dca9 100644 --- a/treasure/common.treasurepools.patch +++ b/treasure/common.treasurepools.patch @@ -126,15 +126,16 @@ [{"op":"add","path":"/thrownWeapon/0/1/pool/-","value":{"weight":0.40,"item":["sb_throwingneedle",20]}}], [{"op":"add","path":"/thrownWeapon/0/1/pool/-","value":{"weight":0.40,"item":["sb_cutterleaf",16]}}], - [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_handgrenade",3]}}], - [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_smokegrenade",3]}}], - [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_corrosivegrenade",3]}}], - [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_groundfirebomb",3]}}], + [{"op":"add","path":"/thrownWeapon/1/1/pool/-","value":{"weight":0.35,"item":["sb_handgrenade",3]}}], + [{"op":"add","path":"/thrownWeapon/1/1/pool/-","value":{"weight":0.35,"item":["sb_smokegrenade",3]}}], - [{"op":"add","path":"/thrownWeapon/3/1/pool/-","value":{"weight":0.35,"item":["sb_gasgrenade",3]}}], - [{"op":"add","path":"/thrownWeapon/3/1/pool/-","value":{"weight":0.35,"item":["sb_electrogrenade",3]}}], - [{"op":"add","path":"/thrownWeapon/3/1/pool/-","value":{"weight":0.35,"item":["sb_plasmagrenade",3]}}], + [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_groundfirebomb",3]}}], + [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_gasgrenade",3]}}], + [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_electrogrenade",3]}}], + [{"op":"add","path":"/thrownWeapon/2/1/pool/-","value":{"weight":0.35,"item":["sb_plasmagrenade",3]}}], + [{"op":"add","path":"/thrownWeapon/3/1/pool/-","value":{"weight":0.35,"item":["sb_corrosivegrenade",3]}}], + [{"op":"add","path":"/thrownWeapon/4/1/pool/-","value":{"weight":0.70,"item":["sb_shuriken",5]}}], [{"op":"add","path":"/thrownWeapon/5/1/pool/-","value":{"weight":0.70,"item":["sb_shuriken",10]}}], @@ -188,6 +189,7 @@ [{"op":"add","path":"/tool/0/1/pool/-","value":{"weight":0.02,"item":"sb_spawnertools"}}], [{"op":"add","path":"/tool/0/1/pool/-","value":{"weight":0.02,"item":"parasol"}}], + [{"op":"add","path":"/tool/0/1/pool/-","value":{"weight":0.02,"item":"broom"}}], [{"op":"add","path":"/tool/0/1/pool/-","value":{"weight":0.02,"item":"sb_watch"}}], [{"op":"add","path":"/tool/0/1/pool/-","value":{"weight":0.02,"item":"sb_hawkeyes"}}], [{"op":"add","path":"/tool/0/1/pool/-","value":{"weight":0.02,"item":"sb_light2energy"}}], @@ -212,7 +214,6 @@ [{"op":"add","path":"/seed/3/1/pool/-","value":{"weight":3,"item":["crystalplantseed",3]}}], //Rare Furniture - [{"op":"add","path":"/rarefurniture/0/1/pool/-","value":{"weight":0.03,"item":"sb_paintingesther"}}], //Instruments [{"op":"add","path":"/instrument/0/1/pool/-","value":{"weight":0.0007,"item":"keyboard"}}], @@ -229,7 +230,7 @@ [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"sb_techmasterlegs"}}], [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"adventurerobothead"}}], [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"adventurerobotchest"}}], - [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"adventurerobotlegs"}}], + [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"adventurerobotpants"}}], [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"sb_oddhead"}}], [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"sb_conehead"}}], [{"op":"add","path":"/costume/0/1/pool/-","value":{"weight":0.0003,"item":"sb_braincagehead"}}], @@ -254,6 +255,7 @@ [{"op":"add","path":"/produce/0/1/pool/-","value":{"weight":1,"item":"sb_rottenapple"}}], [{"op":"add","path":"/produce/0/1/pool/-","value":{"weight":1,"item":"sb_soylentgreen"}}], + [{"op":"add","path":"/produce/1/1/pool/-","value":{"weight":2,"item":["redapple",3]}}], [{"op":"add","path":"/produce/1/1/pool/-","value":{"weight":2,"item":["orange",3]}}], [{"op":"add","path":"/produce/1/1/pool/-","value":{"weight":1,"item":"sb_rawfleshlump"}}], @@ -269,6 +271,7 @@ [{"op":"add","path":"/produce/6/1/pool/-","value":{"weight":1,"item":"sb_soylentgreen"}}], [{"op":"add","path":"/produce/6/1/pool/-","value":{"weight":1,"item":"sb_rawfleshlump"}}], [{"op":"add","path":"/produce/6/1/pool/-","value":{"weight":3,"item":["sb_poisoncreep",3]}}], + [{"op":"add","path":"/produce/6/1/pool/-","value":{"weight":2,"item":["redapple",3]}}], [{"op":"add","path":"/produce/6/1/pool/-","value":{"weight":2,"item":["orange",3]}}], [{"op":"add","path":"/produce/6/1/pool/-","value":{"weight":2,"item":["crystalplant",3]}}], diff --git a/treasure/fishing.treasurepools.patch b/treasure/fishing.treasurepools.patch index a5b1ab26..da11f987 100644 --- a/treasure/fishing.treasurepools.patch +++ b/treasure/fishing.treasurepools.patch @@ -1,6 +1,6 @@ [ [{"op":"test","path":"/fishingcommon/0/1/pool"},{"op":"add","path":"/fishingcommon/0/1/pool/-","value":{"weight":0.97,"pool":"sb_fishingcommon"}}] ,[{"op":"test","path":"/fishinguncommon/0/1/pool"},{"op":"add","path":"/fishinguncommon/0/1/pool/-","value":{"weight":0.97,"pool":"sb_fishinguncommon"}}] -,[{"op":"test","path":"/fishingrare/0/1/pool"},{"op":"add","path":"/fishingrare/0/1/fill/-","value":{"item":["rewardbag",1,{"sb_useTechTier":true}]}}] -,[{"op":"test","path":"/fishinglegendary/0/1/pool"},{"op":"add","path":"/fishinglegendary/0/1/fill/-","value":{"item":["rewardbag",2,{"sb_useTechTier":true}]}}] +,[{"op":"test","path":"/fishingrare/0/1/fill"},{"op":"add","path":"/fishingrare/0/1/fill/-","value":{"item":["rewardbag",1,{"sb_useTechTier":true}]}}] +,[{"op":"test","path":"/fishinglegendary/0/1/fill"},{"op":"add","path":"/fishinglegendary/0/1/fill/-","value":{"item":["rewardbag",2,{"sb_useTechTier":true}]}}] ] \ No newline at end of file diff --git a/treasure/monster.treasurepools.patch b/treasure/monster.treasurepools.patch index e9929ffa..c139d5ae 100644 --- a/treasure/monster.treasurepools.patch +++ b/treasure/monster.treasurepools.patch @@ -8,9 +8,18 @@ //,{"op":"add","path":"/basicMonsterTreasure/0/1/pool/-","value":{"weight":0.89,"item":"alienmeat"}} //,{"op":"add","path":"/flyingMonsterTreasure/0/1/pool/-","value":{"weight":0.89,"item":"alienmeat"}} -,[{"op":"add","path":"/poptopTreasure/0/1/pool/-","value":{"weight":0.15,"pool":"sb_poptopMusic"}}] ,[{"op":"add","path":"/pogolemTreasure/0/1/pool/-","value":{"weight":0.5,"item":"poop"}}] +//Check if bone birds can roll to drop 0-3 bones, and if so, replace it to be 0-1 and add a chance for generic monster loot (ie: money), then replace the bone drop with a separate pool mimicing the old draw +,[{"op":"test","path":"/bonebirdTreasure/0/1/pool/0/item","value":"bone"}, +{"op":"test","path":"/bonebirdTreasure/0/1/poolRounds/3"}, + +{"op":"replace","path":"/bonebirdTreasure/0/1/poolRounds","value":[[0.2, 0],[0.8, 1]]}, +{"op":"remove","path":"/bonebirdTreasure/0/1/pool/0/item"}, +{"op":"add","path":"/bonebirdTreasure/0/1/pool/0/pool","value":"sb_bonebirdBones"}, +{"op":"add","path":"/bonebirdTreasure/0/1/pool/-","value":{"weight":1,"pool":"noMeatMonsterTreasure"}}] + +,[{"op":"add","path":"/poptopTreasure/0/1/pool/-","value":{"weight":0.15,"pool":"sb_poptopMusic"}}] ,[{"op":"add","path":"/poptopVaultTreasure/0/1/pool/-","value":{"weight":0.3,"pool":"sb_poptopMusic"}}] ,[{"op":"add","path":"/taroniTreasure/0/1/pool/-","value":{"weight":0.4,"item":"basic"}}] diff --git a/treasure/sb_biome.treasurepools b/treasure/sb_biome.treasurepools index 994f562f..a4d2878c 100644 --- a/treasure/sb_biome.treasurepools +++ b/treasure/sb_biome.treasurepools @@ -5,25 +5,22 @@ "sb_arcticChestTreasure": [ [1, { - "fill": [{ - "pool": "valuableTreasure" - } + "fill": [ + {"pool": "valuableTreasure"} ], - "pool": [{ - "weight": 0.5, - "pool": "basicTreasure" - }, { - "weight": 0.05, - "pool": "sb_arcticMusic" - }, { - "weight": 0.5, - "pool": "oceanTreasure" - }, { - "weight": 0.5, - "pool": "iceTreasure" - } + "pool": [ + {"weight": 0.5, "pool": "basicTreasure"}, + {"weight": 0.05, "pool": "sb_arcticMusic"}, + {"weight": 0.5, "pool": "oceanTreasure"}, + {"weight": 0.5, "pool": "iceTreasure"} + ], + "poolRounds": [ + [0.05, 1], + [0.40, 2], + [0.30, 3], + [0.15, 4], + [0.10, 5] ], - "poolRounds": [[0.05, 1], [0.40, 2], [0.30, 3], [0.15, 4], [0.10, 5]], "allowDuplication": false } ] @@ -35,25 +32,22 @@ "sb_arcticOceanFloorChestTreasure": [ [1, { - "fill": [{ - "pool": "valuableTreasure" - } + "fill": [ + {"pool": "valuableTreasure"} ], - "pool": [{ - "weight": 0.5, - "pool": "basicTreasure" - }, { - "weight": 0.05, - "pool": "sb_arcticMusic" - }, { - "weight": 0.5, - "pool": "oceanTreasure" - }, { - "weight": 0.5, - "pool": "iceTreasure" - } + "pool": [ + {"weight": 0.5, "pool": "basicTreasure"}, + {"weight": 0.05, "pool": "sb_arcticMusic"}, + {"weight": 0.5, "pool": "oceanTreasure"}, + {"weight": 0.5, "pool": "iceTreasure"} + ], + "poolRounds": [ + [0.05, 1], + [0.40, 2], + [0.30, 3], + [0.15, 4], + [0.10, 5] ], - "poolRounds": [[0.05, 1], [0.40, 2], [0.30, 3], [0.15, 4], [0.10, 5]], "allowDuplication": false } ] @@ -65,17 +59,12 @@ "sb_rustChestTreasure": [ [1, { - "fill": [{ - "pool": "valuableTreasure" - } + "fill": [ + {"pool": "valuableTreasure"} ], - "pool": [{ - "weight": 0.5, - "pool": "basicTreasure" - }, { - "weight": 0.5, - "pool": "sb_rustTreasure" - } + "pool": [ + {"weight": 0.5, "pool": "basicTreasure"}, + {"weight": 0.5, "pool": "sb_rustTreasure"} ], "poolRounds": [ [0.05, 1], @@ -91,28 +80,14 @@ "sb_rustTreasure": [ [1, { - "pool": [{ - "weight": 1, - "item": ["metallic", 20] - }, { - "weight": 0.3, - "item": "rustchair-recipe" - }, { - "weight": 0.3, - "item": "rustbed-recipe" - }, { - "weight": 0.3, - "item": "rustchest-recipe" - }, { - "weight": 0.3, - "item": "rustdoor-recipe" - }, { - "weight": 0.3, - "item": "rusttable-recipe" - }, { - "weight": 0.3, - "item": "sb_rustsword" - } + "pool": [ + {"weight": 1, "item": ["metallic", 20]}, + {"weight": 0.3, "item": "rustchair-recipe"}, + {"weight": 0.3, "item": "rustbed-recipe"}, + {"weight": 0.3, "item": "rustchest-recipe"}, + {"weight": 0.3, "item": "rustdoor-recipe"}, + {"weight": 0.3, "item": "rusttable-recipe"}, + {"weight": 0.3, "item": "sb_rustsword"} ] } ] @@ -124,17 +99,12 @@ "sb_heckChestTreasure": [ [1, { - "fill": [{ - "pool": "valuableTreasure" - } + "fill": [ + {"pool": "valuableTreasure"} ], - "pool": [{ - "weight": 0.5, - "pool": "basicTreasure" - }, { - "weight": 0.5, - "pool": "sb_heckTreasure" - } + "pool": [ + {"weight": 0.5, "pool": "basicTreasure"}, + {"weight": 0.5, "pool": "sb_heckTreasure"} ], "poolRounds": [ [0.05, 1], @@ -150,49 +120,22 @@ "sb_heckTreasure": [ [1, { - "pool": [{ - "weight": 1, - "item": "sb_fleshstaff" - }, { - "weight": 1, - "item": ["sb_meatchunks", 6] - }, { - "weight": 0.05, - "item": "bonewingsback" - }, { - "weight": 0.05, - "item": "goathead" - }, { - "weight": 0.2, - "item": "alienmeat" - }, { - "weight": 0.2, - "item": "alienmeat" - }, { - "weight": 0.2, - "item": ["bone", 4] - }, { - "weight": 0.04, - "item": "sb_splatterknife" - }, { - "weight": 0.03, - "item": "sb_splatterknife-recipe" - }, { - "weight": 0.04, - "item": "sb_gutterknife" - }, - // {"weight" : 0.04, "item" : "sb_heartstringbow"}, - { - "weight": 0.04, - "item": "sb_boneassault" - }, { - "weight": 0.04, - "item": "sb_boneshotgun" - }, { - "weight": 0.04, - "item": "sb_bonepistol" - } //, - // {"weight" : 0.03, "item" : "sb_anklegrinder"} + "pool": [ + {"weight": 1, "item": "sb_fleshstaff"}, + {"weight": 1, "item": ["sb_meatchunks", 6]}, + {"weight": 0.05, "item": "bonewingsback"}, + {"weight": 0.05, "item": "goathead"}, + {"weight": 0.2, "item": "alienmeat"}, + {"weight": 0.2, "item": "alienmeat"}, + {"weight": 0.2, "item": ["bone", 4]}, + {"weight": 0.04, "item": "sb_splatterknife"}, + {"weight": 0.03, "item": "sb_splatterknife-recipe"}, + {"weight": 0.04, "item": "sb_gutterknife"}, +// {"weight" : 0.04, "item" : "sb_heartstringbow"}, + {"weight": 0.04, "item": "sb_bonerifle"}, + {"weight": 0.04, "item": "sb_boneshotgun"}, + {"weight": 0.04, "item": "sb_bonepistol"} +// {"weight" : 0.03, "item" : "sb_anklegrinder"} ] } ] @@ -203,17 +146,12 @@ "sb_coralcaveChestTreasure": [ [1, { - "fill": [{ - "pool": "valuableTreasure" - } + "fill": [ + {"pool": "valuableTreasure"} ], - "pool": [{ - "weight": 0.5, - "pool": "basicTreasure" - }, { - "weight": 0.5, - "pool": "sb_coralcaveTreasure" - } + "pool": [ + {"weight": 0.5, "pool": "basicTreasure"}, + {"weight": 0.5, "pool": "sb_coralcaveTreasure"} ], "poolRounds": [ [0.05, 1], @@ -229,28 +167,14 @@ "sb_coralcaveTreasure": [ [1, { - "pool": [{ - "weight": 1, - "item": ["coralfragment", 6] - }, { - "weight": 0.2, - "item": ["wheat", 6] - }, { - "weight": 0.2, - "item": ["carrot", 3] - }, { - "weight": 0.08, - "item": ["carrotseed", 3] - }, { - "weight": 0.04, - "item": "sb_coralcleaver" - }, { - "weight": 0.04, - "item": "sb_heatcleaver" - }, { - "weight": 0.04, - "item": "mininglantern" - } + "pool": [ + {"weight": 1, "item": ["coralfragment", 6]}, + {"weight": 0.2, "item": ["wheat", 6]}, + {"weight": 0.2, "item": ["carrot", 3]}, + {"weight": 0.08,"item": ["carrotseed", 3]}, + {"weight": 0.04, "item": "sb_coralcleaver" }, + {"weight": 0.04, "item": "sb_heatcleaver"}, + {"weight": 0.04, "item": "mininglantern"} ] } ] @@ -261,17 +185,12 @@ "sb_geometricChestTreasure": [ [1, { - "fill": [{ - "pool": "valuableTreasure" - } + "fill": [ + {"pool": "valuableTreasure"} ], - "pool": [{ - "weight": 0.5, - "pool": "basicTreasure" - }, { - "weight": 0.5, - "pool": "geometricTreasure" - } + "pool": [ + {"weight": 0.5, "pool": "basicTreasure"}, + {"weight": 0.5, "pool": "geometricTreasure"} ], "poolRounds": [[0.05, 1], [0.40, 2], [0.30, 3], [0.15, 4], [0.10, 5]], "allowDuplication": false diff --git a/treasure/sb_blueprints.treasurepools b/treasure/sb_blueprints.treasurepools index d43cd41d..2b5117a0 100644 --- a/treasure/sb_blueprints.treasurepools +++ b/treasure/sb_blueprints.treasurepools @@ -2,26 +2,26 @@ "sb_avianBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_poachedavesmingo-recipe"} - ,{"weight" : 0.1, "item" : "sb_crowncake-recipe"} - ,{"weight" : 0.1, "item" : "sb_cordialglass-recipe"} - ,{"weight" : 0.1, "item" : "sb_cordialbottle-recipe"} - ,{"weight" : 0.1, "item" : "sb_wartjuice-recipe"} - ,{"weight" : 0.1, "item" : "sb_wartwine-recipe"} - ,{"weight" : 0.1, "item" : "sb_pussplumpie-recipe"} - ,{"weight" : 0.1, "item" : "sb_candiedpearlpeas-recipe"} - ,{"weight" : 0.1, "item" : "sb_ricevinegar-recipe"} - ,{"weight" : 0.1, "item" : "sb_rootpopbottle-recipe"} - ,{"weight" : 0.1, "item" : "sb_rootpopflask-recipe"} - ,{"weight" : 0.1, "item" : "sb_curriedbeakseed-recipe"} - ,{"weight" : 0.1, "item" : "sb_wineglass-recipe"} - ,{"weight" : 0.1, "item" : "sb_winebottle-recipe"} + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_poachedavesmingo-recipe"}, + {"weight" : 0.1, "item" : "sb_crowncake-recipe"}, + {"weight" : 0.1, "item" : "sb_cordialglass-recipe"}, + {"weight" : 0.1, "item" : "sb_cordialbottle-recipe"}, + {"weight" : 0.1, "item" : "sb_wartjuice-recipe"}, + {"weight" : 0.1, "item" : "sb_wartwine-recipe"}, + {"weight" : 0.1, "item" : "sb_pussplumpie-recipe"}, + {"weight" : 0.1, "item" : "sb_candiedpearlpeas-recipe"}, + {"weight" : 0.1, "item" : "sb_ricevinegar-recipe"}, + {"weight" : 0.1, "item" : "sb_rootpopbottle-recipe"}, + {"weight" : 0.1, "item" : "sb_rootpopflask-recipe"}, + {"weight" : 0.1, "item" : "sb_curriedbeakseed-recipe"}, + {"weight" : 0.1, "item" : "sb_wineglass-recipe"}, + {"weight" : 0.1, "item" : "sb_winebottle-recipe"} ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] @@ -30,18 +30,18 @@ "sb_glitchBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_blackcurrentcrumble-recipe"} - ,{"weight" : 0.1, "item" : "sb_copperkeypie-recipe"} - ,{"weight" : 0.1, "item" : "sb_sweettime-recipe"} - ,{"weight" : 0.1, "item" : "sb_corntent-recipe"} - ,{"weight" : 0.1, "item" : "sb_batteryacid-recipe"} - ,{"weight" : 0.1, "item" : "sb_boltedmilk-recipe"} - ], + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_blackcurrentcrumble-recipe"}, + {"weight" : 0.1, "item" : "sb_copperkeypie-recipe"}, + {"weight" : 0.1, "item" : "sb_sweettime-recipe"}, + {"weight" : 0.1, "item" : "sb_corntent-recipe"}, + {"weight" : 0.1, "item" : "sb_batteryacid-recipe"}, + {"weight" : 0.1, "item" : "sb_boltedmilk-recipe"} + ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] @@ -50,25 +50,24 @@ "sb_humanBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_applepie-recipe"} - ,{"weight" : 0.1, "item" : "sb_candy-recipe"} - ,{"weight" : 0.1, "item" : "sb_icecream-recipe"} - ,{"weight" : 0.1, "item" : "sb_lollypop-recipe"} - ,{"weight" : 0.1, "item" : "sb_butter-recipe"} - ,{"weight" : 0.1, "item" : "sb_toffee-recipe"} - ,{"weight" : 0.1, "item" : "sb_toffeeapple-recipe"} - ,{"weight" : 0.1, "item" : "sb_sweetmeat-recipe"} - ,{"weight" : 0.1, "item" : "sb_alienburger-recipe"} - ,{"weight" : 0.1, "item" : "sb_burrito-recipe"} - ,{"weight" : 0.1, "item" : "sb_chilistew-recipe"} - ,{"weight" : 0.1, "item" : "sb_hamsandwich-recipe"} - ,{"weight" : 0.1, "item" : "sb_soup-recipe"} + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_applepie-recipe"}, + {"weight" : 0.1, "item" : "sb_candy-recipe"}, + {"weight" : 0.1, "item" : "sb_icecream-recipe"}, + {"weight" : 0.1, "item" : "sb_lollypop-recipe"}, + {"weight" : 0.1, "item" : "sb_butter-recipe"}, + {"weight" : 0.1, "item" : "sb_toffee-recipe"}, + {"weight" : 0.1, "item" : "sb_toffeeapple-recipe"}, + {"weight" : 0.1, "item" : "sb_sweetmeat-recipe"}, + {"weight" : 0.1, "item" : "sb_alienburger-recipe"}, + {"weight" : 0.1, "item" : "sb_burrito-recipe"}, + {"weight" : 0.1, "item" : "sb_chilistew-recipe"}, + {"weight" : 0.1, "item" : "sb_hamsandwich-recipe"} ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] @@ -77,20 +76,20 @@ "sb_floranBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_pussplumpie-recipe"} - ,{"weight" : 0.1, "item" : "sb_boneboomarrow-recipe"} - ,{"weight" : 0.1, "item" : "sb_meatandmarrow-recipe"} - ,{"weight" : 0.1, "item" : "sb_meatwich-recipe"} - ,{"weight" : 0.1, "item" : "sb_thespecial-recipe"} - ,{"weight" : 0.1, "item" : "sb_meatjuice-recipe"} - ,{"weight" : 0.1, "item" : "sb_meatwine-recipe"} - ,{"weight" : 0.1, "item" : "sb_offal-recipe"} - ], + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_pussplumpie-recipe"}, + {"weight" : 0.1, "item" : "sb_boneboomarrow-recipe"}, + {"weight" : 0.1, "item" : "sb_meatandmarrow-recipe"}, + {"weight" : 0.1, "item" : "sb_meatwich-recipe"}, + {"weight" : 0.1, "item" : "sb_thespecial-recipe"}, + {"weight" : 0.1, "item" : "sb_meatjuice-recipe"}, + {"weight" : 0.1, "item" : "sb_meatwine-recipe"}, + {"weight" : 0.1, "item" : "sb_offal-recipe"} + ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] @@ -99,13 +98,13 @@ "sb_apexBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_bananabread-recipe"} - ], + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_bananabread-recipe"} + ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] @@ -114,18 +113,18 @@ "sb_hylotlBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_dirtea-recipe"} - ,{"weight" : 0.1, "item" : "sb_ricewine-recipe"} - ,{"weight" : 0.1, "item" : "sb_whiskeybottle-recipe"} - ,{"weight" : 0.1, "item" : "sb_whiskeyflask-recipe"} - ,{"weight" : 0.1, "item" : "sb_eggfriedrice-recipe"} - ,{"weight" : 0.1, "item" : "sb_cornontheblob-recipe"} - ], + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_dirtea-recipe"}, + {"weight" : 0.1, "item" : "sb_ricewine-recipe"}, + {"weight" : 0.1, "item" : "sb_whiskeybottle-recipe"}, + {"weight" : 0.1, "item" : "sb_whiskeyflask-recipe"}, + {"weight" : 0.1, "item" : "sb_eggfriedrice-recipe"}, + {"weight" : 0.1, "item" : "sb_cornontheblob-recipe"} + ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] @@ -134,14 +133,14 @@ "sb_novakidBlueprints" : [ [0, { "pool" : [ - {"weight" : 0.1, "item" : "sb_musicsheet"} - ,{"weight" : 0.1, "item" : "sb_whiskeybottle-recipe"} - ,{"weight" : 0.1, "item" : "sb_whiskeyflask-recipe"} - ], + {"weight" : 0.1, "item" : "sb_musicsheet"}, + {"weight" : 0.1, "item" : "sb_whiskeybottle-recipe"}, + {"weight" : 0.1, "item" : "sb_whiskeyflask-recipe"} + ], "poolRounds" : [ - [0.55, 1], - [0.40, 2], - [0.20, 3] + [0.55, 1], + [0.40, 2], + [0.20, 3] ], "allowDuplication" : false }] diff --git a/treasure/sb_cropharvest.treasurepools b/treasure/sb_cropharvest.treasurepools index f4e0b1e0..5d271e10 100644 --- a/treasure/sb_cropharvest.treasurepools +++ b/treasure/sb_cropharvest.treasurepools @@ -121,6 +121,22 @@ ] } ] ], + "sb_fruitTreeHarvest" : [ + [0, { + "pool" : [ + {"weight" : 0.9, "item" : "plantfibre"}, + {"weight" : 0.1, "pool" : "sb_fruitTreeHarvestFruit"} + ] + } ] + ], + "sb_fruitTreeHarvestFruit" : [ + [0, { + "pool" : [ + {"weight" : 1, "item" : "redapple"}, + {"weight" : 1, "item" : "orange"} + ] + } ] + ], "sb_eyefoliageHarvest" : [ [0, { "pool" : [ diff --git a/treasure/sb_food.treasurepools b/treasure/sb_food.treasurepools index 133b2537..db6eb3ec 100644 --- a/treasure/sb_food.treasurepools +++ b/treasure/sb_food.treasurepools @@ -26,7 +26,7 @@ {"weight" : 0.9, "item" : "cookedtomato"}, {"weight" : 0.85, "item" : "corncob"}, {"weight" : 0.7, "item" : "fishdumplings"}, - {"weight" : 0.65, "item" : "fishfingers"}, + {"weight" : 0.55, "item" : "fishfingers"}, {"weight" : 0.5, "item" : "fishnchips"}, {"weight" : 0.25, "item" : "fishpie"}, {"weight" : 0.45, "item" : "fishstew"}, @@ -44,7 +44,7 @@ ,{"weight" : 0.6, "item" : "sb_vegetablesoup"} - ,{"weight" : 0.65, "item" : "sb_applepie"} + ,{"weight" : 0.55, "item" : "sb_applepie"} ,{"weight" : 0.75, "item" : "sb_candiedpearlpeas"} ,{"weight" : 0.85, "item" : "sb_ricevinegar"} @@ -124,19 +124,18 @@ ,{"weight" : 0.7, "item" : "sb_alienburger"} ,{"weight" : 0.55, "item" : "sb_burrito"} ,{"weight" : 0.6, "item" : "sb_hamsandwich"} - ,{"weight" : 0.85, "item" : "sb_soup"} ,{"weight" : 0.9, "item" : "sb_roastcacti"} - ,{"weight" : 0.75, "item" : "sb_butter"} - ,{"weight" : 0.75, "item" : "sb_toast"} + ,{"weight" : 0.925, "item" : "sb_butter"} + ,{"weight" : 0.8, "item" : "sb_toast"} ,{"weight" : 0.75, "item" : "sb_cake"} ,{"weight" : 0.95, "item" : "sb_candy"} ,{"weight" : 0.75, "item" : "sb_carrotcake"} ,{"weight" : 0.7, "item" : "sb_chocolatecoffeebeans"} ,{"weight" : 0.9, "item" : "sb_batteryacid"} - ,{"weight" : 0.8, "item" : "sb_meatjuice"} + ,{"weight" : 0.6, "item" : "sb_meatjuice"} ,{"weight" : 0.85, "item" : "sb_orangejuice"} ,{"weight" : 0.985, "item" : "soda"} @@ -202,28 +201,28 @@ ,{"weight" : 0.8, "item" : "sb_crystalchips"} ,{"weight" : 0.75, "item" : "sb_bananabread"} - ,{"weight" : 0.45, "item" : "sb_brineapple"} + ,{"weight" : 0.5, "item" : "sb_brineapple"} ,{"weight" : 0.4, "item" : "sb_crowncake"} - ,{"weight" : 0.9, "item" : "sb_crystalcandy"} + ,{"weight" : 0.85, "item" : "sb_crystalcandy"} ,{"weight" : 0.7, "item" : "sb_crystaljam"} - ,{"weight" : 0.5, "item" : "sb_crystalpie"} + ,{"weight" : 0.65, "item" : "sb_crystalpie"} ,{"weight" : 0.6, "item" : "sb_crystaltart"} ,{"weight" : 0.75, "item" : "sb_icecream"} - ,{"weight" : 0.7, "item" : "sb_lollypop"} + ,{"weight" : 0.65, "item" : "sb_lollypop"} ,{"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.6, "item" : "sb_pussplumpie"} + ,{"weight" : 0.55, "item" : "sb_pussplumpie"} ,{"weight" : 0.65, "item" : "sb_thornjam"} - ,{"weight" : 0.6, "item" : "sb_toffee"} - ,{"weight" : 0.7, "item" : "sb_toffeeapple"} - ,{"weight" : 0.5, "item" : "sb_sweetmeat"} + ,{"weight" : 0.75, "item" : "sb_toffee"} + ,{"weight" : 0.65, "item" : "sb_toffeeapple"} + ,{"weight" : 0.65, "item" : "sb_sweetmeat"} ,{"weight" : 0.6, "item" : "sb_chocolate"} ,{"weight" : 0.9, "item" : "sb_dirtea"} ,{"weight" : 0.85, "item" : "sb_liquifiedcrystal"} - ,{"weight" : 0.65, "item" : "sb_meatwine"} + ,{"weight" : 0.45, "item" : "sb_meatwine"} ,{"weight" : 0.65, "item" : "sb_weyene"} ,{"weight" : 0.6, "item" : "sb_whiskeybottle"} ,{"weight" : 0.7, "item" : "sb_whiskeyflask"} @@ -232,6 +231,7 @@ ,{"weight" : 0.985, "item" : "reefcola"} ,{"weight" : 0.7, "item" : "sb_meatballs"} ,{"weight" : 0.7, "item" : "sb_preservatives"} + ,{"weight" : 0.5, "item" : "sb_flashfreeze"} ] }], [4.9, { @@ -275,7 +275,7 @@ {"weight" : 0.35, "item" : "toxictart"}, {"weight" : 0.65, "item" : "toxictopjam"} - ,{"weight" : 0.75, "item" : "sb_poachedavesmingo"} + ,{"weight" : 0.6, "item" : "sb_poachedavesmingo"} ,{"weight" : 0.75, "item" : "sb_eggfriedrice"} @@ -284,13 +284,14 @@ ,{"weight" : 0.5, "item" : "sb_sweettime"} ,{"weight" : 0.8, "item" : "sb_boltedmilk"} - ,{"weight" : 0.8, "item" : "sb_oculemonade"} + ,{"weight" : 0.65, "item" : "sb_oculemonade"} ,{"weight" : 0.985, "item" : "soda"} ,{"weight" : 0.985, "item" : "reefcola"} ,{"weight" : 0.985, "item" : "oculemonade"} ,{"weight" : 0.7, "item" : "sb_meatballs"} ,{"weight" : 0.7, "item" : "sb_preservatives"} + ,{"weight" : 0.5, "item" : "sb_flashfreeze"} ] }], [5.9, { @@ -312,8 +313,8 @@ ,{"weight" : 0.7, "item" : "sb_cordialglass"} ,{"weight" : 0.9, "item" : "sb_wartjuice"} ,{"weight" : 0.75, "item" : "sb_wartwine"} - ,{"weight" : 0.55, "item" : "sb_wineglass"} - ,{"weight" : 0.4, "item" : "sb_winebottle"} + ,{"weight" : 0.7, "item" : "sb_wineglass"} + ,{"weight" : 0.55, "item" : "sb_winebottle"} ,{"weight" : 0.985, "item" : "soda"} ,{"weight" : 0.985, "item" : "reefcola"} @@ -321,6 +322,7 @@ ,{"weight" : 0.985, "item" : "sb_orangenergycan"} ,{"weight" : 0.7, "item" : "sb_meatballs"} ,{"weight" : 0.7, "item" : "sb_preservatives"} + ,{"weight" : 0.5, "item" : "sb_flashfreeze"} ] }], [6.9, { @@ -345,7 +347,7 @@ {"weight" : 0.6, "item" : "wartweedstew"} - ,{"weight" : 0.7, "item" : "sb_chilistew"} + ,{"weight" : 0.55, "item" : "sb_chilistew"} ,{"weight" : 0.8, "item" : "sb_curriedbeakseed"} ,{"weight" : 0.9, "item" : "sb_orangenergyglass"} @@ -358,6 +360,7 @@ ,{"weight" : 0.985, "item" : "sb_orangenergycan"} ,{"weight" : 0.7, "item" : "sb_meatballs"} ,{"weight" : 0.7, "item" : "sb_preservatives"} + ,{"weight" : 0.5, "item" : "sb_flashfreeze"} ] }] ] diff --git a/treasure/sb_microdungeons.treasurepools b/treasure/sb_microdungeons.treasurepools index 922f84e8..ce625123 100644 --- a/treasure/sb_microdungeons.treasurepools +++ b/treasure/sb_microdungeons.treasurepools @@ -24,7 +24,8 @@ "pool" : [ {"weight" : 0.70, "item" : ["wheat",2]}, {"weight" : 0.20, "item" : ["wheat",4]}, - {"weight" : 0.10, "item" : ["wheat",6]} + {"weight" : 0.10, "item" : ["wheat",6]}, + {"weight" : 0.50, "pool" : "seed"} ] }] ], @@ -70,5 +71,34 @@ {"weight" : 0.5, "item" : ["magmarock",25]} ] }] + ], + + "sb_glitchHouseChestTreasure" : [ + [0, { + "fill" : [ + {"pool" : "valuableTreasure"}, + {"pool" : "nonTieredOre"} + ], + "pool" : [ + {"weight" : 0.5, "pool" : "basicTreasure"}, + {"weight" : 0.5, "pool" : "sb_glitchHouseTreasure"} + ], + "poolRounds" : [ + [0.05, 1], + [0.40, 2], + [0.30, 3] + ], + "allowDuplication" : false + }] + ], + + "sb_glitchHouseTreasure" : [ + [0, { + "pool" : [ + {"weight" : 0.5, "item" : "glitchfossil1"}, + {"weight" : 0.5, "item" : "glitchfossil2"}, + {"weight" : 0.5, "item" : "glitchfossil3"} + ] + }] ] } \ No newline at end of file diff --git a/treasure/sb_monster.treasurepools b/treasure/sb_monster.treasurepools index 27cec1ec..e54ddfde 100644 --- a/treasure/sb_monster.treasurepools +++ b/treasure/sb_monster.treasurepools @@ -67,5 +67,18 @@ {"weight" : 0.025, "item" : "sb_repairbotaf"} ] }] + ], + "sb_bonebirdBones" : [ + [1, { + "pool" : [ + {"weight" : 1, "item" : "bone"} + ], + "poolRounds" : [ + [0.2, 0], + [0.4, 1], + [0.2, 2], + [0.2, 3] + ] + }] ] } \ No newline at end of file diff --git a/treasure/sb_randomdrops/eyefoliageHarvest.item b/treasure/sb_randomdrops/eyefoliageHarvest.item new file mode 100644 index 00000000..c8f4a1d2 --- /dev/null +++ b/treasure/sb_randomdrops/eyefoliageHarvest.item @@ -0,0 +1,6 @@ +{ + "itemName": "sb_eyefoliageHarvest", + "rarity": "rare", + "pool": "sb_eyefoliageHarvest", + "builder": "/items/buildscripts/starbound/randomdrop.lua" +} diff --git a/treasure/sb_randomdrops/fruitTreeHarvest.item b/treasure/sb_randomdrops/fruitTreeHarvest.item new file mode 100644 index 00000000..b537beee --- /dev/null +++ b/treasure/sb_randomdrops/fruitTreeHarvest.item @@ -0,0 +1,6 @@ +{ + "itemName": "sb_fruitTreeHarvest", + "rarity": "rare", + "pool": "sb_fruitTreeHarvest", + "builder": "/items/buildscripts/starbound/randomdrop.lua" +} diff --git a/treasure/sb_randomdrops/timecapsule.item b/treasure/sb_randomdrops/timecapsule.item new file mode 100644 index 00000000..b9e8ce94 --- /dev/null +++ b/treasure/sb_randomdrops/timecapsule.item @@ -0,0 +1,6 @@ +{ + "itemName": "sb_timecapsule", + "rarity": "Rare", + "sb_timecapsuleConfig": ["sb_goldcoin", [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "holidayspirit"]], + "builder": "/items/buildscripts/starbound/buildtimecapsule.lua" +} diff --git a/treasure/sb_randomdrops/treeHarvest.item b/treasure/sb_randomdrops/treeHarvest.item new file mode 100644 index 00000000..52c3fe8d --- /dev/null +++ b/treasure/sb_randomdrops/treeHarvest.item @@ -0,0 +1,6 @@ +{ + "itemName": "sb_treeHarvest", + "rarity": "rare", + "pool": "sb_treeHarvest", + "builder": "/items/buildscripts/starbound/randomdrop.lua" +} diff --git a/treasure/shoggothtreasure.treasurepools.patch b/treasure/shoggothtreasure.treasurepools.patch index 1640896a..c656a220 100644 --- a/treasure/shoggothtreasure.treasurepools.patch +++ b/treasure/shoggothtreasure.treasurepools.patch @@ -15,7 +15,6 @@ [{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_alienburger"}}], [{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_burrito"}}], [{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_hamsandwich"}}], -[{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_soup"}}], [{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_roastcacti"}}], [{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_butter"}}], [{"op":"add","path":"/foodTier3/0/1/pool/-","value":{"weight":1,"item":"sb_toast"}}], diff --git a/uimessages/sb_1.currency b/uimessages/sb_1.currency deleted file mode 100644 index 202c2b30..00000000 --- a/uimessages/sb_1.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage1", - "shortdescription" : " New tech available.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/tech/vehicle_appear2.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_10.currency b/uimessages/sb_10.currency deleted file mode 100644 index 7cae15d2..00000000 --- a/uimessages/sb_10.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage10", - "shortdescription" : " Enhancement already applied.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/clickon_error.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_11.currency b/uimessages/sb_11.currency deleted file mode 100644 index 47b8be49..00000000 --- a/uimessages/sb_11.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage11", - "shortdescription" : " Blueprints already known.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_2.currency b/uimessages/sb_2.currency deleted file mode 100644 index 1457aab0..00000000 --- a/uimessages/sb_2.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage2", - "shortdescription" : " Tech already known.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/energy_out2.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_3.currency b/uimessages/sb_3.currency deleted file mode 100644 index ae975df2..00000000 --- a/uimessages/sb_3.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage3", - "shortdescription" : " Tech incompatible.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/clickon_error.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_4.currency b/uimessages/sb_4.currency deleted file mode 100644 index 59bad81a..00000000 --- a/uimessages/sb_4.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage4", - "shortdescription" : " Not enough free space.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_5.currency b/uimessages/sb_5.currency deleted file mode 100644 index af5a33c3..00000000 --- a/uimessages/sb_5.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage5", - "shortdescription" : " Tech not known.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/energy_out2.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_6.currency b/uimessages/sb_6.currency deleted file mode 100644 index 2968351e..00000000 --- a/uimessages/sb_6.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage6", - "shortdescription" : " Can't swap from non-binded tech.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/clickon_error.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_7.currency b/uimessages/sb_7.currency deleted file mode 100644 index 5c2ac44a..00000000 --- a/uimessages/sb_7.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage7", - "shortdescription" : " Blueprint already known.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_9.currency b/uimessages/sb_9.currency deleted file mode 100644 index 7d2a0e0c..00000000 --- a/uimessages/sb_9.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage9", - "shortdescription" : " Tech already equipped.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : ["/sfx/interface/clickon_error.ogg"], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} \ No newline at end of file diff --git a/uimessages/sb_uimessage-d10.currency b/uimessages/sb_uimessage-d10.currency deleted file mode 100644 index 0b4dc1c9..00000000 --- a/uimessages/sb_uimessage-d10.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d10", - "shortdescription" : " ^#d5ab36;Can barely stand...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d100.currency b/uimessages/sb_uimessage-d100.currency deleted file mode 100644 index 24044daf..00000000 --- a/uimessages/sb_uimessage-d100.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d100", - "shortdescription" : " ^#d5ab36;Still full.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d15.currency b/uimessages/sb_uimessage-d15.currency deleted file mode 100644 index 79c8c76a..00000000 --- a/uimessages/sb_uimessage-d15.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d15", - "shortdescription" : " ^#d5ab36;Can't take it much longer...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d2.currency b/uimessages/sb_uimessage-d2.currency deleted file mode 100644 index 890e11be..00000000 --- a/uimessages/sb_uimessage-d2.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d2", - "shortdescription" : " ^#d5ab36;Goodbye cruel world...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d25.currency b/uimessages/sb_uimessage-d25.currency deleted file mode 100644 index 2299f7ff..00000000 --- a/uimessages/sb_uimessage-d25.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d25", - "shortdescription" : " ^#d5ab36;Sooooo hungry...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d5.currency b/uimessages/sb_uimessage-d5.currency deleted file mode 100644 index c98ce891..00000000 --- a/uimessages/sb_uimessage-d5.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d5", - "shortdescription" : " ^#d5ab36;I see a light...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d50.currency b/uimessages/sb_uimessage-d50.currency deleted file mode 100644 index 75778174..00000000 --- a/uimessages/sb_uimessage-d50.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d50", - "shortdescription" : " ^#d5ab36;Getting pretty hungry...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-d75.currency b/uimessages/sb_uimessage-d75.currency deleted file mode 100644 index 8226f8cb..00000000 --- a/uimessages/sb_uimessage-d75.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-d75", - "shortdescription" : " ^#d5ab36;Getting peckish.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u10.currency b/uimessages/sb_uimessage-u10.currency deleted file mode 100644 index 1f853292..00000000 --- a/uimessages/sb_uimessage-u10.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u10", - "shortdescription" : " ^#d5ab36;More, more!^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u100.currency b/uimessages/sb_uimessage-u100.currency deleted file mode 100644 index 9ee4ae3b..00000000 --- a/uimessages/sb_uimessage-u100.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u100", - "shortdescription" : " ^#d5ab36;Mmm, full.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u15.currency b/uimessages/sb_uimessage-u15.currency deleted file mode 100644 index ffe6dc2b..00000000 --- a/uimessages/sb_uimessage-u15.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u15", - "shortdescription" : " ^#d5ab36;Must find more food...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u2.currency b/uimessages/sb_uimessage-u2.currency deleted file mode 100644 index 5df46318..00000000 --- a/uimessages/sb_uimessage-u2.currency +++ /dev/null @@ -1,11 +0,0 @@ -{ - "itemName" : "sb_uimessage-u2", -//"shortdescription" : " Awake. Head throbbing. Vision blurry.^clear;", - "shortdescription" : " ^#d5ab36;Is this a joke?^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u25.currency b/uimessages/sb_uimessage-u25.currency deleted file mode 100644 index 8b268b8b..00000000 --- a/uimessages/sb_uimessage-u25.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u25", - "shortdescription" : " ^#d5ab36;Need more...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u5.currency b/uimessages/sb_uimessage-u5.currency deleted file mode 100644 index c30b5714..00000000 --- a/uimessages/sb_uimessage-u5.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u5", - "shortdescription" : " ^#d5ab36;I'll die if I don't get some more...^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u50.currency b/uimessages/sb_uimessage-u50.currency deleted file mode 100644 index d51088ab..00000000 --- a/uimessages/sb_uimessage-u50.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u50", - "shortdescription" : " ^#d5ab36;Still hungry.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/uimessages/sb_uimessage-u75.currency b/uimessages/sb_uimessage-u75.currency deleted file mode 100644 index 55effcc9..00000000 --- a/uimessages/sb_uimessage-u75.currency +++ /dev/null @@ -1,10 +0,0 @@ -{ - "itemName" : "sb_uimessage-u75", - "shortdescription" : " ^#d5ab36;That's better.^clear;", - "currency" : "sb_uimessage", - "rarity" : "rare", - "value" : 0, - "pickupSoundsSmall" : [""], - "pickupSoundsMedium" : [""], - "pickupSoundsLarge" : [""] -} diff --git a/versioning/clothes/sb_sweatervestchest.item b/versioning/clothes/sb_sweatervestchest.item new file mode 100644 index 00000000..b71d4596 --- /dev/null +++ b/versioning/clothes/sb_sweatervestchest.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert.lua","convertTo":"sb_workchest","itemName":"sb_sweatervestchest"} \ No newline at end of file diff --git a/versioning/clothes/sb_sweatervestlegs.item b/versioning/clothes/sb_sweatervestlegs.item new file mode 100644 index 00000000..c82fb4d4 --- /dev/null +++ b/versioning/clothes/sb_sweatervestlegs.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert.lua","convertTo":"sb_worklegs","itemName":"sb_sweatervestlegs"} \ No newline at end of file diff --git a/versioning/food/sb_soup-recipe.item b/versioning/food/sb_soup-recipe.item new file mode 100644 index 00000000..0902d4da --- /dev/null +++ b/versioning/food/sb_soup-recipe.item @@ -0,0 +1 @@ +{"itemName":"sb_soup-recipe","builder":"/items/buildscripts/starbound/convert.lua","convertTo":"voxel1k"} \ No newline at end of file diff --git a/versioning/food/sb_soup.item b/versioning/food/sb_soup.item new file mode 100644 index 00000000..02f63d1a --- /dev/null +++ b/versioning/food/sb_soup.item @@ -0,0 +1 @@ +{"itemName":"sb_soup","builder":"/items/buildscripts/starbound/convert.lua","convertTo":"tomatosoup"} \ No newline at end of file diff --git a/versioning/items/sb_capturepod.item b/versioning/items/sb_capturepod.item new file mode 100644 index 00000000..ba4de031 --- /dev/null +++ b/versioning/items/sb_capturepod.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert.lua","convertTo":"capturepod","itemName":"sb_capturepod"} \ No newline at end of file diff --git a/versioning/items/sb_crittercapturepod.item b/versioning/items/sb_crittercapturepod.item new file mode 100644 index 00000000..4f404572 --- /dev/null +++ b/versioning/items/sb_crittercapturepod.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert.lua","convertTo":"capturepod","itemName":"sb_crittercapturepod"} \ No newline at end of file diff --git a/versioning/items/sb_glowfibreblue.item b/versioning/items/sb_glowfibreblue.item new file mode 100644 index 00000000..a6945968 --- /dev/null +++ b/versioning/items/sb_glowfibreblue.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert2.lua","convertTo":"glowfibre","itemName":"sb_glowfibreblue"} \ No newline at end of file diff --git a/versioning/items/sb_glowfibregreen.item b/versioning/items/sb_glowfibregreen.item new file mode 100644 index 00000000..fe455b60 --- /dev/null +++ b/versioning/items/sb_glowfibregreen.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert2.lua","convertTo":"glowfibre","itemName":"sb_glowfibregreen"} \ No newline at end of file diff --git a/versioning/items/sb_glowfibreorange.item b/versioning/items/sb_glowfibreorange.item new file mode 100644 index 00000000..6f7e7e69 --- /dev/null +++ b/versioning/items/sb_glowfibreorange.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert2.lua","convertTo":"glowfibre","itemName":"sb_glowfibreorange"} \ No newline at end of file diff --git a/versioning/items/sb_glowfibreyellow.item b/versioning/items/sb_glowfibreyellow.item new file mode 100644 index 00000000..c202640e --- /dev/null +++ b/versioning/items/sb_glowfibreyellow.item @@ -0,0 +1 @@ +{"builder":"/items/buildscripts/starbound/convert2.lua","convertTo":"glowfibre","itemName":"sb_glowfibreyellow"} \ No newline at end of file diff --git a/versioning/objects/sb_coffeemachine.object b/versioning/objects/sb_coffeemachine.object new file mode 100644 index 00000000..3fe6891a --- /dev/null +++ b/versioning/objects/sb_coffeemachine.object @@ -0,0 +1 @@ +{"autoCloseCooldown":0,"uiConfig":"/interface/sb_chests/chest.config","objectName":"sb_coffeemachine","slotCount":9,"inventoryIcon":"/assetmissing.png","orientations":[{"dualImage":"/objects/outpost/coffeemachine/coffeemachine.png:","spaces":[[-1,0]],"imagePosition":[-8,0]}],"objectType":"container","frameCooldown":0,"builder":"/items/buildscripts/starbound/convert.lua"} \ No newline at end of file diff --git a/versioning/objects/sb_nanostove.object b/versioning/objects/sb_nanostove.object new file mode 100644 index 00000000..df82224e --- /dev/null +++ b/versioning/objects/sb_nanostove.object @@ -0,0 +1 @@ +{"autoCloseCooldown":0,"uiConfig":"/interface/sb_chests/chest.config","objectName":"sb_nanostove","slotCount":9,"inventoryIcon":"/assetmissing.png","orientations":[{"dualImage":"/objects/generic/nanostove/nanostove.png:.","spaces":[[-1,0]],"imagePosition":[-8,0]}],"objectType":"container","frameCooldown":0,"builder":"/items/buildscripts/starbound/convert.lua"} \ No newline at end of file diff --git a/versioning/objects/sb_paintingesther.object b/versioning/objects/sb_paintingesther.object new file mode 100644 index 00000000..4ee8d486 --- /dev/null +++ b/versioning/objects/sb_paintingesther.object @@ -0,0 +1 @@ +{"orientations":[{"dualImage":"/assetmissing.png","spaces":[[-1,0]],"imagePosition":[-7,0]}],"inventoryIcon":"/assetmissing.png","objectName":"sb_paintingesther","builder":"/items/buildscripts/starbound/convert.lua","convertTo":"voxel5k"} \ No newline at end of file diff --git a/versioning/statuseffects/sb_capturedmonster.statuseffect b/versioning/statuseffects/sb_capturedmonster.statuseffect new file mode 100644 index 00000000..5ee6b0ef --- /dev/null +++ b/versioning/statuseffects/sb_capturedmonster.statuseffect @@ -0,0 +1 @@ +{"name":"sb_capturedmonster"} \ No newline at end of file diff --git a/versioning/statuseffects/sb_entity.statuseffect b/versioning/statuseffects/sb_entity.statuseffect new file mode 100644 index 00000000..cc2fb426 --- /dev/null +++ b/versioning/statuseffects/sb_entity.statuseffect @@ -0,0 +1 @@ +{"name":"sb_entity"} \ No newline at end of file diff --git a/versioning/statuseffects/sb_levelup.statuseffect b/versioning/statuseffects/sb_levelup.statuseffect new file mode 100644 index 00000000..820d460e --- /dev/null +++ b/versioning/statuseffects/sb_levelup.statuseffect @@ -0,0 +1 @@ +{"name":"sb_levelup"} \ No newline at end of file diff --git a/xrc/deployment/unlock/0018.lua b/xrc/deployment/unlock/0018.lua deleted file mode 100644 index 7a0e699d..00000000 --- a/xrc/deployment/unlock/0018.lua +++ /dev/null @@ -1,13 +0,0 @@ -local ini = init or function() end -function init() ini() -if not status.statusProperty("xrc_0018") then status.setStatusProperty("xrc_0018",0) end -local cv, pv = 4, status.statusProperty("xrc_0018") - if player.introComplete() and cv > pv then - if pv == 0 then player.giveItem("sb_inspect") player.giveItem("sb_survivalguide-codex") elseif - pv == 1 and player.hasActiveQuest("sb_avianrefugeeE2.gearup") then player.giveBlueprint("paperwingsback") player.giveItem("voxel5k") elseif - pv == 2 and #player.shipUpgrades().capabilities > 0 then require("/scripts/sb_assetmissing.lua") local i = "sb_"..(player.species()=="novakid" and "nova" or player.species()).."starter" if sb_itemExists(i) then player.giveItem(i) end elseif - pv == 3 and #player.shipUpgrades().capabilities > 0 then require("/scripts/sb_assetmissing.lua") local i = "sb_"..player.species().."tier0shortsword" if sb_itemExists(i) then player.giveItem(i) end - end - status.setStatusProperty("xrc_0018",cv) - end -end \ No newline at end of file diff --git a/xrc/deployment/versioning/0018z.lua b/xrc/deployment/versioning/0018z.lua index 99362f25..3a4c6f24 100644 --- a/xrc/deployment/versioning/0018z.lua +++ b/xrc/deployment/versioning/0018z.lua @@ -1,11 +1,13 @@ local ini = init or function() end function init() ini() - local currentVersion = 26 - if status.statusProperty("xrc_0018z") == nil then status.setStatusProperty("xrc_0018z",0) end - local yv = status.statusProperty("xrc_0018z") - if yv < currentVersion then - require("/xrc/deployment/versioning/0018z_2.lua") - xrc0018z_2(currentVersion,yv) - status.setStatusProperty("xrc_0018z",currentVersion) + local currentVersion = 27 + if player.introComplete() then + if status.statusProperty("xrc_0018z") == nil then status.setStatusProperty("xrc_0018z",0) end + local yv = status.statusProperty("xrc_0018z") + if yv < currentVersion then + require("/xrc/deployment/versioning/0018z_2.lua") + status.setStatusProperty("xrc_0018z",currentVersion) + xrc0018z_2(currentVersion,yv) + end end end \ No newline at end of file diff --git a/xrc/deployment/versioning/0018z_2.lua b/xrc/deployment/versioning/0018z_2.lua index aae3e64d..8dc11e07 100644 --- a/xrc/deployment/versioning/0018z_2.lua +++ b/xrc/deployment/versioning/0018z_2.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="Rewards for one or more completed quests have been adjusted. (Contains "..#IB.." items.)",items=IB}}) 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 updateNote(a) local b = root.assetJson("/betabound.config") a = b.updateNotes[a] @@ -11,7 +11,8 @@ local function updateNote(a) i.parameters.shortdescription = a[1].." "..b.updateNote player.giveItem(i) end -xrc0018[1]=function() end + +xrc0018[1]=function() local b = root.assetJson("/betabound.config:defaultItems") for i = 1, #b do player.giveItem(b[i]) end end xrc0018[2]=function() end xrc0018[3]=function() end xrc0018[4]=function() quest("sb_kelpquest.gearup","refinery") end @@ -23,15 +24,20 @@ xrc0018[8]=function() local b = root.assetJson("/items/buildscripts/starbound/tech.config") local c = status.statusProperty("sb_bioimplant") or "" local e = {} - if a then for i = 1, #a do - sb.logInfo(a[i]) - sb.logInfo(b[a[i]] or "") - if b[a[i]] then e[i]=b[a[i]] else e[i]=a[i] end - if a[i] == c then status.clearPersistentEffects("sb_bioimplant") status.setStatusProperty("sb_bioimplant",e[i]) - local d = root.hasTech(c) and root.techConfig(c) or root.hasTech(e[i]) and root.techConfig(e[i]) or root.hasTech(b[e[i]]) and root.techConfig(b[e[i]]) - if d then status.setPersistentEffects("sb_bioimplant",{d.sb_effect}) end - end - end status.setStatusProperty("sb_bioimplants",e) end + if a then + for i = 1, #a do + sb.logInfo(a[i]) + sb.logInfo(b[a[i]] or "") + if b[a[i]] then e[i]=b[a[i]] else e[i]=a[i] end + if a[i] == c then + status.clearPersistentEffects("sb_bioimplant") + status.setStatusProperty("sb_bioimplant",e[i]) + local d = root.hasTech(c) and root.techConfig(c) or root.hasTech(e[i]) and root.techConfig(e[i]) or root.hasTech(b[e[i]]) and root.techConfig(b[e[i]]) + if d then status.setPersistentEffects("sb_bioimplant",{d.sb_effect}) end + end + end + status.setStatusProperty("sb_bioimplants",e) + end end --xrc0018[9]=function() if status.statusProperty("xrc_0018z",0) >= 5 then player.giveItem(root.assetJson("/xrc/deployment/versioning/0018z-9.json")) end end xrc0018[9]=function() if not player.hasCompletedQuest("destroyruin") then player.startQuest("sb_destroyruin") end end @@ -40,33 +46,41 @@ xrc0018[11]=function() end xrc0018[12]=function() end xrc0018[13]=function() if player.blueprintKnown("sb_frostshield") then player.giveItem("sb_frostshield-recipe") player.addCurrency("money",5000) end end xrc0018[14]=function() - status.clearPersistentEffects("sb_entity") - local p = {"betabound","sb_bioimplant","sb_bioimplants"} - local d = {{},nil,{}} - for i = 1, #p do player.setProperty(p[i],status.statusProperty(p[i],d[i])) status.setStatusProperty(p[i]) end - if type(player.getProperty(p[2])) ~= "string" then player.setProperty(p[2],nil) end + status.clearPersistentEffects("sb_entity") + local p = {"betabound","sb_bioimplant","sb_bioimplants"} + local d = {{},nil,{}} + for i = 1, #p do player.setProperty(p[i],status.statusProperty(p[i],d[i])) status.setStatusProperty(p[i]) end + if type(player.getProperty(p[2])) ~= "string" then player.setProperty(p[2],nil) end end xrc0018[15]=function() quest("destroyruin","sb_beamaxe2") end xrc0018[16]=function() end xrc0018[17]=function() player.setProperty("sb_availableBioimplants",{}) if player.getProperty("sb_bioimplant","") == "sb_noprotection" then player.setProperty("sb_bioimplant") end end xrc0018[18]=function() - local a, b, e, f = player.getProperty("sb_bioimplants"), root.assetJson("/items/buildscripts/starbound/tech.config"), {}, player.getProperty("sb_availableBioimplants") - sb.logInfo("Owned Suits: "..sb.print(a or {})) - sb.logInfo("Available Suits: "..sb.print(f or {})) - local c = player.getProperty("sb_bioimplant") or "" - if a then for i = 1, #a do - sb.logInfo(string.format("Converting suit tech '%s' to '%s.'",a[i],b[a[i]] or a[i])) - if b[a[i]] then e[i]=b[a[i]] else e[i]=a[i] end - if a[i] == c then status.clearPersistentEffects("sb_bioimplant") player.setProperty("sb_bioimplant",e[i]) - local d = root.hasTech(c) and root.techConfig(c) or root.hasTech(e[i]) and root.techConfig(e[i]) or root.hasTech(b[e[i]]) and root.techConfig(b[e[i]]) - if d then status.setPersistentEffects("sb_bioimplant",type(d.sb_effect)=="string" and {d.sb_effect} or d.sb_effect) end - end - end player.setProperty("sb_bioimplants",e) end + local a, b, e, f = player.getProperty("sb_bioimplants"), root.assetJson("/items/buildscripts/starbound/tech.config"), {}, player.getProperty("sb_availableBioimplants") + sb.logInfo("Owned Suits: "..sb.print(a or {})) + sb.logInfo("Available Suits: "..sb.print(f or {})) + local c = player.getProperty("sb_bioimplant") or "" + if a then + for i = 1, #a do + sb.logInfo(string.format("Converting suit tech '%s' to '%s.'",a[i],b[a[i]] or a[i])) + if b[a[i]] then e[i]=b[a[i]] else e[i]=a[i] end + if a[i] == c then + status.clearPersistentEffects("sb_bioimplant") + player.setProperty("sb_bioimplant",e[i]) + local d = root.hasTech(c) and root.techConfig(c) or root.hasTech(e[i]) and root.techConfig(e[i]) or root.hasTech(b[e[i]]) and root.techConfig(b[e[i]]) + if d then status.setPersistentEffects("sb_bioimplant",type(d.sb_effect)=="string" and {d.sb_effect} or d.sb_effect) end + end + end + player.setProperty("sb_bioimplants",e) + end e = {} - if f then for i = 1, #f do - sb.logInfo(string.format("Converting possibly unpurchased suit tech '%s' to '%s.'",f[i],b[f[i]] or f[i])) - if b[f[i]] then e[i]=b[f[i]] else e[i]=f[i] end - end player.setProperty("sb_availableBioimplants",e) end + if f then + for i = 1, #f do + sb.logInfo(string.format("Converting possibly unpurchased suit tech '%s' to '%s.'",f[i],b[f[i]] or f[i])) + if b[f[i]] then e[i]=b[f[i]] else e[i]=f[i] end + end + player.setProperty("sb_availableBioimplants",e) + end IB = {} boxQuest("sb_bountyhunter1.gearup",{"sb_uncommonbroadsword",1,{level=2}}) boxQuest("sb_bountyhunter3.gearup",{"sb_uncommonshotgun",1,{level=4}}) @@ -173,4 +187,24 @@ xrc0018[26]=function() end end -function xrc0018z_2(cv,yv) for i = yv, cv-1 do xrc0018[i+1]() end end \ No newline at end of file +--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() + quest("sb_outpostSkin.gearup","techconsole") + if not newPlayer then player.giveItem("sb_gunguide-codex") end + local a = status.statusProperty("xrc_0018") + if a then + if pv == 0 then player.giveItem("sb_inspect") player.giveItem("sb_survivalguide-codex") elseif + pv == 1 and player.hasActiveQuest("sb_avianrefugeeE2.gearup") then player.giveBlueprint("paperwingsback") player.giveItem("voxel5k") elseif + pv == 2 and #player.shipUpgrades().capabilities > 0 then require("/scripts/sb_assetmissing.lua") local i = "sb_"..(player.species()=="novakid" and "nova" or player.species()).."starter" if sb_itemExists(i) then player.giveItem(i) end elseif + pv == 3 and #player.shipUpgrades().capabilities > 0 then require("/scripts/sb_assetmissing.lua") local i = "sb_"..player.species().."tier0shortsword" if sb_itemExists(i) then player.giveItem(i) end + end + status.setStatusProperty("xrc_0018",nil) + end +end + +function xrc0018z_2(cv,yv) + newPlayer = yv == 0 + for i = yv, cv-1 do xrc0018[i+1]() end +end \ No newline at end of file diff --git a/xrc/deployment/versioning/tech.lua b/xrc/deployment/versioning/tech.lua index 70033624..32e39034 100644 --- a/xrc/deployment/versioning/tech.lua +++ b/xrc/deployment/versioning/tech.lua @@ -1,4 +1,6 @@ local ini = init or function() end function init() ini() -local a = player.equippedTech local t = {a("head"),a("body"),a("legs")} -for f = 1, 3 do if t[f] then if not root.hasTech(t[f]) then player.unequipTech(t[f]) end end end end \ No newline at end of file + 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 +end \ No newline at end of file diff --git a/xrc_fertilizer.config.patch b/xrc_fertilizer.config.patch index f5d43a47..415e086b 100644 --- a/xrc_fertilizer.config.patch +++ b/xrc_fertilizer.config.patch @@ -1,9 +1,9 @@ [ -[{"op":"test","path":"/glowfibre"} -,{"op":"copy","from":"/glowfibre","path":"/sb_glowfibreorange"} -,{"op":"copy","from":"/glowfibre","path":"/sb_glowfibregreen"} -,{"op":"copy","from":"/glowfibre","path":"/sb_glowfibreblue"} -,{"op":"copy","from":"/glowfibre","path":"/sb_glowfibreyellow"}] +[{"op":"test","path":"/plantfibre"},{"op":"test","path":"/kelp","inverse":true} +,{"op":"copy","from":"/plantfibre","path":"/kelp"}] + +,[{"op":"test","path":"/seaweed","inverse":true} +,{"op":"add","path":"/seaweed","value":[50,50]}] ,[{"op":"add","path":"/sb_liquidtentaclejuice","value":[30,70]}] ,[{"op":"add","path":"/sb_rottenapple","value":[60,60]}]