Skip to content

Commit d6bba80

Browse files
meta53meta53
committed
Refactor loot handling and configuration files
- Updated loot file reference in xiris_looting.inc to use xiris_loot_list.ini. - Enhanced Event_SHAKE_DOWN_RAIDFOR_MONEY to track total platinum gained. - Adjusted loot parsing to reflect new loot ini file structure. - Changed settings section headers from [Settings] to [DEFAULT_SETTINGS] for consistency across multiple files. - Added new zone information for necropolis in pull_zoneinfo.ini. - Introduced bot_custom_events.inc for custom event handling, including Inny Doom mechanics. - Created xiris_loot_list.ini with detailed loot configuration for various quests and trades.
1 parent 526d301 commit d6bba80

119 files changed

Lines changed: 804 additions & 681 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Curing becomes *vitally* important in Txevu+ As such there are several commands
198198
Healing is usually handled automatically.
199199
Specifically healers, in the default healmode (2, this is settable in the ini file) will attempt to heal their MT, themselves, and then their group, in that order. You can set different MTs for various healers and they will watch that MT and that MT only. MTs do not need to be in the group to be healed.
200200
### Looting
201-
Looting is fairly complex, and is based on xiris_loot.ini (found in the /xiris_common subfolder in your macro folder)
201+
Looting is fairly complex, and is based on xiris_loot_list.ini (found in the /xiris_common subfolder in your macro folder)
202202
I have an Excel spreadsheet that generates the ini file for myself through Excel macros, but you could do so manually as well. Loot is not auto added to the ini file - an entry must be created.
203203
`/dt Looter looton ALL` will tell looter, Looter to loot ALL items as defined as lootable in the ini file
204204
`/dt Looter looton QUEST` will tell looter, Looter to loot only QUEST items as defined as lootable in the ini file

‎bot_custom_events.inc‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
|
2+
| bot_custom_events.inc
3+
|
4+
| Add your custom code here for event responses.
5+
|
6+
| Sub SetupCustomEvents MUST EXIST
7+
8+
9+
|------------------
10+
| SetupCustomEvents
11+
| This sub will be called once during program startup. Use it to setup timers and such.
12+
|------------------
13+
Sub SetupCustomEvents
14+
| hateplaneb
15+
/if (${Zone.ID}==76) /declare InnyDoomTimer timer global 5s
16+
/return
17+
18+
|------------
19+
| Event_Timer
20+
| Built in function that will trigger any time a timer expires.
21+
| Use this to call special handling routines as needed based on what timer expired.
22+
|------------
23+
Sub Event_Timer(Timer,OriginalValue)
24+
/if (${String[${Timer}].Equal[InnyDoomTimer]}) /call InnyDoomTimer ${OriginalValue}
25+
/return
26+
27+
|
28+
|### hateplaneb Inny Doom
29+
|
30+
31+
#event InnyDoom "#*#You feel a sense of doom upon you.#*#"
32+
33+
Sub Event_InnyDoom
34+
/if (${AnnounceChannel.NotEqual[NULL]}) /docommand /${AnnounceChannel} Inny wants to DT me!
35+
/while ( ${Me.Song[Doom].ID} && ${Me.State.NotEqual[HOVER]} ) {
36+
/bc -- Need Cure for Doom --
37+
/delay 2s ${Spawn[Cleansing Aura].ID}
38+
/doevents
39+
/moveto id ${Spawn[Cleansing Aura].ID} loose
40+
/delay 2s ${Math.Distance[${Me.Y},${Me.X}:${YLOC},${XLOC}]}<10
41+
}
42+
/return
43+
44+
Sub InnyDoomTimer(OriginalValue)
45+
/if (${Zone.ID}==76) {
46+
/call InnyDoomAura
47+
}
48+
/varset InnyDoomTimer ${OriginalValue}
49+
/return
50+
51+
Sub InnyDoomAura
52+
| Calls the Aura location for the raid, fixed approximate X locations are:
53+
| X=104 == door
54+
| X=125 == Corner
55+
| X=-4 == Spawn
56+
57+
/if (${Zone.ID}==76 && ${Spawn[Cleansing Aura].ID}) {
58+
/declare X int local
59+
/varset X ${Spawn[Cleansing Aura].X}
60+
/if (${X} < 0) {
61+
/rsay Aura at SPAWN
62+
} else /if ( ${X} < 112 ) {
63+
/rsay Aura at DOOR
64+
} else {
65+
/rsay Aura at CORNER
66+
}
67+
} else {
68+
/bc Can't find cleansing aura!
69+
}
70+
/return
71+

