From 3a7704d6240bb7c6a91c437d4ffc118e05049405 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 10 Jul 2025 17:55:09 +0700 Subject: [PATCH 1/2] neutral items 7.39 --- bots/FretBots/SettingsNeutralItemTable.lua | 59 +++++++++++++--------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/bots/FretBots/SettingsNeutralItemTable.lua b/bots/FretBots/SettingsNeutralItemTable.lua index 3afc1dd..7e318ea 100644 --- a/bots/FretBots/SettingsNeutralItemTable.lua +++ b/bots/FretBots/SettingsNeutralItemTable.lua @@ -12,41 +12,43 @@ local neutral_items = -- {name="item_mysterious_hat", tier=1, ranged=1, melee=1, roles={1,4,1,1,1}, realName="Fairy's Trinket"}, -- {name="item_lance_of_pursuit", tier=1, ranged=1, melee=2, roles={2,2,1,1,1}, realName="Lance of Pursuit"}, {name="item_occult_bracelet", tier=1, ranged=1, melee=1, roles={1,1,3,2,2}, realName="Occult Bracelet"}, - {name="item_unstable_wand", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Pig Pole"}, - {name="item_mana_draught", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Mana Draught"}, + -- {name="item_unstable_wand", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Pig Pole"}, {name="item_polliwog_charm", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Polliwog Charm"}, {name="item_rippers_lash", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Ripper's Lash"}, -- {name="item_royal_jelly", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Royal Jelly"}, -- {name="item_safety_bubble", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Safety Bubble"}, -- {name="item_seeds_of_serenity", tier=1, ranged=1, melee=1, roles={0,0,0,1,1}, realName="Seeds of Serenity"}, {name="item_spark_of_courage", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Spark of Courage"}, - -- {name="item_chipped_vest", tier=1, ranged=1, melee=1, roles={2,2,3,2,2}, realName="Chipped Vest"}, + {name="item_chipped_vest", tier=1, ranged=0, melee=1, roles={2,2,4,2,2}, realName="Chipped Vest"}, -- {name="item_keen_optic", tier=1, ranged=1, melee=1, roles={1,1,1,2,2}, realName="Keen Optic"}, -- {name="item_ironwood_tree", tier=1, ranged=1, melee=1, roles={2,2,2,1,1}, realName="Ironwood Tree"}, -- {name="item_mango_tree", tier=1, ranged=1, melee=1, roles={0,0,0,0,0}, realName="Mango Tree"}, -- {name="item_ocean_heart", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Ocean Heart"}, - -- {name="item_poor_mans_shield", tier=1, ranged=1, melee=3, roles={2,2,3,0,0}, realName="Poor Man's Shield"}, -- {name="item_possessed_mask", tier=1, ranged=1, melee=1, roles={3,3,2,1,1}, realName="Possessed Mask"}, - {name="item_trusty_shovel", tier=1, ranged=1, melee=1, roles={0,0,0,0,0}, realName="Trusty Shovel"}, - {name="item_orb_of_destruction", tier=1, ranged=1, melee=1, roles={4,1,1,0,0}, realName="Orb of Destruction"}, + -- {name="item_trusty_shovel", tier=1, ranged=1, melee=1, roles={0,0,0,0,0}, realName="Trusty Shovel"}, + -- {name="item_orb_of_destruction", tier=1, ranged=1, melee=1, roles={4,1,1,0,0}, realName="Orb of Destruction"}, + {name="item_sisters_shroud", tier=1, ranged=1, melee=1, roles={1,1,1,5,5}, realName="Sister's Shroud"}, + {name="item_dormant_curio", tier=1, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Dormant Curio"}, + {name="item_kobold_cup", tier=1, ranged=1, melee=1, roles={1,1,1,3,3}, realName="Kobold Cup"}, + -- tier 2 -- {name="item_bullwhip", tier=2, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Bullwhip"}, -- {name="item_dragon_scale", tier=2, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Dragon Scale"}, -- {name="item_eye_of_the_vizier", tier=2, ranged=1, melee=1, roles={1,1,1,4,4}, realName="Eye of the Vizier"}, - {name="item_gossamer_cape", tier=2, ranged=1, melee=1, roles={1,1,1,3,3}, realName="Gossamer Cape"}, - {name="item_searing_signet", tier=2, ranged=1, melee=1, roles={2,2,1,-5,-5}, realName="Searing Signet"}, + -- {name="item_gossamer_cape", tier=2, ranged=1, melee=1, roles={1,1,1,3,3}, realName="Gossamer Cape"}, + {name="item_searing_signet", tier=2, ranged=1, melee=1, roles={2,2,1,2,2}, realName="Searing Signet"}, -- {name="item_grove_bow", tier=2, ranged=5, melee=0, roles={2,2,1,-5,-5}, realName="Grove Bow"}, -- {name="item_light_collector", tier=2, ranged=1, melee=1, roles={1,1,1,3,3}, realName = 'Light Collector'}, -- {name="item_pupils_gift", tier=2, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Pupil's Gift"}, -- {name="item_specialists_array", tier=2, ranged=2, melee=0, roles={2,2,1,1,1}, realName="Specialist's Array"}, -- {name="item_vambrace", tier=2, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Vambrace"}, - {name="item_iron_talon", tier=2, ranged=1, melee=1, roles={1,1,1,0,0}, realName="Iron Talon"}, + -- {name="item_iron_talon", tier=2, ranged=1, melee=1, roles={1,1,1,0,0}, realName="Iron Talon"}, -- {name="item_vampire_fangs", tier=2, ranged=1, melee=1, roles={2,2,2,0,0}, realName="Vampire Fangs"}, - {name="item_misericorde", tier=2, ranged=1, melee=1, roles={4,2,1,1,1}, realName="Brigand's Blade"}, + {name="item_misericorde", tier=2, ranged=1, melee=1, roles={4,2,1,0,0}, realName="Brigand's Blade"}, --{name="item_clumsy_net", tier=2, ranged=1, melee=1, roles={1,1,2,3,3}, realName="Clumsy Net"}, --{name="item_dagger_of_ristul", tier=2, ranged=1, melee=1, roles={2,2,1,1,1}, realName="Dagger of Ristul"}, - {name="item_essence_ring", tier=2, ranged=1, melee=1, roles={1,1,1,2,2}, realName="Essence Ring"}, + {name="item_essence_ring", tier=2, ranged=1, melee=1, roles={3,3,3,2,2}, realName="Essence Ring"}, --{name="item_paintball", tier=2, ranged=1, melee=1, roles={2,2,1,1,1}, realName="Fae Grenade"}, --{name="item_imp_claw", tier=2, ranged=1, melee=1, roles={2,1,1,0,0}, realName="Imp Claw"}, --{name="item_nether_shawl", tier=2, ranged=1, melee=1, roles={0,0,0,0,0}, realName="Nether Shawl"}, @@ -54,6 +56,8 @@ local neutral_items = --{name="item_quicksilver_amulet", tier=2, ranged=1, melee=1, roles={2,2,1,1,1}, realName="Quicksilver Amulet"}, --{name="item_ring_of_aquila", tier=2, ranged=1, melee=1, roles={3,2,1,0,0}, realName="Ring of Aquila"}, {name="item_pogo_stick", tier=2, ranged=1, melee=1, roles={3,3,3,3,3}, realName="Tumbler's Toy"}, + {name="item_mana_draught", tier=2, ranged=1, melee=1, roles={1,1,1,3,3}, realName="Mana Draught"}, + {name="item_poor_mans_shield", tier=2, ranged=1, melee=3, roles={2,2,3,1,1}, realName="Poor Man's Shield"}, -- tier 3 -- {name="item_cloak_of_flames", tier=3, ranged=1, melee=2, roles={2,2,6,2,2}, realName="Cloak of Flames"}, @@ -65,8 +69,8 @@ local neutral_items = -- {name="item_enchanted_quiver", tier=3, ranged=4, melee=0, roles={1,1,1,1,1}, realName="Enchanted Quiver"}, -- {name="item_vambrace", tier=3, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Vambrace"}, -- {name="item_paladin_sword", tier=3, ranged=1, melee=1, roles={4,1,1,0,0}, realName="Paladin Sword"}, - -- {name="item_psychic_headband", tier=3, ranged=3, melee=1, roles={1,1,1,6,6}, realName="Psychic Headband"}, - {name="item_nemesis_curse", tier=3, ranged=1, melee=1, roles={2,2,0,0,0}, realName="Nemesis Curse"}, + {name="item_psychic_headband", tier=3, ranged=3, melee=1, roles={1,1,1,6,6}, realName="Psychic Headband"}, + -- {name="item_nemesis_curse", tier=3, ranged=1, melee=1, roles={2,2,0,0,0}, realName="Nemesis Curse"}, -- {name="item_vindicators_axe", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Vindicator's Axe"}, --{name="item_black_powder_bag", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Blast Rig"}, --{name="item_greater_faerie_fire", tier=3, ranged=1, melee=1, roles={1,1,1,0,0}, realName="Greater Faerie Fire"}, @@ -75,9 +79,11 @@ local neutral_items = --{name="item_titan_sliver", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Titan Sliver"}, {name="item_serrated_shiv", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Serrated Shiv"}, {name="item_gale_guard", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Gale Guard"}, - {name="item_gunpowder_gauntlets", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Gunpowde Gauntlets"}, - {name="item_whisper_of_the_dread", tier=3, ranged=1, melee=1, roles={1,1,2,1,1}, realName="Whisper of the Dread"}, - {name="item_ninja_gear", tier=3, ranged=1, melee=1, roles={2,1,1,0,0}, realName="Ninja Gear"}, + {name="item_gunpowder_gauntlets", tier=3, ranged=1, melee=1, roles={1,1,4,1,1}, realName="Gunpowder Gauntlets"}, + {name="item_whisper_of_the_dread", tier=3, ranged=1, melee=1, roles={1,2,1,4,4}, realName="Whisper of the Dread"}, + -- {name="item_ninja_gear", tier=3, ranged=1, melee=1, roles={2,1,1,0,0}, realName="Ninja Gear"}, + {name="item_jidi_pollen_bag", tier=3, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Jidi Pollen Bag"}, + -- tier 4 -- {name="item_ancient_guardian", tier=4, ranged=1, melee=1, roles={3,1,1,0,0}, realName="Ancient Guardian"}, @@ -85,11 +91,11 @@ local neutral_items = -- {name="item_avianas_feather", tier=4, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Aviana's Feather"}, -- {name="item_havoc_hammer", tier=4, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Havoc Hammer"}, -- {name="item_martyrs_plate", tier=4, ranged=1, melee=1, roles={1,1,5,0,0}, realName="Martyr's Plate"}, - {name="item_ogre_seal_totem", tier=4, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Ogre Seal Totem"}, - {name="item_mind_breaker", tier=4, ranged=1, melee=1, roles={4,1,1,0,0}, realName="Mind Breaker"}, + -- {name="item_ogre_seal_totem", tier=4, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Ogre Seal Totem"}, + -- {name="item_mind_breaker", tier=4, ranged=1, melee=1, roles={4,1,1,0,0}, realName="Mind Breaker"}, {name="item_crippling_crossbow", tier=4, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Crippling Crossbow"}, - {name="item_magnifying_monocle", tier=4, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Magnifying Monocle"}, - {name="item_ceremonial_robe", tier=4, ranged=1, melee=1, roles={1,1,1,5,5}, realName="Ceremonial Robe"}, + {name="item_magnifying_monocle", tier=4, ranged=1, melee=1, roles={2,2,1,3,3}, realName="Magnifying Monocle"}, + -- {name="item_ceremonial_robe", tier=4, ranged=1, melee=1, roles={1,1,1,5,5}, realName="Ceremonial Robe"}, -- {name="item_rattlecage", tier=4, ranged=1, melee=1, roles={0,0,6,1,1}, realName="Rattlecage"}, -- {name="item_stormcrafter", tier=4, ranged=1, melee=1, roles={1,1,3,3,3}, realName="Stormcrafter"}, -- {name="item_spy_gadget", tier=4, ranged=4, melee=0, roles={0,0,0,3,3}, realName="Telescope"}, @@ -103,18 +109,21 @@ local neutral_items = --{name="item_spell_prism", tier=4, ranged=1, melee=1, roles={1,2,1,4,5}, realName="Spell Prism"}, --{name="item_heavy_blade", tier=4, ranged=1, melee=1, roles={3,6,1,1,1}, realName="Witchbane"}, --{name="item_witless_shako", tier=4, ranged=1, melee=1, roles={1,1,5,2,2}, realName="Witless Shako"}, - {name="item_pyrrhic_cloak", tier=4, ranged=1, melee=1, roles={1,1,1,5,5}, realName="Pyrrhic Cloak"}, + {name="item_pyrrhic_cloak", tier=4, ranged=1, melee=1, roles={1,1,4,4,4}, realName="Pyrrhic Cloak"}, + {name="item_dezun_bloodrite", tier=4, ranged=1, melee=1, roles={1,2,3,4,4}, realName="Dezun Bloodrite"}, + {name="item_giant_maul", tier=4, ranged=1, melee=1, roles={5,5,1,0,0}, realName="Giant's Maul"}, + {name="item_outworld_staff", tier=4, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Outworld Staff"}, -- tier 5 -- {name="item_apex", tier=5, ranged=1, melee=1, roles={1,1,1,0,0}, realName="Apex"}, -- {name="item_force_field", tier=5, ranged=1, melee=1, roles={2,5,1,7,7}, realName="Arcanist's Armor"}, -- {name="item_book_of_shadows", tier=5, ranged=1, melee=1, roles={1,1,1,6,6}, realName="Book of Shadows"}, - {name="item_demonicon", tier=5, ranged=1, melee=1, roles={1,1,1,1,6}, realName="Book of the Dead"}, + {name="item_demonicon", tier=5, ranged=1, melee=1, roles={1,1,1,5,6}, realName="Book of the Dead"}, -- {name="item_force_boots", tier=5, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Force Boots"}, -- {name="item_giants_ring", tier=5, ranged=1, melee=1, roles={3,3,6,1,1}, realName="Giant's Ring"}, - {name="item_panic_button", tier=5, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Magic Lamp"}, + -- {name="item_panic_button", tier=5, ranged=1, melee=1, roles={1,1,3,1,1}, realName="Magic Lamp"}, -- {name="item_mirror_shield", tier=5, ranged=1, melee=1, roles={2,2,4,0,0}, realName="Mirror Shield"}, - {name="item_pirate_hat", tier=5, ranged=1, melee=1, roles={4,3,1,0,0}, realName="Pirate Hat"}, + -- {name="item_pirate_hat", tier=5, ranged=1, melee=1, roles={4,3,1,0,0}, realName="Pirate Hat"}, -- {name="item_seer_stone", tier=5, ranged=1, melee=1, roles={1,1,2,5,5}, realName="Seer Stone"}, {name="item_desolator_2", tier=5, ranged=1, melee=1, roles={5,1,0,0,0}, realName="Stygian Desolator"}, -- {name="item_unwavering_condition", tier=5, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Unwavering Condition"}, @@ -126,6 +135,8 @@ local neutral_items = {name="item_minotaur_horn", tier=5, ranged=1, melee=1, roles={1,1,1,1,1}, realName="Minotaur Horn"}, {name="item_spider_legs", tier=5, ranged=1, melee=1, roles={2,2,2,2,2}, realName="Spider Legs"}, {name="item_unrelenting_eye", tier=5, ranged=1, melee=1, roles={2,2,2,2,2}, realName="Unrelenting Eye"}, + {name="item_helm_of_the_undying", tier=5, ranged=1, melee=1, roles={5,5,5,5,5}, realName="Helm of the Undying"}, + {name="item_divine_regalia", tier=5, ranged=1, melee=1, roles={4,4,1,1,1}, realName="Divine Regalia"}, } local enhancements = { From 08b38451e9f25172c619c72b8b13831926b18aab Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 30 Dec 2025 08:31:28 +0700 Subject: [PATCH 2/2] fix octarine --- bots/FunLib/aba_item.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/FunLib/aba_item.lua b/bots/FunLib/aba_item.lua index f610345..da377f9 100644 --- a/bots/FunLib/aba_item.lua +++ b/bots/FunLib/aba_item.lua @@ -673,7 +673,7 @@ Item['item_nullifier'] = GetItemComponents( 'item_nullifier' )[1] Item['item_oblivion_staff'] = GetItemComponents( 'item_oblivion_staff' )[1] -Item['item_octarine_core'] = {"item_soul_booster", "item_tiara_of_selemene"} +Item['item_octarine_core'] = GetItemComponents( 'item_octarine_core' )[1] Item['item_orchid'] = GetItemComponents( 'item_orchid' )[1]