Skip to content

Commit 54869ae

Browse files
AthrogatePEQAthrogatePEQ
committed
Updates
1 parent c2532d4 commit 54869ae

13 files changed

+180
-112
lines changed

‎e3 Includes/FindAugsCmd.inc

+18-9
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ Sub DisplayIfItemAugWhiteListed(augname, itemName)
162162
/return
163163

164164
Sub ForEachItem(callback)
165+
|/bc ForEachItem ${callback}
165166
/declare packSlot int local
166167
/declare index int local
167168
/declare itemName string local
@@ -170,24 +171,32 @@ Sub ForEachItem(callback)
170171
/declare augs int local
171172

172173
/for index 23 to 30
174+
|/bc index: ${index}
173175
/if (${Me.Inventory[${index}].Container}) {
174-
/for packSlot 1 to 10
176+
/for packSlot 1 to ${Me.Inventory[${index}].Container}
175177
/if (${Me.Inventory[${index}].Item[${packSlot}].ID} && ${Me.Inventory[${index}].Item[${packSlot}].Augs} > 0) {
176-
/varset augcount ${Me.Inventory[${index}].Augs}
178+
179+
/varset augcount ${Me.Inventory[${index}].Item[${packSlot}].Augs}
177180
/for augs 1 to ${augcount}
178-
/varset augName ${Me.Inventory[${index}].Item[${packSlot}].Item[${augs}]}
179-
/varset itemName ${Me.Inventory[${index}].Item[${packSlot}].Name}
180-
/call ${callback} "${augName}" "${itemName}"
181+
/if (${Me.Inventory[${index}].Item[${packSlot}].Item[${augs}].ID}) {
182+
/varset augName ${Me.Inventory[${index}].Item[${packSlot}].Item[${augs}]}
183+
/varset itemName ${Me.Inventory[${index}].Item[${packSlot}].Name}
184+
| /bc i: ${index} p: ${packSlot} a: ${augs} [${Me.Inventory[${index}].Name}] [${Me.Inventory[${index}].Item[${packSlot}].Name}] ${Me.Inventory[${index}].Item[${packSlot}].Augs}
185+
| /bc call ${callback} "${augName}" "${itemName}"
186+
/call ${callback} "${augName}" "${itemName}"
187+
}
181188
/next augs
182189
}
183190
/next packSlot
184191
} else {
185192
/if (${Me.Inventory[${index}].ID} && ${Me.Inventory[${index}].Augs} > 0) {
186193
/varset augcount ${Me.Inventory[${index}].Augs}
187194
/for augs 1 to ${augcount}
188-
/varset augName ${Me.Inventory[${index}].Item[${augs}]}
189-
/varset itemName ${Me.Inventory[${index}].Name}
190-
/call ${callback} "${augName}" "${itemName}"
195+
/if (${Me.Inventory[${index}].Item[${augs}].ID}) {
196+
/varset augName ${Me.Inventory[${index}].Item[${augs}]}
197+
/varset itemName ${Me.Inventory[${index}].Name}
198+
/call ${callback} "${augName}" "${itemName}"
199+
}
191200
/next augs
192201
}
193202
}
@@ -201,7 +210,7 @@ Sub Event_FindAugedCmd(line, ChatSender, eventParams)
201210
/varset ChatSender ${Macro.Return.Arg[1,_]}
202211
| |-----------Valid User----------| |--------Included Bot-----------| |-----------In Zone-------------| |------------In Range------------|
203212
/if (${Bool[${Macro.Return.Arg[2,_]}]} && ${Bool[${Macro.Return.Arg[3,_]}]} && ${Bool[${Macro.Return.Arg[4,_]}]} && ${Bool[${Macro.Return.Arg[5,_]}]}) {
204-
/if (!${Defined[facReturn]}) /declare facReturn string outer
213+
/if (!${Defined[facReturn]}) /declare facReturn string outer
205214
/call ForEachItem DisplayIfItemAugWhiteListed
206215
} else {
207216
}

‎e3 Includes/e3_Assists.inc

