From 28218df1ba8615206ba673009277adb9c0fbbb69 Mon Sep 17 00:00:00 2001 From: Joe DiPrima Date: Fri, 23 Dec 2022 19:29:56 -0600 Subject: [PATCH] 12/23/2022 --- qmutants.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/qmutants.py b/qmutants.py index a69545b..f1fec96 100644 --- a/qmutants.py +++ b/qmutants.py @@ -21,23 +21,23 @@ if choice == 1: usr_1 = "epilectrik" pwrd_1 = "gupass" char_sel_1 = 4 - weapon_1 = "Plasma-Sword" + weapon_1 = "Nuclear-Decay" usr_2 = "im bait" pwrd_2 = "gupass" char_sel_2 = 4 - weapon_2 = "Plasma-Sword" + weapon_2 = "Nuclear-Decay" if choice == 2: usr_1 = "Mtron" pwrd_1 = "gupass" char_sel_1 = 4 - weapon_1 = "Plasma-Sword" + weapon_1 = "Nuclear-Decay" usr_2 = "IonJunkies-Merc" pwrd_2 = "gupass" char_sel_2 = 4 - weapon_2 = "Plasma-Sword" + weapon_2 = "Nuclear-Decay" if choice == 3: usr_1 = "doctor" @@ -61,7 +61,7 @@ convert_list = ["Ion-Pack","Ion-Decay","Cheese","Nuclear-thong","Skull","Bottle- farm_sell_list = ["Gold-Chunck","Nuclear-Rock","Nuclear-Waste"] -farm_stock_list = ["Nuclear-Decay","Troll-Skin","Invisible-Cloth","Hell-Blade"] +farm_stock_list = ["Nuclear-Decay","Troll-Skin","Invisible-Cloth","Eazy-Armor","Hell-Blade"] friend_list = ["Epilectrik","ImBait","Mtron","Im","IonJunkies-Merc","Robin-Hood","Doctor"] @@ -698,8 +698,7 @@ class mutant(QWidget): if new_path == len(self.bank_list): new_path = 0 self.path_input.setText(str(new_path)) - - + #process stats def parse_stat(self, result): if self.stat_parsed == False: @@ -814,11 +813,7 @@ class mutant(QWidget): self.status = "" - #print("sell list") - #print(self.sell_list) - #print("stock list") - #print(self.stock_list) - + #index area def index_area(self,result): if self.area_indexed == False: @@ -1010,7 +1005,7 @@ class mutant(QWidget): pass #Exit game if.. - if self.in_combat and result.find("You're not carrying a nuclear-decay.") != -1: + if self.in_combat and result.find("You're not carrying a "+self.weapon.lower()) != -1: self.command_str.emit("x\r\n") #GTFO @@ -1025,7 +1020,7 @@ class mutant(QWidget): self.in_combat = False #Sell the loot - if result.find("City Trading 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: if len(self.sell_list) > 0: self.sell_items()