‎bot_rng.mac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Sub variant_initialize
169169
|--Archery
170170
/declare bln_archeryAuto bool outer TRUE
171171
/declare bln_autoFireState bool outer FALSE
172-
/declare int_archeryDist int outer ${Ini[INI_CHAR,Settings,archeryDist,200]}
172+
/declare int_archeryDist int outer ${Ini[INI_CHAR,DEFAULT_SETTINGS,archeryDist,200]}
173173

174174
|--Concussion
175175
/declare bln_concUse bool outer ${Ini[INI_CHAR,JOLT,bln_concUse,TRUE]}

‎bot_shm.mac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ Sub variant_initialize
209209
/memspellset ${str_spellset}
210210

211211
|-- Cannibalization
212-
/declare int_canniManaThreshold int outer ${Ini[INI_CHAR,Cannibalize,int_canni_mana_threshold,80]}
213-
/declare int_canniHPThreshold int outer ${Ini[INI_CHAR,Cannibalize,int_canni_hp_threshold,40]}
214-
/declare str_canniSpell string outer ${Ini[INI_CHAR,Cannibalize,str_canni_spell,Ancient:Chaotic Pain]}
212+
/declare int_canniManaThreshold int outer ${Ini[INI_CHAR,CANNIBALIZE,int_canni_mana_threshold,80]}
213+
/declare int_canniHPThreshold int outer ${Ini[INI_CHAR,CANNIBALIZE,int_canni_hp_threshold,40]}
214+
/declare str_canniSpell string outer ${Ini[INI_CHAR,CANNIBALIZE,str_canni_spell,Ancient:Chaotic Pain]}
215215

216216
/echo \at${Me.Class.Name} Loaded: MT: ${str_MTName}(${int_MTID}) HealPoint:${healPoint} ST: ${str_STName}(${int_STID})
217217
/call InitEvents_Class

‎xiris_bot.mac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Sub Main(string _tank1Name, string _tank2Name, string _tank3Name, int _healPoint
3030
/echo \agYou are now in \arXIRIS: \aoXIRIS_BOT.mac
3131

3232
| set default values here in case we just started the loader with no args
33-
/declare str_defTank1 string outer ${Ini[INI_CHAR,Settings,defaultTank1,Xiris]}
34-
/declare str_defTank2 string outer ${Ini[INI_CHAR,Settings,defaultTank2,Xiria]}
35-
/declare str_defTank3 string outer ${Ini[INI_CHAR,Settings,defaultTank3,Xirea]}
33+
/declare str_defTank1 string outer ${Ini[INI_CHAR,DEFAULT_SETTINGS,defaultTank1,Xiris]}
34+
/declare str_defTank2 string outer ${Ini[INI_CHAR,DEFAULT_SETTINGS,defaultTank2,Xiria]}
35+
/declare str_defTank3 string outer ${Ini[INI_CHAR,DEFAULT_SETTINGS,defaultTank3,Xirea]}
3636
/declare int_defHealPoint int outer ${Ini[INI_CHAR,Heal_Points,int_point_tank_normal,65]}
3737
/declare str_defAssistArgs string outer FALSE,98
3838

‎xiris_class_ini/BOT_BER_Ophelia.ini‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Settings]
1+
[DEFAULT_SETTINGS]
22
cmdChannel=dgt
33
defaultTank1=Xiris
44
defaultTank2=Xiria
@@ -14,38 +14,38 @@
1414
medPercent=98
1515

