Skip to content

Commit dc2f83b

Browse files
meta53meta53
authored
Merge pull request #8 from meta53/v1.5
V1.5
2 parents d40d102 + 554e7d6 commit dc2f83b

File tree

118 files changed

+3600
-1197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+3600
-1197
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,5 @@ common/cleanpacks.inc
111111
common/CommonSubs.inc
112112
common/packs.inc
113113
common/sell.inc
114+
sql.mac
115+
muffins.mac

‎.vscode/settings.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{
2+
"Lua.runtime.version": "LuaJIT",
3+
"Lua.workspace.library": [
4+
"C:/Program Files (x86)/EQ/EQ_INI/mq-definitions-1.1.0",
5+
"C:/Program Files (x86)/EQ/ROF2 MQNext/lua",
6+
],
27
"editor.bracketPairColorization.independentColorPoolPerBracketType": false,
38
"files.exclude": {
49
"bot_loader_zun.mac": true,

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ Plugin available in modern compiles that replacing for loops looking at group, a
3939
#### Everquest Build
4040
While Xiris bot would work with UF, the MQ2 Plugin requirements mean that only the ROF2 build of Everquest will work properly without a huge degredation of service and code changes.
4141
### Loading
42-
#### bot_loader.mac
43-
This macro will load the class specific macro. Think of this as a bootstrapper, or loader. The best way to accomplish loading the macro on all toons is to create a single hotkey on your tank wit the line: ```/dgza /mac bot_loader ${Me.Name} Xiria Xirea 85```
42+
#### xiris_bot.mac
43+
This macro will load the class specific macro. Think of this as a bootstrapper, or loader. The best way to accomplish loading the macro on all toons is to create a single hotkey on your tank wit the line: ```/dgza /mac xiris_bot ${Me.Name} Xiria Xirea 85```
4444
The arguments in that command can be described as
4545
1. `/dgza` this is a MQ2Dannet command that *everyone in zone do this command*
46-
2. `/mac bot_loader` load this macro
46+
2. `/mac xiris_bot` load this macro
4747
3. `${Me.Name}` This toon is MT - note this could be a hard set name, however, in a hotkey this will resolve to whomever clicked the hotkey. Allows for easy copying of UIs and hotkeys between your tanks and not having to edit every hotkey.
4848
4. `Xiria Xirea` These toons are ST and TT
4949
5. `85` This is the default healpoint for the MT
@@ -96,6 +96,7 @@ Hotkey that is used on the MT to call assist on the MT's current target, and has
9696
### Buffing
9797
Hotkey or command that is used to tell all available buffers to walk through the raid buffing each group (and single target buff defined memembers with special buffs)
9898
`/rs doraidbuff ALL`
99+
Note: You should create a spell set named "buff" that holds the buff spell setup, and "default" for your default setup.
99100

100101
### Debuffing
101102
Hotkey or command that is used to tell all available debuffers to debuff the current target. Note: usually debuffers will also debuff on the Attack call, but sometimes you want to predebuff a target (if its rooted like in Tacvi) or force them to re-debuff all at the same time.
@@ -193,6 +194,7 @@ mq2cast, mq2dannet, mq2exchange, mq2melee
193194
9. `/dgt DoInfusion` Tells everyone to hit Infusion of the Faithful AA
194195
10. `/dgt SetupRaid` A mostly internal or event used event. Describes the raid mode currerntly running, defaults to.. DEFAULT. Calls SetupRaid which pulls from xiris_common INI. Sets lists of group leaders, and DI available clerics
195196
12. `/dgt RefreshXTarget` Used to manually force raid to refresh their XTarget list.
197+
13. `/dt MeleeOverride TRUE|FALSE` Used to manually force a toon to start/stop meleeing (ie: casters/priests)
196198
### xiris_curing.inc
197199
#### Overview
198200
XirisBot curing handlers. This library has several events that can be fired via hotkey, or auto cures driven by the curing section in the toon ini files. Note that this file is responsible for a toons self-need-cure checks - something to be familiar with.

‎batwings.mac‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#Turbo 40
2+
3+
Sub Main
4+
/declare announceChannel string outer rsay
5+
:MainLoop
6+
/if (${FindItemCount[=bat wing]} <4) {
7+
/docommand /${announceChannel} out of bat wings
8+
/echo \aoDarius in POK has bat wings...
9+
/end
10+
} else {
11+
/call GiveWings
12+
}
13+
/goto :mainLoop
14+
15+
/return
16+
17+
Sub GiveWings
18+
/tar Niola
19+
/delay 2
20+
| Open Inventory to grab batiwings
21+
/keypress open_inv_bags
22+
/delay 5
23+
24+
/declare givenCount int local 0
25+
/declare packSlot int local ${FindItem[=bat wing].ItemSlot}
26+
/varcalc packSlot ${packSlot}
27+
/echo packSlot: ${packSlot}
28+
29+
| item notify uses old pack numbers 1-8
30+
/declare notifyPackSlot int local 0
31+
/varcalc notifyPackSlot ${packSlot} - 22
32+
/echo \awnotifyPackSlot: \ag${notifyPackSlot}
33+
34+
/declare notifyItemSlot int local ${FindItem[=bat wing].ItemSlot2}
35+
/varcalc notifyItemSlot ${notifyItemSlot} + 1
36+
/echo \awnotifyItemSlot: \ag${notifyItemSlot}
37+
38+
39+
40+
:giveLoop
41+
/nomodkey /ctrl /itemnotify in pack${notifyPackSlot} ${notifyItemSlot} leftmouseup
42+
43+
/delay 2
44+
45+
/click left target
46+
47+
/delay 2
48+
49+
/if (${Window[TradeWnd].Open}) /nomodkey /notify TradeWnd TRDW_Trade_Button leftmouseup
50+
/varcalc givenCount ${givenCount}+1
51+
/delay 5
52+
53+
/if (${givenCount} < 4) /goto :giveLoop
54+
55+
/echo trading
56+
/nomodkey /notify TradeWnd TRDW_Trade_Button leftmouseup
57+
/delay 5
58+
/destroy
59+
/return

‎beg.mac‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Sub Main
2+
:loop
3+
/delay 5s
4+
/if (${Me.AbilityReady[Begging]}) /doability Begging
5+
6+
/autoinv
7+
/goto :loop
8+
9+
/return
10+
11+
}

‎bic.mac‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
|**
2+
----------------------------
3+
Signets.machealINI
4+
----------------------------
5+
This macro is configured for use by the the puller for zones
6+
Sets the looters for Bic Object(s) by zone so I don't have to tell each toon to loot manuQUESTy
7+
______________________________________________
8+
REVISION HISTORY
9+
08.31.22 xiris INITIAL REVISION
10+
______________________________________________
11+
REQUIRED PLUGINS
12+
13+
______________________________________________
14+
REQUIRED INCLUDES
15+
xiris_common/xiris_common.inc
16+
**|
17+
18+
19+
Sub Main
20+
|switch by zone shortname
21+
/call ${Zone.ShortName}
22+
/return
23+
24+
Sub Qinimi
25+
26+
/dt Ophemia looton QUEST
27+
/dt Opheria looton QUEST
28+
/dt Ophesia looton QUEST
29+
/dt Shynxia looton QUEST
30+
/dt Drexia looton QUEST
31+
/dt Eurydice looton QUEST
32+
/dt Erisa looton QUEST
33+
/dt Mluian looton QUEST
34+
/return
35+
36+
Sub Riwwi
37+
/dt Xunshia looton QUEST
38+
/dt Ophemia looton QUEST
39+
/dt Ophesia looton QUEST
40+
/dt Ophexia looton QUEST
41+
/dt Opheyia looton QUEST
42+
/dt Ophezia looton QUEST
43+
/dt Xiexa looton QUEST
44+
/return
45+
46+
Sub Barindu
47+
/dt ophemia looton QUEST
48+
/dt Ophenia looton QUEST
49+
/dt Opheria looton QUEST
50+
/dt Ophezia looton QUEST
51+
/dt Shanxia looton QUEST
52+
/dt Shynxia looton QUEST
53+
/dt Ertris looton QUEST
54+
/dt Erinyas looton QUEST
55+
/dt Mluian looton QUEST
56+
57+
/return
58+
59+
Sub Yxtta
60+
61+
/return
62+
63+
Sub Vxed
64+
/dt Xunshia looton QUEST
65+
/dt Xonshia looton QUEST
66+
/dt Ophezia looton QUEST
67+
/dt Shenxia looton QUEST
68+
/dt Shynxia looton QUEST
69+
/dt Drexia looton QUEST
70+
/dt Xiexa looton QUEST
71+
/dt Cereborn looton QUEST
72+
/return
73+
74+
75+
Sub Tipt
76+
/dt Xinshia looton QUEST
77+
/dt Xenshia looton QUEST
78+
/dt Xunshia looton QUEST
79+
/dt Xonshia looton QUEST
80+
/dt Ophelia looton QUEST
81+
/dt Ophemia looton QUEST
82+
/dt Ophenia looton QUEST
83+
/dt Opheoia looton QUEST
84+
/dt Ophesia looton QUEST
85+
/dt Opheyia looton QUEST
86+
/dt Ophezia looton QUEST
87+
/dt Shinxia looton QUEST
88+
/dt Shenxia looton QUEST
89+
/dt Shanxia looton QUEST
90+
/dt Shynxia looton QUEST
91+
/dt Drexia looton QUEST
92+
/dt Xiexa looton QUEST
93+
/dt Cereborn looton QUEST
94+
/dt Erinyas looton QUEST
95+
/return
96+
97+
Sub KodTaz
98+
/dt Sadelia looton QUEST
99+
/dt Aergia looton ALL
100+
/dt Xinshia looton QUEST
101+
/dt Xenshia looton QUEST
102+
/dt Xunshia looton QUEST
103+
/dt Xonshia looton QUEST
104+
/dt Xepatia looton QUEST
105+
/dt Ophemia looton QUEST
106+
/dt Ophenia looton QUEST
107+
/dt Opheoia looton QUEST
108+
/dt Ophesia looton QUEST
109+
/dt Ophexia looton QUEST
110+
/dt Opheyia looton QUEST
111+
/dt Ophezia looton QUEST
112+
/dt Shynxia looton QUEST
113+
/dt Ertris looton QUEST
114+
/dt Drexia looton QUEST
115+
/dt Xiexa looton QUEST
116+
/dt Cereborn looton QUEST
117+
/dt Eurydice looton QUEST
118+
/dt Erisa looton QUEST
119+
/dt Mluian looton QUEST
120+
/return

‎bot_brd.mac‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ REQUIRED INCLUDES
3131

3232
#TURBO 120
3333

34-
#EVENT Sing "#1# tells the group#*#'SingSongs'"
35-
#EVENT Sing "#1# tells you#*#'SingSongs'"
36-
#EVENT Sing "#1# tells the raid#*#'SingSongs'"
37-
#EVENT Sing "[ #1# #*#]#*#SingSongs"
34+
#EVENT Sing "#1# tells the group#*#'SingSongs#*#'"
35+
#EVENT Sing "#1# tells you#*#'SingSongs#*#'"
36+
#EVENT Sing "#1# tells the raid#*#'SingSongs#*#'"
37+
#EVENT Sing "[ #1# #*#]#*#SingSongs#*#"
3838

3939
#EVENT Hush "#1# tells the group#*#'Hush#*#'"
4040
#EVENT Hush "#1# tells you#*#'Hush#*#'"

‎bot_bst.mac‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
|**
22
----------------------------
3-
BOT_MAG.mac
3+
BOT_BST.mac
44
----------------------------
55
This macro is configured for use by any melee class
66
Modify the BOT_CLS_CHARNAME.ini file for use by a specific toon
77
This was written ground up for usage with xiris's bots.
88

9-
Usage: /mac bot_mag ${_tank1Name} ${_tank2Name} ${_healPoint} ${_assistArgs}
10-
9+
Usage: /mac bot_bst
1110
______________________________________________
1211
REVISION HISTORY
1312
11.14.22 xiris INITIAL REVISION using modified bot_mag, and things from bot_shm
@@ -28,7 +27,7 @@ REQUIRED INCLUDES
2827

2928
#TURBO 120
3029

31-
#EVENT PARAGON "#*#paragonON"
30+
#EVENT PARAGON "#*#paragonON"
3231
#EVENT DOSHRINK "[#1#] doShrink#*#"
3332
#EVENT DOSHRINK "<#1#> doShrink#*#"
3433
#EVENT DOSHRINK "#1# tells the group#*#'doShrink#*#'"
@@ -109,7 +108,7 @@ Sub Main(string _tank1Name, string _tank2Name, string _tank3Name, int _healPoint
109108
/if (${Pet.ID}) /call chkPetAttack
110109

111110
|-- melee library
112-
/if (!${mq2meleeEnabled}) /call chkCA_${Me.Class.ShortName}
111+
/call chkCA_${Me.Class.ShortName}
113112

114113
|-- dps library (casting hybrid)
115114
/call chkNuke

‎bot_clr.mac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Sub Main(string _tank1Name, string _tank2Name, string _tank3Name, int _healPoint
120120
/call chkHeal_Group
121121

122122
|-- Check to see if we are autorezzing
123-
/if ((${bln_autoRez} && !${bln_engaged}) || (${bln_combatRez} && ${bln_engaged})) /call chkRessurection
123+
/if ((${bln_autoRez} && !${bln_engaged}) || (${bln_combatRez} && ${bln_engaged})) /call chkResurrection
124124

125125
|-- Check Divine Arbitration Flag
126126
/if (!${bln_divineArbReady}) /call chkArbitrationReady

‎bot_custom_events.inc‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)