From ede91286ae28cc55f00ff91ae93e65dcc3966fba Mon Sep 17 00:00:00 2001 From: ianandersonlol <960562+ianandersonlol@users.noreply.github.com> Date: Thu, 5 Nov 2026 19:33:07 -0800 Subject: [PATCH 1/2] Itemizer: fall back to regular ninja tools --- addons/itemizer/itemizer.lua | 79 ++++++++++++++++++++++-------------- addons/itemizer/readme.md | 13 ++++-- 2 files changed, 57 insertions(+), 35 deletions(-) diff --git a/addons/itemizer/itemizer.lua b/addons/itemizer/itemizer.lua index d5981b2a7..c3d33545b 100644 --- a/addons/itemizer/itemizer.lua +++ b/addons/itemizer/itemizer.lua @@ -1,6 +1,6 @@ _addon.name = 'Itemizer' _addon.author = 'Ihina' -_addon.version = '3.3.2.1' +_addon.version = '3.3.2.2' _addon.command = 'itemizer' require('luau') @@ -8,32 +8,33 @@ local packets = require('packets') defaults = {} defaults.AutoNinjaTools = true +defaults.NinjaToolFallback = true defaults.AutoItems = true defaults.AutoStack = true defaults.Delay = 0.5 defaults.version = _addon.version defaults.UseUniversalTools = {} -defaults.UseUniversalTools.Katon = false -defaults.UseUniversalTools.Hyoton = false -defaults.UseUniversalTools.Huton = false -defaults.UseUniversalTools.Doton = false -defaults.UseUniversalTools.Raiton = false -defaults.UseUniversalTools.Suiton = false -defaults.UseUniversalTools.Utsusemi = false -defaults.UseUniversalTools.Jubaku = false -defaults.UseUniversalTools.Hojo = false -defaults.UseUniversalTools.Kurayami = false -defaults.UseUniversalTools.Dokumori = false -defaults.UseUniversalTools.Tonko = false -defaults.UseUniversalTools.Monomi = false -defaults.UseUniversalTools.Aisha = false -defaults.UseUniversalTools.Yurin = false -defaults.UseUniversalTools.Myoshu = false -defaults.UseUniversalTools.Migawari = false -defaults.UseUniversalTools.Kakka = false -defaults.UseUniversalTools.Gekka = false -defaults.UseUniversalTools.Yain = false +defaults.UseUniversalTools.Katon = true +defaults.UseUniversalTools.Hyoton = true +defaults.UseUniversalTools.Huton = true +defaults.UseUniversalTools.Doton = true +defaults.UseUniversalTools.Raiton = true +defaults.UseUniversalTools.Suiton = true +defaults.UseUniversalTools.Utsusemi = true +defaults.UseUniversalTools.Jubaku = true +defaults.UseUniversalTools.Hojo = true +defaults.UseUniversalTools.Kurayami = true +defaults.UseUniversalTools.Dokumori = true +defaults.UseUniversalTools.Tonko = true +defaults.UseUniversalTools.Monomi = true +defaults.UseUniversalTools.Aisha = true +defaults.UseUniversalTools.Yurin = true +defaults.UseUniversalTools.Myoshu = true +defaults.UseUniversalTools.Migawari = true +defaults.UseUniversalTools.Kakka = true +defaults.UseUniversalTools.Gekka = true +defaults.UseUniversalTools.Yain = true settings = config.load(defaults) @@ -123,9 +124,10 @@ windower.register_event("addon command", function(command, arg2, ...) 3. AutoItems - Toggles automatically getting items from bags (shortened ai) 4. UseUniversalTool - Toggles using universal ninja tools for (shortened uut) i.e. uut katon - will toggle katon either true or false depending on your setting - all defaulted false. + defaults to true for all spells. 5. AutoStack - Toggles utomatically stacking items in the destination bag (shortened as, defaults true) - 6. Help - Shows this menu.]] + 6. Help - Shows this menu. + 7. NinjaToolFallback - Toggles spell-specific tool fallback for NIN main when a universal tool is unavailable (shortened ntf, defaults true).]] for _, line in ipairs(helptext:split('\n')) do log(line) end @@ -141,6 +143,10 @@ windower.register_event("addon command", function(command, arg2, ...) settings.AutoNinjaTools = not settings.AutoNinjaTools settings:save() log('AutoNinjaTools is now', settings.AutoNinjaTools) + elseif T{'ninjatoolfallback','ntf'}:contains(command:lower()) then + settings.NinjaToolFallback = not settings.NinjaToolFallback + settings:save() + log('NinjaToolFallback is now', settings.NinjaToolFallback) elseif T{'autoitems','ai'}:contains(command:lower()) then settings.AutoItems = not settings.AutoItems settings:save() @@ -311,8 +317,9 @@ gen_tools = T{ active = S{} -- Returning true resends the command in settings.Delay seconds --- Returning false doesn't resend the command and executes it -collect_item = function(id, items) +-- Returning false means the item is already in Inventory. +-- Returning nil lets the caller try another item when this one is missing. +collect_item = function(id, items, allow_missing) items = items or {inventory = windower.ffxi.get_items(bag_name_to_id.inventory)} local item = T(items.inventory):with('id', id) @@ -334,6 +341,8 @@ collect_item = function(id, items) -- Add currently processing ID to set of active IDs active:add(id) + elseif allow_missing then + return nil else error(windower.from_shift_jis('Item "%s" not found in any accessible bags':format(res.items[id].name))) end @@ -341,7 +350,7 @@ collect_item = function(id, items) return match ~= nil end -reschedule = function(text, ids, items) +reschedule = function(text, ids, items, alternatives) if not items then local info = windower.ffxi.get_bag_info(bag_name_to_id.inventory) items = {inventory = windower.ffxi.get_items(bag_name_to_id.inventory)} @@ -354,10 +363,13 @@ reschedule = function(text, ids, items) return false end - for id in L(ids):it() do - if collect_item(id, items) then + for index, id in ipairs(ids) do + local waiting = collect_item(id, items, alternatives and index < #ids) + if waiting then windower.send_command:prepare('input %s':format(text)):schedule(settings.Delay) return true + elseif alternatives and waiting == false then + return false end end end @@ -384,10 +396,13 @@ windower.register_event('outgoing text', function() end if name then - if settings.UseUniversalTools[name] == false or windower.ffxi.get_player().main_job ~= 'NIN' then - return reschedule(text, {spec_tools[name], windower.ffxi.get_player().main_job == 'NIN' and gen_tools[name] or nil}) + local main_nin = windower.ffxi.get_player().main_job == 'NIN' + if settings.UseUniversalTools[name] == false or not main_nin then + return reschedule(text, {spec_tools[name], main_nin and gen_tools[name] or nil}) + elseif settings.NinjaToolFallback then + return reschedule(text, {gen_tools[name], spec_tools[name]}, nil, true) else - return reschedule(text, {windower.ffxi.get_player().main_job == 'NIN' and gen_tools[name] or nil}) + return reschedule(text, {gen_tools[name]}) end end @@ -430,6 +445,8 @@ end()) Copyright © 2013-2015, Ihina All rights reserved. +Local modifications (2026): Ninjutsu tool fallback. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/addons/itemizer/readme.md b/addons/itemizer/readme.md index 017babc59..973ebd83f 100644 --- a/addons/itemizer/readme.md +++ b/addons/itemizer/readme.md @@ -25,14 +25,19 @@ Toggles the auto-stacking of items when moving items to non-inventory bags. (Def itemizer autoninjatools (shortened: ant) ``` -Toggles the auto-pulling of ninja tools from bags when not in your bag. Prioritizes specific tools then moves to universal unless the next command is used to set the tools to only use universal tools for specific spells. (Default: True) +Toggles automatic retrieval of missing ninja tools from accessible bags. (Default: True) ``` -itemizer useuniversaltools (shortened: uut) +itemizer useuniversaltool (shortened: uut) ``` -Toggles the use of only universal tools for `spell`. Does not use :ichi or :ni suffixes. (Default: False for all spells) -For Example: itemiser uut katon +Toggles universal tool preference for `spell` on NIN main. Omit the :ichi or :ni suffix. Enabled by default for all spells. For example, `itemizer uut katon` toggles the preference for Katon. + +``` +itemizer ninjatoolfallback (shortened: ntf) +``` + +Toggles fallback to the spell-specific tool on NIN main. It applies only when automatic ninja tool retrieval is enabled, the spell prefers a universal tool, and Itemizer cannot find that tool. For example, Utsusemi falls back from Shikanofuda to Shihei and Katon falls back from Inoshishinofuda to Uchitake. This setting defaults to on. ``` get [bag] [count] From f2c00292d3ab1c874d73da687a030a319255dec2 Mon Sep 17 00:00:00 2001 From: ianandersonlol <960562+ianandersonlol@users.noreply.github.com> Date: Thu, 5 Nov 2026 20:00:30 -0800 Subject: [PATCH 2/2] fix license --- addons/itemizer/itemizer.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/itemizer/itemizer.lua b/addons/itemizer/itemizer.lua index c3d33545b..843683bb4 100644 --- a/addons/itemizer/itemizer.lua +++ b/addons/itemizer/itemizer.lua @@ -442,11 +442,9 @@ windower.register_event('outgoing text', function() end()) --[[ -Copyright © 2013-2015, Ihina +Copyright © 2013-2026, Ihina All rights reserved. -Local modifications (2026): Ninjutsu tool fallback. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: