Skip to content

Commit 1ca8eca

Browse files
AthrogatePEQAthrogatePEQ
committed
Creamo Changes merged into my fork.
1 parent b782164 commit 1ca8eca

16 files changed

+665
-81
lines changed

‎e3 Includes/VetAAs.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ SUB EVENT_MGB(line, ChatSender, eventParams)
220220
|- Uses 'Throne of Heroes', on all bots who are able. -|
221221
|--------------------------------------------------------|
222222
#EVENT GateToLobby "[#1#] Throne of Heroes"
223-
#EVENT GateToLobby "<#1#> Throne of Heroes"
223+
#EVENT GateToLobby "<#1#> Throne of Heroes#2#"
224224
#EVENT GateToLobby "#1# tells you, 'Throne of Heroes'"
225225
#EVENT GateToLobby "#1# tells the group, 'Throne of Heroes'"
226226
#EVENT GateToLobby "#1# tell your party, 'Throne of Heroes'"

‎e3 Includes/e3_Assists.inc

+8-4
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ SUB AssistOff
126126
/if (${Me.Casting.ID} && !${Spell[${Me.Casting}].SpellType.Find[beneficial]} && ${Me.Class.ShortName.NotEqual[BRD]}) /call interrupt
127127
/if (${Me.Combat}) /attack off
128128
/if (${Me.AutoFire}) /autofire off
129+
/delay 5 !${Me.Combat} && !${Me.AutoFire}
129130
|}
130131
/if (${Me.Pet.ID}) {
131132
/pet back off
132133
/pet hold
133134
}
134-
/delay 30 !${Me.Casting.ID} && !${Me.Combat} && !${Me.AutoFire}
135135

136136
/varset Assisting FALSE
137137
/varset AssistTarget 0
@@ -1224,7 +1224,7 @@ SUB event_FullBurn(line, ChatSender)
12241224
|--------------------------------------------------------------------------------|
12251225
SUB useBurns(ArrayName)
12261226
/if (${Debug} || ${Debug_Assists}) /echo |- useBurns Target=${burnTarget}- Array=${ArrayName} ==>
1227-
/echo useburnstart ${Time}
1227+
|/echo useburnstart ${Time}
12281228
/declare i int local
12291229
/for i 1 to ${${ArrayName}.Size[1]}
12301230
/call check_Ready "${ArrayName}" ${i}
@@ -1235,10 +1235,11 @@ SUB useBurns(ArrayName)
12351235
/g useBurns ${Time} : ${ArrayName}-${${ArrayName}[${i},${iCastName}]}
12361236
/call e3_Cast ${AssistTarget} "${ArrayName}" "${i}"
12371237
} else {
1238-
/echo NotReady: ${i} ${${ArrayName}[${i},${iCastName}]}
1238+
/if (${Debug} || ${Debug_Assists}) /echo NotReady: ${i} ${${ArrayName}[${i},${iCastName}]}
12391239
}
1240-
/if (!${ActionTaken}) /next i
1240+
/delay 1
12411241
:skipCurrent
1242+
/if (!${ActionTaken}) /next i
12421243
/if (${Debug} || ${Debug_Assists}) /echo <== useBurns -|
12431244
/RETURN
12441245

@@ -1325,6 +1326,9 @@ sub event_CombatMode(line, ChatSender, parms)
13251326
/swap ranged
13261327
/delay 2
13271328
}
1329+
/if ( ${argPart.Equal[off]}) {
1330+
/varset AssistType Off
1331+
}
13281332
/if (${Debug} || ${Debug_Assists}) /echo |-- Leaving Combat Mode ---|
13291333
/return
13301334

‎e3 Includes/e3_AutoExpAdjust.inc

+17-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,20 @@ Sub Event_AutoExpAdjust
1919
} else /if (${currentExp}>=${upperExpThreshold}) {
2020
/squelch /alternateadv on 100
2121
}
22-
/return
22+
/return
23+
24+
Sub AutoExpAdjust_Setup
25+
/return
26+
27+
SUB AutoExpAdjust_CharacterSettings
28+
/RETURN
29+
30+
Sub AutoExpAdjust_Aliases
31+
/return
32+
33+
Sub AutoExpAdjust_MacroSettings
34+
/return
35+
36+
Sub AutoExpAdjust_Background_Events
37+
/doevents AutoExpAdjust
38+
/return