1616

17-
[SavedInventory]
17+
[INVENTORY]
1818
mainhand=Brutish Blade of Balance
1919
offhand=Aegis of Midnight
2020
ranged=Lodestar
2121
leftfinger=Irestone Band of Rage
2222
rightfinger=Ring of Organic Darkness
2323

24-
[Weaponsets]
24+
[WEAPS]
2525
default=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2626
slashing=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2727
piercing=Diamond-Tipped War Javelin|mainhand,NULL|offhand
2828
blunt=Great Maul of the Mighty|mainhand,NULL|offhand
2929
h2h=NULL
3030

31-
[Downflags]
31+
[DOWNFLAGS]
3232
downflagCount=5
3333
downflag1=Furious Might|47246 item
3434
downflag2=Taelosian Guard|69131 item
3535
downflag3=Savage Guard|68784 item
3636
downflag4=Frost Guard|69130 item
3737
downflag5=Form of Endurance III|47292 item
3838

39-
[Holyflags]
39+
[HOLYFLAGS]
4040
holyflagCount=1
4141
downflag1=
4242

4343
[Melee Abilities]
4444
Ability#1=Frenzy|0
4545
Ability#2=Rage Volley|20
4646

47-
[Sticking]
48-
stickcmd=snaproll rear
47+
[STICK]
48+
CMD=snaproll rear
4949

5050
br=|**
5151
br= ----------------------------

‎xiris_class_ini/BOT_BER_Ophemia.ini‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Settings]
1+
[DEFAULT_SETTINGS]
22
cmdChannel=dgt
33
defaultTank1=Xiris
44
defaultTank2=Xiria
@@ -14,38 +14,38 @@
1414
medPercent=98
1515

1616

17-
[SavedInventory]
17+
[INVENTORY]
1818
mainhand=Brutish Blade of Balance
1919
offhand=Aegis of Midnight
2020
ranged=Lodestar
2121
leftfinger=Irestone Band of Rage
2222
rightfinger=Ring of Organic Darkness
2323

24-
[Weaponsets]
24+
[WEAPS]
2525
default=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2626
slashing=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2727
piercing=Halberd of Endless Pain|mainhand,NULL|offhand
2828
blunt=Great Maul of the Mighty|mainhand,NULL|offhand
2929
h2h=NULL
3030

31-
[Downflags]
31+
[DOWNFLAGS]
3232
downflagCount=5
3333
downflag1=Furious Might|47246 item
3434
downflag2=Eternal Ward|68758 item
3535
downflag3=Savage Guard|68784 item
3636
downflag4=Taelosian Guard|69131 item
3737
downflag5=Form of Endurance III|47292 item
3838

39-
[Holyflags]
39+
[HOLYFLAGS]
4040
holyflagCount=0
4141

4242
[Melee Abilities]
4343
Ability#1="Frenzy"
4444
Ability#2="Rage Volley"
4545

4646

47-
[Sticking]
48-
stickcmd=snaproll rear
47+
[STICK]
48+
CMD=snaproll rear
4949

5050
br=|**
5151
br= ----------------------------

‎xiris_class_ini/BOT_BER_Ophenia.ini‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Settings]
1+
[DEFAULT_SETTINGS]
22
cmdChannel=dgt
33
defaultTank1=Xiris
44
defaultTank2=Xiria
@@ -14,35 +14,35 @@
1414
medPercent=98
1515

1616

17-
[SavedInventory]
17+
[INVENTORY]
1818
mainhand=Brutish Blade of Balance
1919
offhand=Aegis of Midnight
2020
ranged=Lodestar
2121
leftfinger=Bloodband of Malice
2222
rightfinger=Ring of Organic Darkness
2323

