From e8a59bbb187716946944ac8f1e972bf9634bb72b Mon Sep 17 00:00:00 2001 From: SilverSokolova Date: Tue, 17 Oct 2023 21:30:13 -0500 Subject: [PATCH] food changes --- _metadata | 2 +- betabound.macros | 179 ++++++++----- betabound2.macros | 59 ----- betabound3.macros | 250 ------------------ interface/tooltips/sb_food.tooltip | 10 +- .../starbound/guns/alienlaser.activeitem | 5 +- .../starbound/guns/corrosivegun.activeitem | 7 +- .../commonmachinepistol.activeitem | 5 +- .../commonplasmamachinepistol.activeitem | 2 +- .../legendarymachinepistol.activeitem | 5 +- .../raremachinepistol.activeitem | 5 +- .../rareplasmamachinepistol.activeitem | 2 +- .../uncommonmachinepistol.activeitem | 5 +- .../shattergun/shattergun.activeitem | 2 +- .../starbound/itembox/itembox.activeitem | 50 ++-- .../starbound/weapons/axes/boneaxe.activeitem | 121 ++++++--- .../weapons/axes/crappyaxe.activeitem | 139 +++++----- .../starbound/weapons/axes/eyeaxe.activeitem | 114 ++++---- .../weapons/axes/fryingpan.activeitem | 129 +++++---- .../weapons/axes/uncommoncrappyaxe.activeitem | 215 ++++++++------- .../weapons/daggers/bonesaw.activeitem | 6 +- .../weapons/hammers/bonehammer.activeitem | 133 +++++----- .../weapons/hammers/crappyhammer.activeitem | 136 ++++++---- .../hammers/uncommoncrappyhammer.activeitem | 207 ++++++++------- .../glitchslargemace.activeitem | 93 +++---- .../glitchsmallmace.activeitem | 137 +++++----- .../weapons/shortswords/rustsword.activeitem | 112 ++++---- .../weapons/spears/crappyspear.activeitem | 111 ++++---- .../weapons/spears/rainbowspear.activeitem | 115 ++++---- .../spears/uncommoncrappyspear.activeitem | 195 ++++++++------ items/buildscripts/starbound/buildfood.lua | 10 +- items/categories.config.patch | 6 + .../sb_condiments/peanutbutterjar.consumable | 13 +- .../food/sb_desserts/brineapple.consumable | 40 +-- .../sb_desserts/burningeyeballs.consumable | 53 ++-- .../food/sb_desserts/butter.consumable | 34 ++- .../sb_desserts/candiedpearlpeas.consumable | 39 +-- .../food/sb_desserts/chocolate.consumable | 41 +-- .../chocolatecoffeebeans.consumable | 44 +-- .../food/sb_desserts/copperkeypie.consumable | 43 +-- .../food/sb_desserts/crystalpie.consumable | 41 +-- .../generic/food/sb_desserts/jelly.consumable | 47 ++-- .../food/sb_desserts/lollypop.consumable | 44 +-- items/generic/food/sb_desserts/lollypop.png | Bin 135 -> 138 bytes .../food/sb_desserts/orangepie.consumable | 40 +-- .../food/sb_desserts/orangetart.consumable | 44 +-- .../food/sb_desserts/pussplumpie.consumable | 14 +- .../food/sb_desserts/sweetmeat.consumable | 42 +-- .../food/sb_desserts/toffee.consumable | 38 +-- .../food/sb_desserts/toffeeapple.consumable | 41 +-- .../food/sb_drinks/batteryacid.consumable | 40 +-- .../food/sb_drinks/cordialbottle.consumable | 50 ++-- .../food/sb_drinks/cordialglass.consumable | 47 ++-- .../generic/food/sb_drinks/dirtea.consumable | 2 +- .../food/sb_drinks/meatjuice.consumable | 43 +-- .../food/sb_drinks/meatwine.consumable | 48 ++-- .../food/sb_drinks/oculemonade.consumable | 49 ++-- .../food/sb_drinks/ricevinegar.consumable | 37 +-- .../food/sb_drinks/ricewine.consumable | 44 +-- .../food/sb_drinks/rootpopbottle.consumable | 44 +-- .../food/sb_drinks/rootpopflask.consumable | 44 +-- .../food/sb_drinks/wartwine.consumable | 3 +- .../generic/food/sb_drinks/weyene.consumable | 48 ++-- .../food/sb_drinks/whiskeybottle.consumable | 48 ++-- .../food/sb_drinks/whiskeyflask.consumable | 48 ++-- .../food/sb_drinks/winebottle.consumable | 51 ++-- .../food/sb_drinks/wineglass.consumable | 48 ++-- .../food/sb_entrees/chilistew.consumable | 10 +- .../food/sb_entrees/crystalnachos.consumable | 39 +-- .../food/sb_sides/roastbanana.consumable | 41 +-- items/generic/food/sb_sides/toast.consumable | 41 +-- .../food/tier1/pearlpeabroth.consumable.patch | 3 +- .../food/tier2/carrotcake.consumable.patch | 4 +- .../food/tier2/chocolatecake.consumable.patch | 5 +- .../generic/food/tier2/mocha.consumable.patch | 4 +- .../tier2/pearlpeapancakes.consumable.patch | 3 +- items/generic/food/tier2/sb_mocha.activeitem | 20 +- .../food/tier3/apegrapes.consumable.patch | 2 +- .../food/tier3/bananacon.consumable.patch | 2 +- .../tier3/bananacreamdonut.consumable.patch | 2 +- .../tier3/bananacreampie.consumable.patch | 2 +- .../tier3/bananaicecream.consumable.patch | 2 +- .../tier3/batteredbanana.consumable.patch | 2 +- .../tier3/campfirebanana.consumable.patch | 4 +- .../food/tier3/choconut.consumable.patch | 3 +- .../food/tier3/desertsalsa.consumable.patch | 4 + .../food/tier3/fruitsalad.consumable.patch | 2 +- .../food/tier3/luckydip.consumable.patch | 2 +- .../tier3/stuffedautomato.consumable.patch | 5 +- .../food/tier3/tropicalpunch.consumable.patch | 2 +- .../food/tier4/bananasplit.consumable.patch | 2 +- .../food/tier4/cyanider.consumable.patch | 2 +- .../food/tier4/oceansalsa.consumable.patch | 1 + .../food/tier4/oculemonstew.consumable.patch | 2 +- .../food/tier4/pussplumjam.consumable.patch | 2 +- .../tier4/pussplumpudding.consumable.patch | 2 +- .../food/tier4/pussplumtart.consumable.patch | 2 +- .../tier6/pearlpeaparcels.consumable.patch | 3 +- .../food/tier6/wartweedstew.consumable.patch | 4 +- .../valentinechocolates.consumable.patch | 2 +- .../generic/produce/beakseed.consumable.patch | 2 +- items/generic/produce/crystalplant.item.patch | 4 +- items/generic/produce/kelp.item.patch | 4 +- items/generic/produce/orange.consumable.patch | 3 +- items/generic/produce/rice.item.patch | 4 +- items/generic/sb_meat/offal.consumable | 6 +- items/generic/shop/sb_candy.consumable | 5 +- items/generic/unsorted/sb_empty.currency | 22 +- .../unsorted/sb_rottenapple.consumable | 30 ++- monsters/events/sb_envprobe/envprobe.lua | 9 - quests/scripts/story/sb_techunlocks.lua | 2 +- .../condiments/desertsalsa.recipe.patch | 2 + .../condiments/oceansalsa.recipe.patch | 1 + .../desserts/campfirebanana.recipe.patch | 1 + .../desserts/chocolatecake.recipe.patch | 3 +- .../cookingtable1/drinks/mocha.recipe.patch | 3 +- .../cookingtable1/mains/meatpie.recipe.patch | 3 +- .../mains/pearlpeapancakes.recipe.patch | 1 - .../mains/wartweedstew.recipe.patch | 1 - .../sides/pearlpeabroth.recipe.patch | 1 - .../sides/pearlpeaparcels.recipe.patch | 1 - .../sides/stuffedautomato.recipe.patch | 1 + .../snacks/choconut.recipe.patch | 3 +- .../consumables/campfire/roastbanana.recipe | 2 +- .../condiments/peanutbutterjar.recipe | 2 +- .../consumables/desserts/brineapple.recipe | 2 +- .../desserts/burningeyeballs.recipe | 2 +- .../consumables/desserts/butter.recipe | 6 +- .../desserts/candiedpearlpeas.recipe | 2 +- .../consumables/desserts/candy.recipe | 2 +- .../consumables/desserts/chocolate.recipe | 2 +- .../consumables/desserts/copperkeypie.recipe | 2 +- .../consumables/desserts/crystalpie.recipe | 2 +- .../consumables/desserts/jelly.recipe | 4 +- .../consumables/desserts/lollypop.recipe | 4 +- .../consumables/desserts/orangepie.recipe | 2 +- .../consumables/desserts/pussplumpie.recipe | 2 +- .../consumables/desserts/sweetmeat.recipe | 2 +- .../consumables/desserts/toffee.recipe | 2 +- .../consumables/desserts/toffeeapple.recipe | 2 +- .../consumables/drinks/batteryacid.recipe | 2 +- .../consumables/drinks/cordialglass.recipe | 6 +- .../consumables/drinks/dirtea.recipe | 2 +- .../consumables/drinks/meatjuice.recipe | 4 +- .../consumables/drinks/meatwine.recipe | 4 +- .../consumables/drinks/oculemonade.recipe | 4 +- .../consumables/drinks/ricevinegar.recipe | 2 +- .../consumables/drinks/rootpopbottle.recipe | 2 +- .../consumables/drinks/rootpopflask.recipe | 2 +- .../consumables/drinks/wartwine.recipe | 2 +- .../consumables/drinks/weyene.recipe | 2 +- .../consumables/drinks/whiskeybottle.recipe | 2 +- .../consumables/drinks/whiskeyflask.recipe | 2 +- .../consumables/drinks/winebottle.recipe | 2 +- .../consumables/drinks/wineglass.recipe | 6 +- .../consumables/entrees/crystalnachos.recipe | 2 +- .../entrees/poachedavesmingo.recipe | 2 +- .../starbound/consumables/sides/toast.recipe | 2 +- sb_commands.config | 1 + stats/sb_effects/entity.lua | 1 - stats/sb_effects/entity.statuseffect | 6 - .../fooddepletionsuppressed.statuseffect | 8 +- stats/sb_effects/ladder.statuseffect | 12 +- stats/sb_effects/levelup.animation | 10 - stats/sb_effects/levelup.statuseffect | 9 - ...ed.statuseffect => jellyslow.statuseffect} | 0 stats/sb_effects/outpost.statuseffect | 6 +- .../bio/enhancedhealing.statuseffect | 16 +- tech/starbound/bio/forcefield.statuseffect | 18 +- tech/starbound/bio/spiked.statuseffect | 16 +- tech/starbound/bio/tank.statuseffect | 18 +- tech/starbound/bio/vamp.statuseffect | 16 +- tech/starbound/booster/bubbleboost.tech | 1 + tech/starbound/booster/butterflyboost.tech | 1 + tech/starbound/booster/particlethrust.tech | 1 + .../explosiveprotection.statuseffect | 18 +- .../groundsmashdamage.statuseffect | 10 +- .../groundsmashknockback.statuseffect | 12 +- .../groundsmashknockbackY.statuseffect | 10 +- tech/starbound/jetpack/rocketboots.tech | 1 + tech/starbound/magnet/magnet.statuseffect | 14 +- tech/starbound/magnet/magnet.tech | 26 +- tech/starbound/movement/gravity.statuseffect | 16 +- tech/starbound/movement/jump.statuseffect | 12 +- tech/starbound/movement/mobility.statuseffect | 14 +- tech/starbound/movement/speed.statuseffect | 18 +- tech/starbound/regen/energyregen.statuseffect | 18 +- .../starbound/regen/regeneration.statuseffect | 18 +- tech/starbound/shield/shield.statuseffect | 18 +- tech/starbound/suits/air.statuseffect | 22 +- tech/starbound/suits/breathprotection.tech | 22 +- .../environmentalprotection.statuseffect | 32 ++- tech/starbound/suits/heat.statuseffect | 24 +- tech/starbound/suits/heatprotection.tech | 24 +- .../suits/radprotection.statuseffect | 24 +- tech/starbound/suits/radprotection.tech | 26 +- .../starbound/unscripted/berserk.statuseffect | 10 +- tech/starbound/unscripted/energy.statuseffect | 10 +- tech/starbound/unscripted/glow.statuseffect | 10 +- tech/starbound/unscripted/grit.statuseffect | 10 +- tech/starbound/unscripted/health.statuseffect | 8 +- .../unscripted/protection.statuseffect | 10 +- .../unscripted/reducefalldamage.statuseffect | 10 +- treasure/sb_food.treasurepools | 36 +-- .../statuseffects/sb_entity.statuseffect | 1 + .../statuseffects/sb_levelup.statuseffect | 1 + 206 files changed, 2590 insertions(+), 2384 deletions(-) delete mode 100644 betabound2.macros delete mode 100644 betabound3.macros create mode 100644 items/categories.config.patch delete mode 100644 stats/sb_effects/entity.lua delete mode 100644 stats/sb_effects/entity.statuseffect delete mode 100644 stats/sb_effects/levelup.animation delete mode 100644 stats/sb_effects/levelup.statuseffect rename stats/sb_effects/movement/{jellied.statuseffect => jellyslow.statuseffect} (100%) create mode 100644 versioning/statuseffects/sb_entity.statuseffect create mode 100644 versioning/statuseffects/sb_levelup.statuseffect diff --git a/_metadata b/_metadata index c524655d..a01f8a9f 100644 --- a/_metadata +++ b/_metadata @@ -7,5 +7,5 @@ "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.10c" + "version": "0.10j" } diff --git a/betabound.macros b/betabound.macros index 80c65e33..32335e95 100644 --- a/betabound.macros +++ b/betabound.macros @@ -1,84 +1,131 @@ { - "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_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"], - "sb_storage2" : ["/warp InstanceWorld:playerstation:6f20604db8080bfa09f17a9cd667956b:1=2acb1e351639f3d2f738182d7f86c8a3"], + '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/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/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/corrosivegun.activeitem b/items/active/starbound/guns/corrosivegun.activeitem index df3a6eaf..0bd519c4 100644 --- a/items/active/starbound/guns/corrosivegun.activeitem +++ b/items/active/starbound/guns/corrosivegun.activeitem @@ -5,11 +5,10 @@ "price": 800, "tooltipKind": "sb_gun2", "tooltipFields": { - "damageKindImage": "/interface/sb_tooltips/sb_corrosiveparticle.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", diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem index 5dcd1d8d..b94a5b4d 100644 --- a/items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/commonmachinepistol.activeitem @@ -5,16 +5,13 @@ "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], "price": 620, - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, "paletteSwaps": "", "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", diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem index 0a603d89..3552dbcf 100644 --- a/items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/commonplasmamachinepistol.activeitem @@ -4,7 +4,7 @@ "rarity": "common", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, "paletteSwaps": "", diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem index a14f12f2..a878be0a 100644 --- a/items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/legendarymachinepistol.activeitem @@ -4,7 +4,7 @@ "rarity": "legendary", "baseOffset": [-0.25, 0.25], "muzzleOffset": [0, 0.375], - "category": "pistol", + "category": "machinePistol", "tooltipKind": "sb_gun2", "description": "A small fully automatic pistol.", "paletteSwaps": "", @@ -12,9 +12,6 @@ "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", diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem index c6fb4673..b544df60 100644 --- a/items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/raremachinepistol.activeitem @@ -6,15 +6,12 @@ "muzzleOffset": [0, 0.375], "price": 620, "paletteSwaps": "", - "category": "pistol", + "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", diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem index 0b5ce07a..676b4cf8 100644 --- a/items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/rareplasmamachinepistol.activeitem @@ -9,7 +9,7 @@ "tooltipKind": "sb_gun2", "description": "A small fully automatic plasma pistol.", "shortdescription": "Rare Plasma Machine Pistol", - "category": "pistol", + "category": "machinePistol", "twoHanded": false, "level": 1, "tooltipFields": { diff --git a/items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem b/items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem index 1fbc9468..595d4cf5 100644 --- a/items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem +++ b/items/active/starbound/guns/randomgenerated/machinepistol/uncommonmachinepistol.activeitem @@ -9,12 +9,9 @@ "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", diff --git a/items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem b/items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem index ad685f3b..b1fc3701 100644 --- a/items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem +++ b/items/active/starbound/guns/randomgenerated/shattergun/shattergun.activeitem @@ -28,7 +28,7 @@ }, "elementalType": "physical", - //TODO: needs to use gun2 ability (not shotgun) + //TODO: needs to use gun2 ability (not shotgun) "primaryAbility": { "scripts": ["/items/active/weapons/ranged/gunfire.lua"], "class": "GunFire", 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/buildscripts/starbound/buildfood.lua b/items/buildscripts/starbound/buildfood.lua index bd3847a0..d944173d 100644 --- a/items/buildscripts/starbound/buildfood.lua +++ b/items/buildscripts/starbound/buildfood.lua @@ -13,14 +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 fields.subtitle = subtitle end + 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/categories.config.patch b/items/categories.config.patch new file mode 100644 index 00000000..20200005 --- /dev/null +++ b/items/categories.config.patch @@ -0,0 +1,6 @@ +[ + //NOTE: Betabound uses these as custom tooltipFields 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_alcohol","value":"Alcohol"} +] \ No newline at end of file diff --git a/items/generic/food/sb_condiments/peanutbutterjar.consumable b/items/generic/food/sb_condiments/peanutbutterjar.consumable index 1e33ddf4..3284647b 100644 --- a/items/generic/food/sb_condiments/peanutbutterjar.consumable +++ b/items/generic/food/sb_condiments/peanutbutterjar.consumable @@ -1,17 +1,20 @@ { "itemName": "sb_peanutbutterjar", - "price": 335, - "foodValue": 35, + "price": 125, + "foodValue": 20, "tooltipKind": "sb_object", - "rarity": "Uncommon", + "rarity": "common", "sb_plateHide": true, "inventoryIcon": "peanutbutterjar.png", "category": "food", "effects": [[{ + "effect": "maxenergyscalingboostfood", + "duration": 90 + },{ "effect": "sb_protectionboost5", - "duration": 315 + "duration": 90 }, - "sb_foodheal120" + "sb_foodheal50" ]], "learnBlueprintsOnPickup": ["sb_peanutbutter"], "description": "Now with actual butter. And peas. No nuts though.", 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/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/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/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/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/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/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/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 7ba6ff32eb24619277ab0974ddb3065ff40785e5..499f3ffeae7aa0c3d6ceb4168a28be0c9998e167 100644 GIT binary patch delta 74 zcmZo?>|>!WHQ0;uuoFm@M&SqMo{Gj|%ey!^~Ow=Rg16zdTOT^4E#0Jq#vSdKe1M ePEozB$j-2dYqn&KMPerd5O})!xvX