diff --git a/qmutants.py b/qmutants.py index f1fec96..b4fc11a 100644 --- a/qmutants.py +++ b/qmutants.py @@ -28,6 +28,36 @@ if choice == 1: char_sel_2 = 4 weapon_2 = "Nuclear-Decay" + usr_3 = "doctor" + pwrd_3 = "gupass" + char_sel_3 = 2 + weapon_3 = "Nuclear-Decay" + + usr_4 = "robin-hood" + pwrd_4 = "gupass" + char_sel_4 = 1 + weapon_4 = "Nuclear-Decay" + + usr_5 = "assassin" + pwrd_5 = "gupass" + char_sel_5 = 4 + weapon_5 = "Nuclear-Decay" + + usr_6 = "mercenary" + pwrd_6 = "gupass" + char_sel_6 = 4 + weapon_6 = "Nuclear-Decay" + + usr_7 = "" + pwrd_7 = "" + char_sel_7 = 4 + weapon_7 = "" + + usr_8 = "" + pwrd_8 = "" + char_sel_8 = 4 + weapon_8 = "" + if choice == 2: usr_1 = "Mtron" pwrd_1 = "gupass" @@ -39,16 +69,6 @@ if choice == 2: char_sel_2 = 4 weapon_2 = "Nuclear-Decay" -if choice == 3: - usr_1 = "doctor" - pwrd_1 = "gupass" - char_sel_1 = 2 - weapon_1 = "Nuclear-Decay" - - usr_2 = "robin-hood" - pwrd_2 = "gupass" - char_sel_2 = 1 - weapon_2 = "Nuclear-Decay" #this is a thing that i wrote #static lists @@ -63,7 +83,7 @@ farm_sell_list = ["Gold-Chunck","Nuclear-Rock","Nuclear-Waste"] farm_stock_list = ["Nuclear-Decay","Troll-Skin","Invisible-Cloth","Eazy-Armor","Hell-Blade"] -friend_list = ["Epilectrik","ImBait","Mtron","Im","IonJunkies-Merc","Robin-Hood","Doctor"] +friend_list = ["Epilectrik","ImBait","Mtron","Im","IonJunkies-Merc","Robin-Hood","Doctor","Assassin","Mercenary"] help_list = ["$ - Key listener on/off", "8 - North", @@ -112,6 +132,7 @@ class mutant(QWidget): self.heal = False self.wander = False self.bait = False + self.hunt = False self.auto_combat = True self.auto_ion = True self.auto_farm = False @@ -291,19 +312,21 @@ class mutant(QWidget): self.ai_check.setChecked(True) self.me_check = QCheckBox("Meander") self.ba_check = QCheckBox("Bait") + self.hu_check = QCheckBox("Hunt") self.ac_check.stateChanged.connect(self.ac_checked) self.af_check.stateChanged.connect(self.af_checked) self.ai_check.stateChanged.connect(self.ai_checked) self.me_check.stateChanged.connect(self.me_checked) self.ba_check.stateChanged.connect(self.ba_checked) + self.hu_check.stateChanged.connect(self.hu_checked) hbox1.addWidget(self.ac_check) hbox1.addWidget(self.af_check) hbox1.addWidget(self.ba_check) hbox2.addWidget(self.ai_check) hbox2.addWidget(self.me_check) - hbox2.addWidget(self.ba_check) + hbox2.addWidget(self.hu_check) self.mode_layout.addLayout(hbox1) self.mode_layout.addLayout(hbox2) @@ -440,6 +463,11 @@ class mutant(QWidget): def ba_checked(self): self.bait = self.ba_check.isChecked() print("Bait: "+str(self.bait)) + + #meander checked + def hu_checked(self): + self.hunt = self.hu_check.isChecked() + print("Hunt: "+str(self.hunt)) #heal timer def heal_trig(self): @@ -618,7 +646,7 @@ class mutant(QWidget): self.direction_list.append("west") #are there monsters - if result.find("You see shadows to the") != -1: + if result.find("You see shadows to the") != -1 and not self.hunt: try: if result.find("north") != -1: self.direction_list.remove("north") @@ -1390,17 +1418,84 @@ class MainWindow(QMainWindow): self.layout = QVBoxLayout(widget) self.setCentralWidget(widget) self.setup_mqtt() - mutbox = QHBoxLayout() - - self.m1 = mutant(usr_1,pwrd_2,char_sel_1,weapon_1) - self.m2 = mutant(usr_2,pwrd_2,char_sel_2,weapon_2) - mutbox.addWidget(self.m1) - mutbox.addWidget(self.m2) - self.m1.mqtt_str.connect(self.send_mqtt) - self.m2.mqtt_str.connect(self.send_mqtt) - self.m1.mqtt_str_quiet.connect(self.send_mqtt_quiet) - self.m2.mqtt_str_quiet.connect(self.send_mqtt_quiet) - self.layout.addLayout(mutbox) + + #Create tabs + self.tabs = QTabWidget() + + self.tab1 = QWidget() + self.tab2 = QWidget() + self.tab3 = QWidget() + self.tab4 = QWidget() + + + #self.tabs.addTab(self.tab2,"Group 2") + #self.tabs.addTab(self.tab3,"Group 3") + #self.tabs.addTab(self.tab4,"Group 4") + + #Create mutant objects + if usr_1 != "" and usr_2 != "": + mutbox1 = QHBoxLayout() + self.m1 = mutant(usr_1,pwrd_2,char_sel_1,weapon_1) + self.m2 = mutant(usr_2,pwrd_2,char_sel_2,weapon_2) + mutbox1.addWidget(self.m1) + mutbox1.addWidget(self.m2) + self.m1.mqtt_str.connect(self.send_mqtt) + self.m2.mqtt_str.connect(self.send_mqtt) + self.m1.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.m2.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.tabs.addTab(self.tab1,"Group 1") + self.tab1.setLayout(mutbox1) + + #Create mutant objects + if usr_3 != "" and usr_4 != "": + mutbox2 = QHBoxLayout() + self.m3 = mutant(usr_3,pwrd_3,char_sel_3,weapon_3) + self.m4 = mutant(usr_4,pwrd_4,char_sel_4,weapon_4) + mutbox2.addWidget(self.m3) + mutbox2.addWidget(self.m4) + self.m3.mqtt_str.connect(self.send_mqtt) + self.m4.mqtt_str.connect(self.send_mqtt) + self.m3.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.m4.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.tabs.addTab(self.tab2,"Group 2") + self.tab2.setLayout(mutbox2) + + #Create mutant objects + if usr_5 != "" and usr_6 != "": + mutbox3 = QHBoxLayout() + self.m5 = mutant(usr_5,pwrd_5,char_sel_5,weapon_5) + self.m6 = mutant(usr_6,pwrd_6,char_sel_6,weapon_6) + mutbox3.addWidget(self.m5) + mutbox3.addWidget(self.m6) + self.m5.mqtt_str.connect(self.send_mqtt) + self.m6.mqtt_str.connect(self.send_mqtt) + self.m5.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.m6.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.tabs.addTab(self.tab3,"Group 3") + self.tab3.setLayout(mutbox3) + + #Create mutant objects + if usr_7 != "" and usr_8 != "": + mutbox4 = QHBoxLayout() + self.m7 = mutant(usr_7,pwrd_7,char_sel_7,weapon_7) + self.m8 = mutant(usr_8,pwrd_8,char_sel_8,weapon_8) + mutbox4.addWidget(self.m7) + mutbox4.addWidget(self.m8) + self.m7.mqtt_str.connect(self.send_mqtt) + self.m8.mqtt_str.connect(self.send_mqtt) + self.m7.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.m8.mqtt_str_quiet.connect(self.send_mqtt_quiet) + self.tabs.addTab(self.tab4,"Group 4") + self.tab4.setLayout(mutbox4) + + #self.tab2.setLayout(self.h_2.layout) + #self.tab3.setLayout(self.h_1.layout) + #self.tab4.setLayout(self.h_2.layout) + + self.layout.addWidget(self.tabs) + self.setLayout(self.layout) + + #self.layout.addLayout(mutbox) self.button_group() self.createModeGroup() self.show()