24-
[Weaponsets]
24+
[WEAPS]
2525
default=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2626
slashing=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2727
piercing=Ra'Tuk Halberd|mainhand,NULL|offhand
2828
blunt=Great Maul of the Mighty|mainhand,NULL|offhand
2929
h2h=NULL
3030
31-
[Downflags]
31+
[DOWNFLAGS]
3232
downflagCount=3
3333
downflag1=Taelosian Guard|69131 item
3434
downflag2=Furious Might|47246 item
3535
downflag3=Form of Endurance III|47292 item
3636
37-
[Holyflags]
37+
[HOLYFLAGS]
3838
holyflagCount=0
3939
4040
[Melee Abilities]
4141
Ability#1="Frenzy"
4242
Ability#2="Rage Volley"
4343
44-
[Sticking]
45-
stickcmd=snaproll rear
44+
[STICK]
45+
CMD=snaproll rear
4646
4747
br=|**
4848
br= ----------------------------

‎xiris_class_ini/BOT_BER_Opheoia.ini‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Settings]
1+
[DEFAULT_SETTINGS]
22
cmdChannel=dgt
33
defaultTank1=Xiris
44
defaultTank2=Xiria
@@ -14,34 +14,34 @@
1414
medPercent=98
1515

1616

17-
[SavedInventory]
17+
[INVENTORY]
1818
mainhand=Brutish Blade of Balance
1919
offhand=Aegis of Midnight
2020
ranged=Lodestar
2121
leftfinger=Band of Solid Shadow
2222
rightfinger=Ring of Organic Darkness
2323

24-
[Weaponsets]
24+
[WEAPS]
2525
default=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2626
slashing=Jagged Axe of Uncontrolled Rage|mainhand,NULL|offhand
2727
piercing=Halberd of Endless Pain|mainhand,NULL|offhand
2828
blunt=Vanazir, Dreamer's Despair|mainhand,NULL|offhand
2929
h2h=NULL
3030
31-
[Downflags]
31+
[DOWNFLAGS]
3232
downflagCount=2
3333
downflag1=Taelosian Guard|69131 item
3434
downflag2=Furious Might|47246 item
3535
36-
[Holyflags]
36+
[HOLYFLAGS]
3737
holyflagCount=0
3838
3939
[Melee Abilities]
4040
Ability#1="Frenzy"
4141
Ability#2="Rage Volley"
4242
43-
[Sticking]
44-
stickcmd=snaproll rear
43+
[STICK]
44+
CMD=snaproll rear
4545
4646
br=|**
4747
br= ----------------------------

‎xiris_class_ini/BOT_BER_Opheria.ini‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Settings]
1+
[DEFAULT_SETTINGS]
22
cmdChannel=dgt
33
defaultTank1=Xiris
44
defaultTank2=Xiria
@@ -14,35 +14,35 @@
1414
medPercent=98
1515

1616

17-
[SavedInventory]
17+
[INVENTORY]
1818
mainhand=Brutish Blade of Balance
1919
offhand=Aegis of Midnight
2020
ranged=Lodestar
2121
leftfinger=Irestone Band of Rage
2222
rightfinger=NULL
2323

24-
[Weaponsets]
24+
[WEAPS]
2525
default=Great Maul of the Mighty|mainhand,NULL|offhand
2626
slashing=Basalt Greatsword of the Protector|mainhand,NULL|offhand
2727
piercing=Diamond-Tipped War Javelin|mainhand,NULL|offhand
2828
blunt=Great Maul of the Mighty|mainhand,NULL|offhand
2929
h2h=NULL
3030

31-
[Downflags]
31+
[DOWNFLAGS]
3232
downflagCount=3
3333
downflag1=Taelosian Guard|69131 item
3434
downflag2=Furious Might|47246 item
3535
downflag3=Form of Endurance III|47292 item
3636

37-
[Holyflags]
37+
[HOLYFLAGS]
3838
holyflagCount=0
3939

4040
[Melee Abilities]
4141
Ability#1="Frenzy"
4242
Ability#2="Rage Volley"
4343

44-
[Sticking]
45-
stickcmd=snaproll rear
44+
[STICK]
45+
CMD=snaproll rear
4646

4747
br=|**
4848
br= ----------------------------

0 commit comments

Comments
 (0)