Skip to content

Commit a3687d1

Browse files
cyritecyrite
authored
v15.7.3 (#478)
* Bumping Trust to v14.7.3 * Fixing issue creating new gambits * Making command box wider * 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 --------- Co-authored-by: cyrite <[email protected]>
1 parent 5d2678c commit a3687d1

File tree

7 files changed

+65
-12
lines changed

7 files changed

+65
-12
lines changed

‎Trust.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_addon.author = 'Cyrite'
22
_addon.commands = {'Trust','trust'}
33
_addon.name = 'Trust'
4-
_addon.version = '15.7.2'
4+
_addon.version = '15.7.3'
55
_addon.release_notes = ""
66
_addon.release_url = "https://github.com/cyritegamestudios/trust/releases"
77
_addon.start_time = os.time()

‎commands/AssistCommands.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function AssistTrustCommands:handle_assist_player(party_member_name, mirror)
5353

5454
self.trust:get_party():set_assist_target(alliance_member)
5555

56-
if mirror then
56+
if mirror == "true" then
5757
for mode_name in L{ 'CombatMode' }:it() do
5858
handle_set(mode_name, 'Mirror')
5959
end

‎commands/GeneralCommands.lua‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,15 +254,11 @@ end
254254

255255
-- // trust debug
256256
function GeneralTrustCommands:handle_debug()
257-
local HasKeyItemsCondition = require('cylibs/conditions/has_key_items')
258-
local heal_condition = HasKeyItemsCondition.new(L{ "\"Rhapsody in Crimson\"" })
259-
local heal_condition = HasBuffsCondition.new(L{"Accuracy Down", "addle", "AGI Down", "Attack Down", "bind", "Bio", "Burn", "Choke", "CHR Down", "Defense Down", "DEX Down", "Dia", "Drown", "Elegy", "Evasion Down", "Frost", "Inhibit TP", "INT Down", "Magic Acc. Down", "Magic Atk. Down", "Magic Def. Down", "Magic Evasion Down", "Max HP Down", "Max MP Down", "Max TP Down", "MND Down", "Nocturne", "Rasp", "Requiem", "Shock", "slow", "STR Down", "VIT Down", "weight", "Flash"}, 1)
260-
local heal_condition = HasBuffsCondition.new(L{"Accuracy Down", "addle", "AGI Down", "Attack Down", "bind", "Bio", "Burn", "Choke", "CHR Down", "Defense Down", "DEX Down", "Dia", "Drown", "Elegy", "Evasion Down", "Frost", "Inhibit TP", "INT Down", "Magic Acc. Down", "Magic Atk. Down", "Magic Def. Down", "Magic Evasion Down", "Max HP Down", "Max MP Down", "Max TP Down", "MND Down", "Nocturne", "Rasp", "Requiem", "Shock", "slow", "STR Down", "VIT Down", "weight", "Flash"}, 1)
257+
local mob = windower.ffxi.get_mob_by_name("Pulse Martello")
258+
print(mob.name, mob.is_npc, mob.entity_type, mob.in_party, mob.in_alliance, mob.valid_target)
261259

262260

263261

264-
print(Condition.check_conditions(L{ heal_condition }, windower.ffxi.get_mob_by_name('Cyrite').index))
265-
266262
--local EquipSetAction = require('cylibs/actions/equip_set')
267263
--local EquipSet = require('cylibs/inventory/equipment/equip_set')
268264
--local EquipSet = require('cylibs/battle/equip_set')

‎cylibs/battle/monsters/mob_filter.lua‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,16 @@ end
3939
-- @tparam list filter (optional) List of MobFilter filters
4040
-- @treturn list List of mobs
4141
function MobFilter:get_nearby_mobs(conditions)
42-
conditions = conditions:flatten(false)
42+
local all_conditions = L{}
43+
for condition in conditions:it() do
44+
if class(condition) == 'List' then
45+
all_conditions = all_conditions + condition
46+
else
47+
all_conditions:append(condition)
48+
end
49+
end
50+
conditions = all_conditions
51+
4352
conditions = self:get_default_conditions() + conditions
4453

4554
local mobs = L{}

‎cylibs/conditions/is_npc.lua‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---------------------------
2+
-- Condition checking whether the target is an NPC.
3+
-- @class module
4+
-- @name IsNpcCondition
5+
6+
local Condition = require('cylibs/conditions/condition')
7+
local IsNpcCondition = setmetatable({}, { __index = Condition })
8+
IsNpcCondition.__index = IsNpcCondition
9+
IsNpcCondition.__type = "IsNpcCondition"
10+
IsNpcCondition.__class = "IsNpcCondition"
11+
12+
function IsNpcCondition.new()
13+
local self = setmetatable(Condition.new(), IsNpcCondition)
14+
return self
15+
end
16+
17+
function IsNpcCondition:is_satisfied(target_index)
18+
local target = windower.ffxi.get_mob_by_index(target_index)
19+
if target then
20+
print(target.name, target.is_npc, target.entity_type, target.spawn_type, target.valid_target)
21+
return target.is_npc
22+
end
23+
return false
24+
end
25+
26+
function IsNpcCondition:get_config_items()
27+
end
28+
29+
function IsNpcCondition:tostring()
30+
return "Is NPC"
31+
end
32+
33+
function IsNpcCondition.description()
34+
return "Is NPC."
35+
end
36+
37+
function IsNpcCondition.valid_targets()
38+
return S{ Condition.TargetType.Ally }
39+
end
40+
41+
function IsNpcCondition:serialize()
42+
return "IsNpcCondition.new()"
43+
end
44+
45+
return IsNpcCondition
46+
47+
48+
49+

‎cylibs/trust/roles/puller.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
local AggroedCondition = require('cylibs/conditions/aggroed')
22
local Approach = require('cylibs/battle/approach')
3-
local ClaimedCondition = require('cylibs/conditions/claimed')
43
local ConditionalCondition = require('cylibs/conditions/conditional')
54
local DisposeBag = require('cylibs/events/dispose_bag')
65
local Engage = require('cylibs/battle/engage')

‎manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "15.7.2",
3-
"download_url": "https://github.com/cyritegamestudios/trust/releases/download/v15.7.2/trust.zip"
2+
"version": "15.7.3",
3+
"download_url": "https://github.com/cyritegamestudios/trust/archive/refs/heads/alpha.zip"
44
}

0 commit comments

Comments
 (0)