‎e3 Includes/e3_Background.inc

+5-3
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,11 @@ SUB check_Active
147147
}
148148
/if (${Me.Moving} || ${Corpse.Open}) {
149149
/if (${Me.Class.ShortName.Equal[War]}) {
150-
/varset activeTimer 6
150+
/varset activeTimer 5
151+
} else /if (${Me.Class.ShortName.Equal[BRD]}) {
152+
/varset activeTimer 5
151153
} else {
152-
/varset activeTimer 12
154+
/varset activeTimer 10
153155
}
154156
}
155157
| Check AutoAttack
@@ -453,5 +455,5 @@ Sub background_Aliases
453455
Sub background_Background_Events
454456
/doevents manualTributeSet
455457
/doevents Set_zoneType
456-
/doevents AutoExpAdjust
458+
457459
/return

‎e3 Includes/e3_Basics.inc

+36-23
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,10 @@ SUB EVENT_bark(line, ChatSender, msgTarget, barkMsg)
327327
/delay 10
328328
}
329329
330+
/doevents barkReturn
330331
| -Check to see if the bark was successful.
331332
/call Triangulate_Distance ${Me.Loc.Replace[ ,]} ${startingLoc}
332333
333-
/doevents barkReturn
334-
335334
|/echo dist ${Macro.Return} barkret ${barkReturned} timer ${retryTimer}
336335
337336
/if (${Zone.ID} == ${currentZone} && ${Macro.Return} < 50 && !${barkReturned}) {
@@ -944,9 +943,21 @@ SUB EVENT_Swap_Items(line, IniEntry)
944943
/if (${Ini[${Character_Ini},Swap Items,${IniEntry}].Arg[${i},/].Length}) /goto :SwapLoop
945944
} else {
946945
| If I'm swapping in a 2 hander, while dual wielding.
947-
/if (${slotToSwap.Equal[Mainhand]} && ${FindItem[${itemToSwap}].Type.Left[2].Equal[2H]} && ${Bool[${InvSlot[Offhand].Item}]}) /unequip Offhand
948-
/if (${slotToSwap.Equal[Mainhand]} && ${FindItem[${itemToSwap}].ItemSlot}==14) /unequip Offhand
949-
/if (${slotToSwap.Equal[Offhand]} && ${FindItem[${itemToSwap}].ItemSlot}==13) /unequip Mainhand
946+
/if (${slotToSwap.Equal[Mainhand]} && ${FindItem[${itemToSwap}].Type.Left[2].Equal[2H]} && ${Bool[${InvSlot[Offhand].Item}]}) {
947+
/unequip Offhand
948+
/delay 2
949+
/call PlaceInFirstFreeSlot
950+
}
951+
/if (${slotToSwap.Equal[Mainhand]} && ${FindItem[${itemToSwap}].ItemSlot}==14) {
952+
/unequip Offhand
953+
/delay 2
954+
/call PlaceInFirstFreeSlot
955+
}
956+
/if (${slotToSwap.Equal[Offhand]} && ${FindItem[${itemToSwap}].ItemSlot}==13) {
957+
/unequip Mainhand
958+
/delay 2
959+
/call PlaceInFirstFreeSlot
960+
}
950961
| Swap in item.
951962
/if (${Debug} || ${Debug_Basics}) /echo Equipping [${itemToSwap}] ${slotToSwap}
952963
/call SwapItem "${itemToSwap}" ${slotToSwap}
@@ -1585,12 +1596,20 @@ SUB EVENT_listGroups
15851596
SUB EVENT_groupUp(line, ChatSender, eventParams)
15861597
/if (${Debug}) /echo |- EVENT_groupUp ==>
15871598

1588-
| -Verify the event
1599+
| -Verify the event
15891600
/call verifyEvent "${ChatSender}" "${line}"
1590-
/if (${Defined[ChatSender]}) /varset ChatSender ${Macro.Return.Arg[1,_]}
1591-
| |-----------Valid User----------| |--------Included Bot-----------|
1601+
/varset ChatSender ${Macro.Return.Arg[1,_]}
1602+
| |-----------Valid User----------| |--------Included Bot-----------|
15921603
/if (${Bool[${Macro.Return.Arg[2,_]}]} && ${Bool[${Macro.Return.Arg[3,_]}]}) {
15931604

1605+
/if (${ChatSender.Equal[${Me.Name}]}) {
1606+
/squelch /bca //raiddisband
1607+
/squelch /bca //disband
1608+
/delay 5
1609+
/if (${Raid.Members}) /raiddisband
1610+
}
1611+
/delay 5
1612+
15941613
/declare groupName string local ${eventParams.Arg[1,/]}
15951614
/if (${groupName.Right[1].Equal[ ]}) /varset groupName ${groupName.Left[${Math.Calc[${groupName.Length}-1]}]}
15961615
/declare groupFound string local
@@ -1602,31 +1621,25 @@ SUB EVENT_groupUp(line, ChatSender, eventParams)
16021621

16031622
| -Check for groupName in Group_Ini.
16041623
:nextGroupListing
1605-
/if (${Ini[${Group_Ini}].Arg[${i},|].Arg[2,_].Equal[${groupName}]} && ${Ini[${Group_Ini},${Ini[${Group_Ini}].Arg[${i},|]},GroupMember#0].NotEqual[DEPRECATED]}) {
1624+
/if (${${IniMode}[${Group_Ini}].Arg[${i},|].Arg[2,_].Equal[${groupName}]} && ${${IniMode}[${Group_Ini},${${IniMode}[${Group_Ini}].Arg[${i},|]},GroupMember#0].NotEqual[DEPRECATED]}) {
16061625
| Disband from a current group
1607-
/if (${Group} || ${Raid.Members}) /call EVENT_Disband "PLACEHOLDER" "${Me.CleanName}"
1626+
/if (${Group}) /call EVENT_Disband "PLACEHOLDER" "${Me.CleanName}"
16081627

16091628
| check to see if I am the group leader(GroupMember#0)
1610-
/if (${Ini[${Group_Ini},${Ini[${Group_Ini}].Arg[${i},|]},GroupMember#0].Equal[${Me.CleanName}]}) {
1629+
/if (${${IniMode}[${Group_Ini},${${IniMode}[${Group_Ini}].Arg[${i},|]},GroupMember#0].Equal[${Me.CleanName}]}) {
16111630
/echo Recalling [${groupName}]...
1612-
/delay 2s
1631+
/delay 15
16131632
| Invite group members while ignoring placeholders, and set
16141633
/for e 1 to 5
1615-
/varset groupMembers[${e}] ${Ini[${Group_Ini},${Ini[${Group_Ini}].Arg[${i},|]},GroupMember#${e}]}
1616-
/if (${Ini[${Group_Ini},${Ini[${Group_Ini}].Arg[${i},|]},GroupMember#${e}].NotEqual[PLACEHOLDER]}) {
1634+
/varset groupMembers[${e}] ${${IniMode}[${Group_Ini},${${IniMode}[${Group_Ini}].Arg[${i},|]},GroupMember#${e}]}
1635+
/if (${${IniMode}[${Group_Ini},${${IniMode}[${Group_Ini}].Arg[${i},|]},GroupMember#${e}].NotEqual[PLACEHOLDER]}) {
16171636
/varcalc groupSize ${groupSize}+1
16181637
| -Alert PC of incoming group invite.
16191638
/invite ${groupMembers[${e}]}
16201639
}
16211640
/next e
16221641

1623-
/delay 3s ${Group} == ${groupSize}
1624-
/if (${Group} != ${groupSize}) {
1625-
/for e 1 to 5
1626-
/if (${groupMembers[${e}].NotEqual[PLACEHOLDER]} && !${Bool[${Group.Member[${groupMembers[${e}]}]}]}) /invite ${groupMembers[${e}]}
1627-
/next e
1628-
}
1629-
/delay 3s ${Group} == ${groupSize}
1642+
/delay 6s ${Group} == ${groupSize}
16301643
/if (${Group} != ${groupSize}) {
16311644
/for e 1 to 5
16321645
/if (${groupMembers[${e}].NotEqual[PLACEHOLDER]} && !${Bool[${Group.Member[${groupMembers[${e}]}]}]}) /docommand ${ChatToggle} [${groupMembers[${e}]}] Did not join the group...
@@ -1636,8 +1649,9 @@ SUB EVENT_groupUp(line, ChatSender, eventParams)
16361649
}
16371650
}
16381651
/varcalc i ${i}+1
1639-
/if (${Ini[${Group_Ini}].Arg[${i},|].Length}) /goto :nextGroupListing
1652+
/if (${${IniMode}[${Group_Ini}].Arg[${i},|].Length}) /goto :nextGroupListing
16401653
}
1654+
:skip
16411655
:skip
16421656
/if (${Debug}) /echo <== EVENT_groupUp -|
16431657
/RETURN
@@ -1907,7 +1921,6 @@ SUB basics_CharacterSettings
19071921

19081922
Sub basics_Aliases
19091923
/if (${Debug} || ${Debug_Basics}) /echo |- basics_Aliases ==>
1910-
/squelch /alias /expmode /bc ExpGroup
19111924
/noparse /squelch /alias /followon /bc Follow ${Me.CleanName}
19121925
/noparse /squelch /alias /followme /bc Follow ${Me.CleanName}
19131926
/noparse /squelch /alias /followit /bc Follow ${Target.CleanName}

‎e3 Includes/e3_Casting.inc

+6-4
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ Sub e3_Cast(int targetID, ArrayName, int ArrayIndex)
223223
} else {
224224
/delay 1
225225
}
226+
/call alerts_Background_Events
227+
|this will make tank and important heals ignore everything but subToRun
228+
/if (${Select[${ArrayName},tankHeals,importantHeals]}) /goto :cast_still_pending
226229
|- Other reasons to cancel
227230
/if (!${Assisting} && ${SpawnCount[=${FollowTarget}]} && ${Spawn[=${FollowTarget}].Distance} < ${LeashLength} && (${Spawn[=${FollowTarget}].Distance} > 20 || ${NetBots[${FollowTarget}].Moving}) ) {
228231
/if (${Debug} || ${Debug_Casting}) /echo following interrupt
@@ -237,8 +240,7 @@ Sub e3_Cast(int targetID, ArrayName, int ArrayIndex)
237240
/goto :interrupted
238241
}
239242
|-Dead target and I'm not using a detrimental AE or self buff
240-
|/echo ${${ArrayName}[${ArrayIndex},${iCastName}]} ${${ArrayName}[${ArrayIndex},${iTargetType}]}
241-
/if (!${Bool[${Target.ID}]} && !${Select[${${ArrayName}[${ArrayIndex},${iTargetType}]},PB AE,Targeted AE,Corpse,Self]}) {
243+
/if ((!${Bool[${Target.ID}]} || ${Spawn[${Target.ID}].Dead}) && !${Select[${${ArrayName}[${ArrayIndex},${iTargetType}]},PB AE,Targeted AE,Corpse,Self]}) {
242244
/if (${Debug} || ${Debug_Casting}) /echo target corpse called interrupt
243245
/call interrupt
244246
/goto :interrupted
@@ -268,8 +270,8 @@ Sub e3_Cast(int targetID, ArrayName, int ArrayIndex)
268270
/doevents clickit
269271
/doevents bark
270272
/doevents vetAA_Background_Events
271-
/call casting_Background_Events
272-
/call alerts_Background_Events
273+
/doevents noHold
274+
273275
|/varset Debug_Casting FALSE
274276
}
275277
/goto :cast_still_pending

‎e3 Includes/e3_Classes_Enchanter.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Sub ENC_Background_Events
306306
/doevents add_RuneTarget
307307
/doevents remove_RuneTarget
308308

309-
/if (${Assisting} && ${Bool[${gatherManaPCT}]} && ${Me.PctMana} < ${gatherManaPCT} && ${Me.AltAbilityReady[Gather Mana]}) /casting "Gather Mana" -maxtries|3
309+
/if (${Assisting} && ${Bool[${gatherManaPCT}]} && ${Me.PctMana} < ${gatherManaPCT} && ${Me.AltAbilityReady[Gather Mana]} && ${Me.CombatState.Equal[COMBAT]}) /casting "Gather Mana" -maxtries|3
310310

311311
/return
312312

‎e3 Includes/e3_Classes_Magician.inc

+10
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,16 @@ SUB MAG_Aliases
348348

349349
|----------------------------------------------------------------------------|
350350
SUB MAG_Background_Events
351+
|**
352+
/if (${Bool[${Me.AltAbility[Companion of Necessity]}]} && ${Me.AltAbilityReady[Companion of Necessity]}) {
353+
/if (${Assisting} && ${Me.CombatState.Equal[Combat]} && ${Target.Named} && ${Target.Level} >= ${Math.Calc[${Me.Level}+3]} && !${Select[${Me.TargetOfTarget.Class},WAR,PAL,SHD]} && ${Spawn[${Target.ID}].PlayerState}==4) {
354+
/if (${Me.Casting.ID}) /call interrupt
355+
/delay 1s !${Me.Casting.ID}
356+
/gu ${Target.Name} has aggro on ${Me.TargetOfTarget.Name}, casting Companion of Necessity
357+
/casting "Companion of Necessity"
358+
}
359+
}
360+
**|
351361
/doevents auto_coh
352362
/doevents petWeapons
353363
/doevents distributePetWeapons

‎e3 Includes/e3_Classes_Wizard.inc

+9
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@ Sub WIZ_Aliases
5353

5454
Sub WIZ_Background_Events
5555
/if (${Me.Pet.ID} && ${Me.Pet.Race.Name.NotEqual[Gnomework]} && ${MacroQuest.Server.Equal[PEQTGC]}) /pet get lost
56+
57+
/if (${Bool[${Me.AltAbility[Mind Crash]}]} && ${Me.AltAbilityReady[Mind Crash]}) {
58+
/if (${Assisting} && ${Me.CombatState.Equal[Combat]} && ${Target.Named} && ${Target.Level} >= ${Math.Calc[${Me.Level}+3]} && ${Me.TargetOfTarget.CleanName.Equal[${Me.CleanName}]} && ${Spawn[${Target.ID}].PlayerState}==4) {
59+
/if (${Me.Casting.ID}) /call interrupt
60+
/delay 1s !${Me.Casting.ID}
61+
/echo \ay I have aggro on a dangerous target, casting Mind Crash!
62+
/casting "Mind Crash"
63+
}
64+
}
5665
/return

‎e3 Includes/e3_Heals.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ SUB heal_Setup
603603
|~~~~~~~~~~~~ Interrupt heal if target >= this PCTHps ~~~~~~~~~~|
604604
/declare interruptHealPct int outer 95
605605
|~~~~ Only interrupt if cast time left <= (1/10th seconds) ~~~~|
606-
/declare interruptTankCastSec int outer 6
606+
/declare interruptTankCastSec int outer 3
607607
/declare interruptImportantCastSec int outer 18
608608
/declare interruptAllCastSec float outer 25
609609

‎e3 Includes/e3_OffTanking.inc

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Sub OfftankAction
8989
/varset npc 0
9090
/varset i 0
9191
:GetNextNPC
92+
/doevents BackOff
9293

9394
/varcalc i ${i}+1
9495
/varset npc ${NearestSpawn[${i},npc radius 50 zradius 25 los noalert ${AlertList}].ID}

‎e3 Includes/e3_Pets.inc

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ SUB check_AutoShrink
5454
/echo casting tiny comp
5555
/casting "Tiny Companion" "-targetid|${Me.Pet.ID}"
5656
}
57+
/delay 1s ${Me.Casting.ID}
5758
/delay 5s !${Me.Casting.ID}
5859
}
5960
/if (${Debug} || ${Debug_Pets}) /echo <== check_AutoShrink -|

0 commit comments

Comments
 (0)