+26-26
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,8 @@ SUB useBurns(ArrayName)
12511251
} else {
12521252
/if (${Debug} || ${Debug_Assists}) /echo NotReady: ${i} ${${ArrayName}[${i},${iCastName}]}
12531253
}
1254-
/delay 1
12551254
:skipCurrent
1255+
/delay 1
12561256
/if (!${ActionTaken}) /next i
12571257
/if (${Debug} || ${Debug_Assists}) /echo <== useBurns -|
12581258
/RETURN
@@ -1327,7 +1327,7 @@ SUB event_NukeSet(line, ChatSender, NukeArray)
13271327
/for s 1 to ${SelfBuffs.Size}
13281328
/if (${SelfBuffs[${s}].Find[XII]}) {
13291329
/varset sbpi ${s}
1330-
/echo poison found in ${sbpi} ${SelfBuffs[${sbpi}].Find[XII]} ${SelfBuffs[${sbpi}]}
1330+
/if (${Debug} || ${Debug_Assists}) /echo poison found in ${sbpi} ${SelfBuffs[${sbpi}].Find[XII]} ${SelfBuffs[${sbpi}]}
13311331
}
13321332
/next s
13331333

@@ -1366,10 +1366,10 @@ SUB event_NukeSet(line, ChatSender, NukeArray)
13661366
/if (${SelfBuffs.Size}) /call BuildSpellArray "SelfBuffs" "SelfBuffs2D"
13671367

13681368
/for s 1 to ${CombatBuffs2D.Size[1]}
1369-
/echo [${CombatBuffs2D[${s},${iCastName}]}]
1369+
/if (${Debug} || ${Debug_Assists}) /echo [${CombatBuffs2D[${s},${iCastName}]}]
13701370
/next s
13711371
/for s 1 to ${SelfBuffs2D.Size[1]}
1372-
/echo [${SelfBuffs2D[${s},${iCastName}]}]
1372+
/if (${Debug} || ${Debug_Assists}) /echo [${SelfBuffs2D[${s},${iCastName}]}]
13731373
/next s
13741374
}
13751375
}
@@ -1451,30 +1451,30 @@ Sub assist_Setup
14511451

14521452

