|
|
|
@ -1115,7 +1115,7 @@ class mutant(QWidget): |
|
|
|
self.index_area(result) |
|
|
|
|
|
|
|
#deposit riblets |
|
|
|
if self.riblets > self.riblet_thresh and self.path_step == 0 and self.wander: |
|
|
|
if self.riblets > self.riblet_thresh and self.path_step == 0 and self.wander and not self.in_combat: |
|
|
|
self.send_cmd("stat\r\n") |
|
|
|
self.path_step = 1 |
|
|
|
|
|
|
|
@ -1173,7 +1173,7 @@ class mutant(QWidget): |
|
|
|
# self.in_combat = False |
|
|
|
|
|
|
|
#Sell the loot |
|
|
|
if (result.find("City Trading Centre") != -1 or result.find("Satan Inc. Trade Centre") != -1) and self.path_step == 0: |
|
|
|
if (result.find("City Trading Centre") != -1 or result.find("Satan Inc. Trade Centre") != -1) and self.path_step == 0 and not self.in_combat: |
|
|
|
if len(self.sell_list) > 0: |
|
|
|
self.sell_items() |
|
|
|
|
|
|
|
|
