Skip to content

Commit c155c2d

Browse files
drcrazydrcrazy
authored
Cata update (#33)
* Some updates for Cata * New sapper charge * Head and shoulders enchants updated for Cata * Chest and Legs enchants * Remaining enchants * Bump minimal gem level * Fix check for gem quality
1 parent 04baa0e commit c155c2d

5 files changed

Lines changed: 104 additions & 64 deletions

File tree

‎slao_bot/cogs/gear.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,22 @@ def _check_sockets(self, raider_name: str, item: Dict) -> None:
4444
:param raider_name: Raider name
4545
:param item: Equipped item dictionary
4646
"""
47+
# Let's check for gems quality every time. Until we will be able to check sockets count
48+
if 'gems' not in item:
49+
return
50+
51+
for gem in item['gems']:
52+
if gem['itemLevel'] < MIN_GEM_ILEVEL:
53+
self.low_quality_gems[raider_name].add(SLOT_NAMES.get(item['slot']))
54+
4755
sockets_num = SOCKETS.get(item['id'])
4856
if sockets_num is None:
4957
# No sockets in item
5058
return
5159
if 'gems' not in item or len(item.get('gems')) < sockets_num:
5260
# No gems in sockets
5361
self.empty_sockets[raider_name].add(SLOT_NAMES.get(item['slot']))
54-
else:
5562
# All sockets are gemmed. Let's check gems level
56-
for gem in item['gems']:
57-
if gem['itemLevel'] < MIN_GEM_ILEVEL:
58-
self.low_quality_gems[raider_name].add(SLOT_NAMES.get(item['slot']))
5963

6064
def _check_enchants(self, raider_name: str, item: Dict) -> None:
6165
"""Checks item for missing or low quality enchant
@@ -113,7 +117,8 @@ async def process_interaction(self, report_id: str) -> Optional[discord.Embed]:
113117

114118
embed.add_field(
115119
name='Нет камней',
116-
value=self._print_raiders(equipment.empty_sockets) or 'Камни вставлены у всех!',
120+
# value=self._print_raiders(equipment.empty_sockets) or 'Камни вставлены у всех!',
121+
value='Блесс, где список сокетов?',
117122
inline=False,
118123
)
119124
embed.add_field(

‎slao_bot/utils/constants.py‎

Lines changed: 22 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,19 @@ class Role(str, Enum):
8989
# Ulduar
9090
1017: 'https://raid-helper.dev/uploads/banners/wotlk/ulduar_3.png',
9191
# ToC
92-
1018: 'https://cdn.discordapp.com/attachments/762790105026920468/1121486358117109912/ToC_Banner.png',
92+
1018: 'https://www.wowhcb.ru/slaobot/ToC_Banner.png',
9393
# Ony-80
94-
1019: 'https://cdn.discordapp.com/attachments/762790105026920468/762790309100388382/image1.jpg',
94+
1019: 'https://raid-helper.dev/uploads/banners/classic/image1.jpg',
9595
# ICC
96-
1020: 'https://cdn.discordapp.com/attachments/762790105026920468/1151338038736195684/icc_draft1.jpg',
96+
1020: 'https://www.wowhcb.ru/slaobot/icc_draft1.jpg',
9797
# RS
98-
1021: 'https://cdn.discordapp.com/attachments/873895928480817253/1198959475525173339/RubySanctum.png',
99-
98+
1021: 'https://www.wowhcb.ru/slaobot/RubySanctum.png',
99+
# Cata Heroics
100+
1022: 'https://raid-helper.dev/uploads/banners/retail/RH-MYTHICS-1.png',
101+
# T11: TotFW, BWD, BoT
102+
1023: 'https://www.wowhcb.ru/slaobot/t11.png',
103+
# Baradin Hold
104+
1024: 'https://www.wowhcb.ru/slaobot/BH.png',
100105
}
101106

102107
ZONE_NAMES = {
@@ -137,9 +142,10 @@ class Role(str, Enum):
137142
1019: ':regional_indicator_o: :regional_indicator_n: :regional_indicator_y:',
138143
1020: ':regional_indicator_i: :regional_indicator_c: :regional_indicator_c:',
139144
1021: ':regional_indicator_r: :regional_indicator_s:',
140-
141-
142-
145+
1022: ':regional_indicator_h: :regional_indicator_e: :regional_indicator_r: :regional_indicator_o: '
146+
':regional_indicator_i: :regional_indicator_k: :regional_indicator_s:',
147+
1023: ':regional_indicator_t: :regional_indicator_i: :regional_indicator_e: :regional_indicator_r: '
148+
':one:'':one:',
143149
}
144150
EXEC_VALUES = {
145151
0: 'Слабо',
@@ -149,59 +155,21 @@ class Role(str, Enum):
149155
}
150156

151157
# Combat consumables with short cooldown
152-
# TBC consumables
153-
# 10052: "Mana Jade"
154-
# 10058: "Mana Ruby"
155-
# 16666: "Demonic Rune"
156-
# 17531: "Major Mana Pot"
157-
# 17534: "Major Healing Pot"
158-
# 27103: "Mana Emerald"
159-
# 27235: "Master Healthstone"
160-
# 27236: "Master Healthstone"
161-
# 27237: "Master Healthstone"
162-
# 27869: "Dark Rune"
163-
# 28495: "Super Healing Pot"
164-
# 28499: "Super Mana Pot"
165-
# 28507: "Haste Pot"
166-
# 28508: "Destruction Pot"
167-
# 28513: "Nature Protection"
168-
# 28515: "2.5k armor"
169-
# 28527: "Fel Blossom"
170-
# 28714: "Flame Cap"
171-
# 28726: "Nightmare Seed"
172-
# 35476: "Drums of Battle"
173-
# 35478: "Drums of Restoration"
174-
# 41617: "Cenarion Mana"
175-
# 41618: "Bottled Nethergon Energy"
176-
# 45051: "Mad Alchemist's Potion"
177-
# 351355: "Greater Drums of Battle"
178-
# 351360: "Greater Drums of War"
179-
# 351358: "Greater Drums of Restoration"
180-
181-
# WotLK consumables
158+
# Cata consumables
182159
HP_MANA_POTS = {
183-
'43186', # Runic mana pot
184-
'67490', # Runic mana injector
185-
'43185', # Runic healing pot
186-
'67489', # Runic healing injector
187-
'53750', # Crazy Alchemist's pot
188-
'53761', # Powerful Rejuvenation pot
160+
'78989', # Mythical hp pot
161+
'78990', # Mythical mana pot
189162
}
190163

191164
HP_MANA_STONES = {
192-
'42987', # Mana Sapphire
193-
'47872', # Master Healthstone
194-
'47873', # Master Healthstone
195-
'47874', # Master Healthstone
196-
'47875', # Master Healthstone
197-
'47876', # Master Healthstone
198-
'47877', # Master Healthstone
165+
'5405', # Mana Gem
199166
}
200167

201168
COMBAT_POTS = {
202-
'53762', # 3.5k armor
203-
'53908', # Potion of Speed
204-
'53909', # Wild Magic pot
169+
'79475', # 4.8k armor
170+
'79476', # 1.2k INT
171+
'79633', # 1.2k AGI
172+
'79634', # 1.2k STR
205173
}
206174

207175
POT_IMAGES = {

‎slao_bot/utils/enchants.py‎

Lines changed: 70 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030
3096, # Arcanum of the Outcast
3131
3329, # Borean Kit
3232
3330, # Heavy Borean Kit
33+
3817, # Arcanum of Torment
34+
3818, # Arcanum of the Stalwart Protector
35+
3819, # Arcanum of Blissful Mending
36+
3820, # Arcanum of Burning Mysteries
37+
3842, # Arcanum of the Savage Gladiator
38+
4120, # Savage Armor Kit
39+
4121, # Heavy Savage Armor Kit
40+
41+
3342
],
3443
2: [
3544
2604, # Shoulder - ZG
@@ -56,10 +65,18 @@
5665
2998, # Inscription of Endurance
5766
3329, # Borean Kit
5867
3330, # Heavy Borean Kit
68+
3793, # Inscription of Triumph
69+
3794, # Inscription of Dominance
5970
3806, # Lesser of the Storm
6071
3807, # Lesser of the Crag
72+
3808, # Greater of the Axe
73+
3809, # Greater of the Crag
74+
3810, # Greater of the Storm
75+
3811, # Greater of the Pinnacle
76+
3852, # Greater Inscription of the Gladiator
6177
3875, # Lesser of Axe
6278
3876, # Lesser of the Pinnacle
79+
4120, # Savage Armor Kit
6380
],
6481
4: [
6582
15, # 8 Armor
@@ -84,8 +101,10 @@
84101
1843, # 40 Armor
85102
1891, # Chest - 4 Stats
86103
1893, # Chest - 100 Mana
104+
1953, # Chest - 22 Dodge
87105
1960, # Chest - 15 Def
88106
1951, # Chest - 16 Def
107+
2381, # Chest - 20 SPI
89108
2503, # 3 Def
90109
2659, # Chest - 150 HP
91110
2661, # Chest - 6 Stats
@@ -94,9 +113,17 @@
94113
2933, # Chest - 15 Resilience
95114
3233, # Chest - 250 Mana
96115
3236, # Chest - 200 HP
97-
# fine for phase 1 3252, # Chest - 8 Stats
116+
3245, # Chest - 20 resilence
117+
3252, # Chest - 8 Stats
118+
3297, # Chest - 275hp
98119
3329, # Borean Kit
99120
3330, # Heavy Borean Kit
121+
3832, # Chest - 10 Stats
122+
4063, # Chest - 15 Stats
123+
4070, # Chest - 55 STA
124+
4120, # Savage Armor Kit
125+
4121, # Heavy Savage Armor Kit
126+
100127
],
101128
6: [
102129
15, # 8 Armor
@@ -121,15 +148,27 @@
121148
2792, # Knothide Kit
122149
2841, # Heavy Knothide Kit
123150
3010, # Legs - 40AP/10Crit
151+
3011, # Legs - 30Sta|10Agi
124152
3012, # Legs - 50AP/12Crit
125153
3013, # Legs - 40Sta/12Agi
126154
3325, # Legs - 45Sta/15Agi
127155
3326, # Legs - 55AP/15Crit
128156
3329, # Borean Kit
129157
3330, # Heavy Borean Kit
158+
3332, # Legs - 100AP|36Crit
130159
3718, # Legs - Shining Thread
160+
3719, # Legs - Brilliant Thread
131161
3720, # Legs - Azure Thread
132-
162+
3721, # Legs - Sapphire Thread
163+
3822, # Legs - 55Sta|22Agi
164+
3823, # Legs - 75AP|22Crit
165+
3853, # Legs - 28Sta|40Resi
166+
4109, # Legs - Ghostly Thread
167+
4111, # Legs - Enchanted Thread
168+
4120, # Savage Armor Kit
169+
4121, # Heavy Savage Armor Kit
170+
4122, # Legs - 110AP|45Crit
171+
4124, # Legs - 85Sta|45Agi
133172
],
134173
7: [
135174
15, # 8 Armor
@@ -146,6 +185,10 @@
146185
904, # Boots - 5 Agi
147186
911, # Boots - Minor Speed
148187
929, # Boots - 7 Sta
188+
983, # Boots - 16 Agi
189+
1075, # Boots - 22 Sta
190+
1147, # Boots - 18Spi
191+
1597, # Boots - 32AP
149192
1843, # 40 Armor
150193
1887, # Boots - 7 Agi
151194
2503, # 3 Def
@@ -157,10 +200,14 @@
157200
2841, # Heavy Knothide Kit
158201
2939, # Cat's Swiftness
159202
2940, # Boar's SPeed
203+
3232, # Tuskarr Vitality
204+
3244, # Boots - 14 STA|SPI
160205
3329, # Borean Kit
161206
3330, # Heavy Borean Kit
162207
3824, # Boots - 24 AP
208+
3826, # Boots - 12 Crit|Hit
163209
3858, # Boots - 5 hit
210+
4120, # Savage Armor Kit
164211
],
165212
8: [
166213
41, # Bracers - 5 HP
@@ -191,6 +238,8 @@
191238
2649, # Bracers - 12 Sta
192239
2650, # Bracers - 20 SP
193240
2679, # Bracers - 6 mp5
241+
4065, # Bracers - 50 Haste
242+
4071, # Bracers - 50 Crit
194243
],
195244
9: [
196245
15, # 8 Armor
@@ -224,11 +273,19 @@
224273
2934, # Gloves - Blasting
225274
2935, # Gloves - 15 Hit
226275
2937, # Gloves - 20 SP
276+
3231, # Gloves - 15 Exp
227277
3238, # Gloves - Gatherer
278+
3246, # Gloves - 28 SP
228279
3249, # Gloves - 16 Crit
280+
3253, # Gloves - 10 Parry + threat
281+
3260, # Gloves Reinforcements
229282
3329, # Borean Kit
230283
3330, # Heavy Borean Kit
231284
3829, # Gloves - 35 AP
285+
4061, # Glovers - 50 Mastery
286+
4075, # Gloves - 35 Str
287+
4120, # Savage Armor Kit
288+
4121, # Heavy Savage Armor Kit
232289
],
233290
14: [
234291
65, # Cloak - 1 Res
@@ -241,6 +298,7 @@
241298
884, # Cloak - 50 Armor
242299
903, # Cloak - 3 Res
243300
910, # Cloak - Stealth
301+
983, # Cloak - 16 Agi
244302
1257, # Cloak - 15 Res
245303
1441, # Cloak - 15 Res
246304
1889, # Cloak - 70 Armor
@@ -253,8 +311,8 @@
253311
2664, # Cloak - 7 Res
254312
2938, # Cloak - Spell Pen
255313
3825, # Cloak - 15 Haste
256-
4747, # Cloak - 16 Agi
257-
314+
4072, # Cloak - 30 Int
315+
4087, # Cloak - 50 Crit
258316
],
259317
15: [
260318
241, # Weapon - 2 Dmg
@@ -287,11 +345,19 @@
287345
2674, # Weapon - Spellsurge
288346
2675, # Weapon - Battlemaster
289347
3222, # Weapon - 20 Agi
348+
3223, # Weapon - Chain
290349
3225, # Weapon - Executioner
350+
3251, # Weapon - Giant Slayer
291351
3273, # Weapon - Deathfrost
352+
3731, # Weapon - Chain
353+
3790, # Weapon - Black Magic
292354
3828, # Weapon - 85 AP
293355
3846, # Weapon - 40 SP
356+
3828, # Weapon - Greater Savagery
294357
3830, # Weapon - 50 SP
358+
3834, # Weapon - 63 SP
359+
4067, # Weapon - Avalanche
360+
4217, # Weapon- Chain
295361
],
296362
}
297363

‎slao_bot/utils/engineer.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
'54359', # Explosive Decoy
2424
'30526', # Gnomish Flame Turret
2525
'4100', # Goblin Land Mine
26+
'89637', # Big Daddy
2627
}
2728

2829
OTHER_SPELLS = {

‎slao_bot/utils/sockets.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Optimal gems should be at least of a Rare quality
2-
MIN_GEM_ILEVEL = 80
2+
MIN_GEM_ILEVEL = 85
33

44
# Number of sockets in a particular item.
55
SOCKETS = {

0 commit comments

Comments
 (0)