14531453
| Epic Definitions for EpicBurn - warr, shd, pal,
1454-
/if (${FindItemCount[="Prismatic Dragon Blade"]}) /declare EpicName string outer "Prismatic Dragon Blade"
1455-
/if (${FindItemCount[="Blade of Vesagran"]}) /declare EpicName string outer "Blade of Vesagran"
1454+
/if (${FindItemCount[Prismatic Dragon Blade]}) /declare EpicName string outer "Prismatic Dragon Blade"
1455+
/if (${FindItemCount[Blade of Vesagran]}) /declare EpicName string outer "Blade of Vesagran"
14561456
|/if (${FindItemCount["Savage Lord's Totem"]}) /declare EpicName string outer "Savage Lord's Totem"
14571457
|/if (${FindItemCount["Spiritcaller Totem of the Feral"]}) /declare EpicName string outer "Spiritcaller Totem of the Feral"
1458-
/if (${FindItemCount[="Raging Taelosian Alloy Axe"]}) /declare EpicName string outer "Raging Taelosian Alloy Axe"
1459-
/if (${FindItemCount[="Vengeful Taelosian Blood Axe"]}) /declare EpicName string outer "Vengeful Taelosian Blood Axe"
1460-
/if (${FindItemCount[="Staff of Living Brambles"]}) /declare EpicName string outer "Staff of Living Brambles"
1461-
/if (${FindItemCount[="Staff of Everliving Brambles"]}) /declare EpicName string outer "Staff of Everliving Brambles"
1462-
/if (${FindItemCount[="Fistwraps of Celestial Discipline"]}) /declare EpicName string outer "Fistwraps of Celestial Discipline"
1463-
/if (${FindItemCount[="Transcended Fistwraps of Immortality"]}) /declare EpicName string outer "Transcended Fistwraps of Immortality"
1464-
/if (${FindItemCount[="Redemption"]}) /declare EpicName string outer "Redemption"
1465-
/if (${FindItemCount[="Nightbane, Sword of the Valiant"]}) /declare EpicName string outer "Nightbane, Sword of the Valiant"
1466-
/if (${FindItemCount[="Heartwood Blade"]}) /declare EpicName string outer "Heartwood Blade"
1467-
/if (${FindItemCount[="Aurora, the Heartwood Blade"]}) /declare EpicName string outer "Aurora, the Heartwood Blade"
1468-
/if (${FindItemCount[="Fatestealer"]}) /declare EpicName string outer "Fatestealer"
1469-
/if (${FindItemCount["Nightshade, Blade of Entropy"]}) /declare EpicName string outer "Nightshade, Blade of Entropy"
1470-
/if (${FindItemCount[="Innoruuk's Voice"]}) /declare EpicName string outer "Innoruuk's Voice"
1471-
/if (${FindItemCount[="Innoruuk's Dark Blessing"]}) /declare EpicName string outer "Innoruuk's Dark Blessing"
1472-
/if (${FindItemCount[="Crafted Talisman of Fates"]}) /declare EpicName string outer "Crafted Talisman of Fates"
1473-
/if (${FindItemCount[="Blessed Spiritstaff of the Heyokah"]}) /declare EpicName string outer "Blessed Spiritstaff of the Heyokah"
1474-
/if (${FindItemCount[="Staff of Prismatic Power"]}) /declare EpicName string outer "Staff of Prismatic Power"
1475-
/if (${FindItemCount[="Staff of Phenomenal Power"]}) /declare EpicName string outer "Staff of Phenomenal Power"
1476-
/if (${FindItemCount[="Soulwhisper"]}) /declare EpicName string outer "Soulwisper"
1477-
/if (${FindItemCount[="Deathwhisper"]}) /declare EpicName string outer "Deathwisper"
1458+
/if (${FindItemCount[Raging Taelosian Alloy Axe]}) /declare EpicName string outer "Raging Taelosian Alloy Axe"
1459+
/if (${FindItemCount[Vengeful Taelosian Blood Axe]}) /declare EpicName string outer "Vengeful Taelosian Blood Axe"
1460+
/if (${FindItemCount[Staff of Living Brambles]}) /declare EpicName string outer "Staff of Living Brambles"
1461+
/if (${FindItemCount[Staff of Everliving Brambles]}) /declare EpicName string outer "Staff of Everliving Brambles"
1462+
/if (${FindItemCount[Fistwraps of Celestial Discipline]}) /declare EpicName string outer "Fistwraps of Celestial Discipline"
1463+
/if (${FindItemCount[Transcended Fistwraps of Immortality]}) /declare EpicName string outer "Transcended Fistwraps of Immortality"
1464+
/if (${FindItemCount[Redemption]}) /declare EpicName string outer "Redemption"
1465+
/if (${FindItemCount[Nightbane, Sword of the Valiant]}) /declare EpicName string outer "Nightbane, Sword of the Valiant"
1466+
/if (${FindItemCount[=Heartwood Blade]}) /declare EpicName string outer "Heartwood Blade"
1467+
/if (${FindItemCount[Aurora, the Heartwood Blade]}) /declare EpicName string outer "Aurora, the Heartwood Blade"
1468+
/if (${FindItemCount[Fatestealer]}) /declare EpicName string outer "Fatestealer"
1469+
/if (${FindItemCount[Nightshade, Blade of Entropy]}) /declare EpicName string outer "Nightshade, Blade of Entropy"
1470+
/if (${FindItemCount[Innoruuk's Voice]}) /declare EpicName string outer "Innoruuk's Voice"
1471+
/if (${FindItemCount[Innoruuk's Dark Blessing]}) /declare EpicName string outer "Innoruuk's Dark Blessing"
1472+
/if (${FindItemCount[Crafted Talisman of Fates]}) /declare EpicName string outer "Crafted Talisman of Fates"
1473+
/if (${FindItemCount[Blessed Spiritstaff of the Heyokah]}) /declare EpicName string outer "Blessed Spiritstaff of the Heyokah"
1474+
/if (${FindItemCount[Staff of Prismatic Power]}) /declare EpicName string outer "Staff of Prismatic Power"
1475+
/if (${FindItemCount[Staff of Phenomenal Power]}) /declare EpicName string outer "Staff of Phenomenal Power"
1476+
/if (${FindItemCount[=Soulwhisper]}) /declare EpicName string outer "Soulwisper"
1477+
/if (${FindItemCount[=Deathwhisper]}) /declare EpicName string outer "Deathwisper"
14781478
|/if (${FindItemCount["Champions Sword of Eternal Power"]}) /declare EpicName string outer "Champions Sword of Eternal Power"
14791479
|/if (${FindItemCount["Kreljnok's Sword of Eternal Power"]}) /declare EpicName string outer "Kreljnok's Sword of Eternal Power"
14801480
|/if (${FindItemCount["Staff of Elemental Essence"]}) /declare EpicName string outer "Staff of Elemental Essence"

‎e3 Includes/e3_AugReport.inc

+20-14
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ Sub Event_AugReport(line, chatSender, args)
2727
}
2828
/next i
2929

30-
/call #QuickSort AR:AugArray 1 ${AugCount} .Arg[2,:]
31-
/call #QuickSort AR:AugArray 1 ${AugCount} .Arg[1,:]
30+
|/call #QuickSort AR:AugArray 1 ${AugCount} .Arg[2,:]
31+
|/call #QuickSort AR:AugArray 1 ${AugCount} .Arg[1,:]
32+
33+
/mergesort AR:AugArray "${Math.Calc[${%%.Arg[1,:]} * 1000].Int}"
34+
|/call #PrintArray AR:AugArray
35+
|/return
3236

3337
/declare AugData string local
3438
/varcalc i ${AugCount}
@@ -45,11 +49,11 @@ Sub Event_AugReport(line, chatSender, args)
4549

4650
Sub GetAugDetails(ItemRef, LocRef)
4751
/declare DisplayAugType bool local true
48-
/declare DisplayEffects bool local false
52+
/declare DisplayEffects bool local true
4953
/declare i int local
5054
/declare j int local
5155
/declare ret string local
52-
/declare hp_mana string local
56+
/declare hp_mana int local
5357
/declare RelevantStats string local AC~AC|Avoidance~Avoid|Shielding~Shielding|Accuracy~Acc|CombatEffects~Combat|Attack~Atk|Haste~Haste|
5458
/declare RelevantAugTypes string local |7|8|
5559
/declare StatCount int local ${RelevantStats.Count[|]}
@@ -65,11 +69,13 @@ Sub GetAugDetails(ItemRef, LocRef)
6569
/varcalc AugType ${${ItemRef}.AugSlot${i}}
6670
/if (${RelevantAugTypes.Find[|${AugType}|]}) {
6771
/if (${Bool[${${AugRef}}]}) {
68-
/varset hp_mana ${${AugRef}.HP}:${${AugRef}.Mana}
72+
|/varset hp_mana ${${AugRef}.HP}:${${AugRef}.Mana}
73+
/varset hp_mana ${Int[ ${Math.Calc[${${AugRef}.HP} + ${${AugRef}.Mana} ]} ]}
74+
/varset hp_mana ${Int[ ${Math.Calc[ ${hp_mana} + ${${AugRef}.AC} ]} ]}
6975
|/varset ret ${ret}${hp_mana}:${PadR[${LocRef}:,12, ]}
7076
|/varset ret ${ret} H: ${PadL[${${AugRef}.HP},3, ]}
7177
|/varset ret ${ret} M: ${PadL[${${AugRef}.Mana},3, ]}
72-
/varset ret ${ret}${hp_mana}:${LocRef}:
78+
/varset ret ${ret}${hp_mana}:0:${LocRef}:
7379
/varset ret ${ret} H: ${${AugRef}.HP}
7480
/varset ret ${ret} M: ${${AugRef}.Mana}
7581

@@ -81,14 +87,14 @@ Sub GetAugDetails(ItemRef, LocRef)
8187
/varset ret ${ret} ${StatAlias}: ${${AugRef}.${StatName}}
8288
}
8389
/next j
84-
|/if (${DisplayEffects}) {
85-
| /if (${${AugRef}.EffectCount}) {
86-
| /varset ret ${ret} Effects:
87-
| /for j 1 to ${${AugRef}.EffectCount}
88-
| /varset ret ${ret} [${${AugRef}.Effects[${j}].Name}]
89-
| /next j
90-
| }
91-
|}
90+
/if (${DisplayEffects}) {
91+
/if (${${AugRef}.EffectCount}) {
92+
/varset ret ${ret} Effects:
93+
/for j 1 to ${${AugRef}.EffectCount}
94+
/varset ret ${ret} [${${AugRef}.Effects[${j}].Name}]
95+
/next j
96+
}
97+
}
9298
/varset ret ${ret}|
9399
} else {
94100
|/varset ret ${ret}0:0:${PadR[${LocRef}:,12, ]} ${PadR[EMPTY,13, ]} Type: ${AugType}|

‎e3 Includes/e3_Basics.inc

+4-1
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,10 @@ SUB EVENT_Swap_Items(line, IniEntry)
949949
/echo \ay << Swap_Items: I have no listing for [${IniEntry}]. >>
950950
} else {
951951
/if (${Cursor.ID}) /call ClearCursor
952-
/if (${Bool[${Me.Casting}]} && ${Me.Class.ShortName.NotEqual[BRD]}) /delay 300 !${Bool[${Me.Casting}]}
952+
/if (${Bool[${Me.Casting}]} && ${Me.Class.ShortName.NotEqual[BRD]}) {
953+
/delay 3s !${Bool[${Me.Casting}]}
954+
/call interrupt
955+
}
953956
954957
/declare i int local 1
955958
/declare itemToSwap string local

‎e3 Includes/e3_Classes_Cleric.inc

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ sub check_DivineArb
3333
/if (${SpawnCount[ID ${Spawn[${Group.Member[${i}]}].ID} radius 70]} > 0 && ${NetBots[${Group.Member[${i}]}].Zone} == ${Zone.ID} && (${NetBots[${Group.Member[${i}]}].PctHPs} < ${DivineArb_Pct} || ${Spawn[pc ${Group.Member[${i}]}].PctHPs} < ${DivineArb_Pct})) {
3434
/if (${Me.Casting.ID}) /call interrupt
3535
/if (${Me.ItemReady[Aegis of Superior Divinity]}) {
36-
/bc [+g] Casting Aegis of Superior Divinity
36+
/bc [+g+] Casting Aegis of Superior Divinity
3737
/casting "Aegis of Superior Divinity|item" -maxtries|2
3838
} else /if (${Me.ItemReady[Harmony of the Soul]}) {
39+
/bc [+g+] Casting Harmony of the Soul
3940
/casting "Harmony of the Soul|item" -maxtries|2
4041
} else /if (${Me.AltAbilityReady[Divine Arbitration]}) {
41-
/bc [+g] Casting Divine Arbitration
42+
/bc [+g+] Casting Divine Arbitration
4243
/casting "Divine Arbitration|alt" -maxtries|2
4344
}
4445
}

‎e3 Includes/e3_Classes_Monk.inc

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
|- Written by Killians of PEQ -|
44
|------------------------------------------------------------------------|
55
Sub MNK_Setup
6-
/declare speedFocusSwapped bool outer false
6+
/if (!${Defined[speedFocusSwapped]}) /declare speedFocusSwapped bool global FALSE
77
/declare speedFocusSwapTimer timer outer
88
/return
99

1010
Sub MNK_Background_Events
11-
| /if (!${speedFocusSwapTimer}) {
12-
| /if (${Bool[${Me.ActiveDisc}]} && ${Me.ActiveDisc.Name.Equal[Speed Focus Discipline]}) {
13-
| /varset speedFocusSwapped true
14-
| /swap SpeedFocus
15-
| /varset speedFocusSwapTimer 30s
16-
| } else /if (${speedFocusSwapped}) {
17-
| /swap main
18-
| /varset speedFocusSwapped false
19-
| }
20-
| }
11+
/if (!${speedFocusSwapTimer}) {
12+
/if (${Bool[${Me.ActiveDisc}]} && ${Me.ActiveDisc.Name.Equal[Speed Focus Discipline]}) {
13+
/varset speedFocusSwapped true
14+
/swap SpeedFocus
15+
/varset speedFocusSwapTimer 30s
16+
} else /if (${speedFocusSwapped}) {
17+
/swap main
18+
/varset speedFocusSwapped false
19+
}
20+
}
2121
/return
2222

2323
SUB MNK_MacroSettings

‎e3 Includes/e3_FocusFinder.inc

+17-8
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Sub FindFocusOfType(ItemEffects, typeToFind, spellAffinity, destVar)
149149
/declare highestFoundID int local 0
150150
/declare highestFoundValue int local 0
151151
/declare locationOfHighest string local
152+
|/bc max: ${Math.Calc[${ItemEffects.Count[|]}+1]}
152153
/for i 1 to ${Math.Calc[${ItemEffects.Count[|]}+1]}
153154
/varset currentID ${ItemEffects.Arg[${i},|].Arg[1,@]}
154155
/varset currentLoc ${ItemEffects.Arg[${i},|].Arg[2,@]}
@@ -159,23 +160,29 @@ Sub FindFocusOfType(ItemEffects, typeToFind, spellAffinity, destVar)
159160
/varset locationOfHighest ${currentLoc}
160161
}
161162
/next i
162-
163+
|/bc highestFoundID: ${highestFoundID}
163164
/if (${highestFoundID}) {
164165
/if (!${locationOfHighest.Find[->]}) {
165-
/call #GetItemLink "${InvSlot[${locationOfHighest}].Item.Name}"
166-
/varset ${destVar} ${Spell[${highestFoundID}]}: ${If[${DisplayType.Equal[Exists]},Exists,${highestFoundValue}]}${If[${DisplayType.Equal[Percent]},%,]} on ${Macro.Return}
166+
|/call #GetItemLink "${InvSlot[${locationOfHighest}].Item.Name}"
167+
|/varset ${destVar} ${Spell[${highestFoundID}]}: ${If[${DisplayType.Equal[Exists]},Exists,${highestFoundValue}]}${If[${DisplayType.Equal[Percent]},%,]} on ${Macro.Return}
168+
/declare MyItemLink string local ${InvSlot[${locationOfHighest}].Item.ItemLink}
169+
/varset ${destVar} ${Spell[${highestFoundID}]}: ${If[${DisplayType.Equal[Exists]},Exists,${highestFoundValue}]}${If[${DisplayType.Equal[Percent]},%,]} on ${MyItemLink}
170+
|/bc ${destVar}
167171
|${If[${InvSlot[${locationOfHighest}].ID}>20, (Unequipped),]}
168172
} else {
169173
/declare itemPart string local ${locationOfHighest.Arg[1,->]}
170174
/declare augPart string local ${locationOfHighest.Arg[2,->].Right[-4]}
171175
|/echo ${locationOfHighest}
172176
|/echo itempart: ${itemPart}
173177
|/echo augpart: ${augPart}
174-
/call #GetItemLink "${InvSlot[${itemPart}].Item.Item[${augPart}].Name}"
175-
/declare augLink ${Macro.Return}
176-
/call #GetItemLink "${InvSlot[${itemPart}].Item.Name}"
177-
/declare itemLink ${Macro.Return}
178+
|/call #GetItemLink "${InvSlot[${itemPart}].Item.Item[${augPart}].Name}"
179+
|/declare augLink ${Macro.Return}
180+
|/call #GetItemLink "${InvSlot[${itemPart}].Item.Name}"
181+
|/declare itemLink ${Macro.Return}
182+
/declare itemLink ${InvSlot[${itemPart}].Item.ItemLink}
183+
/declare augLink ${InvSlot[${itemPart}].Item.Item[${augPart}].ItemLink}
178184
/varset ${destVar} ${Spell[${highestFoundID}]}: ${If[${DisplayType.Equal[Exists]},Exists,${highestFoundValue}]}${If[${DisplayType.Equal[Percent]},%,]} on ${augLink} in ${itemLink}
185+
|/bc ${destVar}
179186
|${If[${InvSlot[${itemPart}].ID}>20, (Unequipped),]}
180187
}
181188
} else {
@@ -184,8 +191,10 @@ Sub FindFocusOfType(ItemEffects, typeToFind, spellAffinity, destVar)
184191
/return
185192

186193
Sub CheckFocusType(SpellID, CheckForType, spellAffinity, destVar)
194+
|/bc SpellID: ${SpellID} CheckForType: ${CheckForType} spellAffinity: ${spellAffinity} destVar: ${destVar}
187195
/declare SpellInfo string local
188-
/varset SpellInfo ${Ini[${focusfinder_ini},Spells,ID${SpellID},]}
196+
/varset SpellInfo ${Ini[${focusfinder_ini},Spells,ID${SpellID}]}
197+
|/bc SpellInfo: ${SpellInfo}
189198
/if (${SpellInfo.Length}) {
190199
/if (${SpellInfo.Arg[1,|].Equal[${CheckForType}]} && (${SpellInfo.Arg[4,|].Equal[${spellAffinity}]} || ${SpellInfo.Arg[4,|].Equal[Both]} || ${SpellInfo.Arg[4,|].Equal[All]})) {
191200
/varset ${destVar} ${SpellInfo.Arg[3,|]}

‎e3 Includes/e3_Utilities.inc

-1
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,6 @@ SUB Triangulate_Distance(string loc#1, string loc#2)
916916
/RETURN ${Math.Sqrt[${Math.Calc[${loc#2.Arg[2,,]}-${loc#1.Arg[2,,]}]}*${Math.Calc[${loc#2.Arg[2,,]}-${loc#1.Arg[2,,]}]}+${Math.Calc[${loc#2.Arg[1,,]}-${loc#1.Arg[1,,]}]}*${Math.Calc[${loc#2.Arg[1,,]}-${loc#1.Arg[1,,]}]}]}
917917

918918

919-
920919
|----------------------------------------------------------------------------------------------------|
921920
|- MoveTo -|
922921
|----------------------------------------------------------------------------------------------------|

0 commit comments

Comments
 (0)