v15.7.4 (#479)

* Skillchain editor refactor

* Fixing index issue

* Updating default settings

* Fixing commands

* Removing debug code

* Adding skillchain modes back

* Adjusting skillchain editor size

* Adding Fast Blade II and Dragon Blow to skills

* Bug fixes

* Cleanup

* Skillchain step edit permissions

* Bumping Trust to v14.8.0

* PR feedback

* PR feedback

* Bumping Trust to v14.8.1

* Updating song duration for Miracle Cheer

* Bumping Trust to v14.8.3

* Bumping Trust to v14.8.4

* Bumping Trust to v14.8.6

* Fixing reactions

* Bumping Trust to v14.8.7

* Adding migration for ResingDuration and ResingMissingSongs

* Adding countdown timer for resinging

* Bumping Trust to v14.9.0

* Adding Miracle Cheer duration

* Bumping Trust to v14.9.2

* Fixing alliance assisting

* Bumping Trust to v14.9.3

* Preparation for alliance buffs

* PR feedback

* Adding DebuffCommands

* Bumping Trust to v14.9.4

* Fixing buff gambit editor

* Updating Status > Party

* Bumping Trust to v15.0.0

* Cleanup

* Added commands to add and remove alliance members from the healing blacklist

* Healer blacklist commands

* Fixing default values for CommandsMenuItem

* Fixes

* Adding DummySongThreshold

* Updating song settings descriptions

* Adding inventory and bag menus

* Adding EquipSetView

* Adding equip set view

* Updating .gitignore

* Fixes

* Adding EquipmentPickerView

* Integrating equipment picker

* Updating slots working

* Adding temp slot cursor

* Flattening EquipSetView

* Cleanup

* Update equip set when picking item

* Update generate_items.py

* Update generate_resources.yml

* Update generate_items.py

* Update generate_items.py

* Updating resource database

* Adding item_descriptions table

* Adding ItemDescriptionView

* Item description

* Saving EquipSet to database

* Added EquipSet database support

* Removing debug code

* Hiding ItemDescriptionView when EquipmentPickerView does not have focus

* Adding up and down button support for grid layout

* Cleanup

* Adding action to equip gear

* Fixing content offset issue when reloading picker view

* Adjusting offset for EquipSetView cursor

* Equip set validation

* Adding empty items

* Adding ext_data field for each slot in equip_sets table

* Auto adjusting dummy song threshold when Clarion Call is active

* PR feedback

* Simplifying EquipSet to use slot ids

* Fixing save equip set

* Saving enabled of gambits

* PR feedback

* Adding EquipmentSettingsMenuItem

* Adding search for pickers

* Hiding search on escape

* Better handling of focus during search

* Adding search to HasBuffsCondition

* Adjusting size of search bar

* Bumping Trust to v15.0.2

* PR feedback

* Fixing search caching issue

* Updating GambitSettingsMenuItem to use FFXIFastPickerView when there is a single config item

* Disabling stop path button when no path is running

* FFXIFastPickerView fixes

* Refactor BuildSkillchainSettingsMenuItem

* Fixing issues with skillchain builder settings getting reverted

* Bumping Trust to v15.0.4

* Removing debug code

* Bumping Trust to v15.0.5

* Adding item description to infoView for FFXIFastPickerView

* Adding numItemsRequired to FFXIFastPickerView

* Migrating HasBuffCondition to FFXIFastPickerView

* Fixing edge cases with picker

* Setting min and max num items for multi pickers

* Fixing more edge cases

* Fixing more edge cases

* Adding menu cursor memory

* Fixing issue with debuff blacklist

* Bumping Trust to v15.1.0

* PR feedback

* Resetting menu index when backing out of a menu

* Disabling equipment settings

* Updating cures to check every 500 ms

* PR feedback

* Fixing missing get_ability_id in script

* Removing reference to get_cure_threshold

* Bumping Trust to v15.2.2

* Fixing healer interval

* Cleanup

* Fixing FFXIFastPickerView performance issue

* Fixing MP cost for Blood Pact: Ward

* Removing MinManaPointsCondition from MagicBurster and Nuker

* Bumping Trust to v15.2.4

* Fixing issue where skillchain didn't show up in ability picker in skillchain editor

* Bumping Trust to v15.2.5

* Removing Grants ability descriptions temporarily

* Refactoring rolling

* Updating RollSettingsMenuItem

* Updating COR gambits

* More roller tweaks

* Adding bust logic to phantom roll

* Removing unsed condition

* Intermediate roller

* Fixing issue with skillchain ability property list growing

* Fixed issue where job ability action wasn't using the right identifier

* Adding help text to roll menu

* Bumping Trust to v15.3.0

* PR feedback

* Making QuickDraw retry

* Fixing issue where first item in picker doesn't get selected when switching focus

* Flattening FollowSettingsMenuItem

* Adding KeyItemCountCondition

* Fixing more edge cases with FFXIFastPickerView

* Reverting FFXIFastPickerView for GambitSettingsMenuItem

* Initial rewrite of GambitSettingsMenuItem

* Bumping Trust to v15.3.1

* PR feedback

* Fixing issue where spells with job abilities would not execute if job ability buff was already active

* Migrating StatusRemover

* Status removal gambits

* Finishing StatusRemoval migration

* Adding get_default_conditions to job

* Adding // trust target clear

* Bumping Trust to v15.4.0

* PR feedback

* Fixing get_conditions_for_ability for Scholar

* Removing references to trust_settings.StatusRemovals

* Adding Snake Eye to Double-Up on unlucky roll

* Bumping Trust to v15.4.2

* Refactoring Indi and Geocolures

* Bumping Trust to v15.5.0

* PR feedback

* Updating CorsairWidget

* Updating widget

* Updating widget

* Cleaning up widget

* Updating Snake Eye gambits

* Bump Trust to v15.5.1

* Updating for bolster

* Fixing nil exception in bubbler

* Adding PartyHasMainJobCondition

* PR feedback

* Updating default WHM settings

* Updating priorities of healing, status removals, rolling and singing

* Bumping Trust to v15.5.4

* Adding Curaga to status removal gambit library

* Bumping Trust to v15.5.5

* Bumping Trust to v15.5.6

* Removing range check from party member count condition if distance not specified

* Adding // trust blu equip command and fixing migration error for cure settings

* Adding timeout command

* Removing print statement

* Fixing error with party member count condition description

* Removing skillchain migration

* Bumping Trust to v15.6.3

* Fixed job ability action for jumps

* Adding debuffs for Tenebral Crush and Silent Storm

* Adding AutoRestoreManaMode check to Elemental Siphon

* Fixed issue where skillchain would spam after missing a step window

* Fixing issue where Haste conflicted with Geo-Haste

* Removing commented out code

* Allowing duplicate puller roles

* Bumping Trust to v15.7.1

* Updating check for conflicting addons

* Adding sub job spells to pull actions

* Removing sub job puller role

* Fixing // trust assist command in UI

* PR feedback

* Updating layout of HealerSettings

* Adding InBattleCondition to default RUN tank gambits

* Bumping Trust to v15.7.4

* PR feedback

---------

Co-authored-by: cyrite <[email protected]>

Author: cyrite

Trust.lua

@@ -1,7 +1,7 @@
 _addon.author = 'Cyrite'
 _addon.commands = {'Trust','trust'}
 _addon.name = 'Trust'
-_addon.version = '15.7.3'
+_addon.version = '15.7.4'
 _addon.release_notes = ""
 _addon.release_url = "https://github.com/cyritegamestudios/trust/releases"
 _addon.start_time = os.time()

commands/HealCommands.lua

@@ -148,7 +148,7 @@ function StatusRemovalCommands.new()
     self:add_command('default', self.handle_set_status_mode, 'Remove status effects from self and party', L{
         PickerConfigItem.new('mode_value', state.AutoStatusRemovalMode.value, L(state.AutoStatusRemovalMode:options()), nil, "Status Removals")
     })
-
+    
     return self
 end
 

data/RUN.lua

@@ -38,8 +38,8 @@ return {
         GambitSettings = {
             Default = L{
                 Gambit.new("Self", L{GambitCondition.new(MaxHitPointsPercentCondition.new(30), "Self"), GambitCondition.new(HasRunesCondition.new(3), "Self")}, JobAbility.new("Vivacious Pulse", L{}, L{}), "Self", L{}),
-                Gambit.new("Enemy", L{GambitCondition.new(ModeCondition.new("AutoTankMode", "Auto"), "Self")}, Spell.new("Flash", L{}, L{}, nil, L{}), "Enemy", L{}),
-                Gambit.new("Self", L{GambitCondition.new(ModeCondition.new("AutoTankMode", "Auto"), "Self")}, Spell.new("Foil", L{}, L{}, nil, L{}), "Self", L{}),
+                Gambit.new("Enemy", L{GambitCondition.new(ModeCondition.new("AutoTankMode", "Auto"), "Self"), GambitCondition.new(InBattleCondition.new(), "Self")}, Spell.new("Flash", L{}, L{}, nil, L{}), "Enemy", L{}),
+                Gambit.new("Self", L{GambitCondition.new(ModeCondition.new("AutoTankMode", "Auto"), "Self"), GambitCondition.new(InBattleCondition.new(), "Self")}, Spell.new("Foil", L{}, L{}, nil, L{}), "Self", L{}),
             },
             Gambits = L{
                 Gambit.new("Self", L{GambitCondition.new(ModeCondition.new("AutoFoodMode", "Auto"), "Self"), GambitCondition.new(NotCondition.new(L{HasBuffCondition.new("Food")}), "Self"), GambitCondition.new(MainJobCondition.new("RUN"), "Self")}, UseItem.new("Miso Ramen", L{ItemCountCondition.new("Miso Ramen", 1, ">=")}), "Self", L{"food"}),

manifest.json

@@ -1,4 +1,4 @@
 {
-  "version": "15.7.3",
-  "download_url": "https://github.com/cyritegamestudios/trust/releases/download/v15.7.3/trust.zip"
+  "version": "15.7.4",
+  "download_url": "https://github.com/cyritegamestudios/trust/archive/refs/heads/alpha.zip"
 }

ui/settings/menus/healing/HealerSettingsMenuItem.lua

@@ -1,20 +1,31 @@
-local ButtonItem = require('cylibs/ui/collection_view/items/button_item')
 local FFXIClassicStyle = require('ui/themes/FFXI/FFXIClassicStyle')
-local FFXIPickerView = require('ui/themes/ffxi/FFXIPickerView')
 local GambitEditorStyle = require('ui/settings/menus/gambits/GambitEditorStyle')
 local GambitTarget = require('cylibs/gambits/gambit_target')
-local MenuItem = require('cylibs/ui/menu/menu_item')
 local MultiPickerConfigItem = require('ui/settings/editors/config/MultiPickerConfigItem')
 
 local GambitSettingsMenuItem = require('ui/settings/menus/gambits/GambitSettingsMenuItem')
 local HealerSettingsMenuItem = setmetatable({}, {__index = GambitSettingsMenuItem })
 HealerSettingsMenuItem.__index = HealerSettingsMenuItem
 
 
+function HealerSettingsMenuItem.descriptionForGambit(gambit)
+    local hppRangeCondition = gambit:getConditions():firstWhere(function(condition)
+        if condition:getCondition().__type == HitPointsPercentRangeCondition.__type then
+            return true
+        end
+        return false
+    end)
+    --if hppRangeCondition then
+    --    return string.format("%s: %s (%s)", gambit:getAbilityTarget(), gambit:getAbility():get_name(), hppRangeCondition:tostring())
+    --else
+        return string.format("%s: %s", gambit:getAbilityTarget(), gambit:getAbility():get_name())
+    --end
+end
+
 function HealerSettingsMenuItem.new(trust, trustSettings, trustSettingsMode, trustModeSettings)
     local editorStyle = GambitEditorStyle.new(function(gambits)
         local configItem = MultiPickerConfigItem.new("Gambits", L{}, gambits, function(gambit, _)
-            return gambit:tostring(), gambit:isEnabled() and gambit:isValid()
+            return HealerSettingsMenuItem.descriptionForGambit(gambit), gambit:isEnabled() and gambit:isValid()
         end, "Gambits", nil, nil, function(gambit, _)
             if not gambit:isValid() then
                 return "Unavailable on current job or settings."
@@ -24,7 +35,7 @@ function HealerSettingsMenuItem.new(trust, trustSettings, trustSettingsMode, tru
         end)
         configItem:setNumItemsRequired(1, 1)
         return L{ configItem }
-    end, FFXIClassicStyle.WindowSize.Editor.ConfigEditorExtraLarge, "Heal", "Heals", nil, function(menuItemName)
+    end, FFXIClassicStyle.WindowSize.Picker.Default, "Heal", "Heals", nil, function(menuItemName)
         return L{ 'Add', 'Remove', 'Edit', 'Move Up', 'Move Down', 'Reset', 'Modes', 'Shortcuts', 'Blacklist' }:contains(menuItemName)
     end)
     editorStyle:setEditPermissions(