Merge branch 'master' of https://bibbitgit.duckdns.org/melancholytron/qmutants into BradDev

qmutants.py

@@ -207,7 +207,7 @@ class mutant(QWidget):
         self.clss = "Thief"
         self.level = 0
         self.riblet_thresh = 200000
-        self.ion_thresh = 4000000
+        self.ion_thresh = 0
         self.present_year=player.start_year
 
         self.no_action_cnt = 0
@@ -798,8 +798,8 @@ class mutant(QWidget):
                 self.send_cmd("heal\r\n")
                 self.send_cmd("heal\r\n")
                 self.hits = 0
-               
-        if result.find("have slain") != -1 or result.find("has just left") != -1 or result.find("isn't around here!") != -1 or result.find("You're not ready") != -1:
+        if result not in ["have slain","has just left","isn't around here!","You're not ready"]:       
+        #if result.find("have slain") != -1 or result.find("has just left") != -1 or result.find("isn't around here!") != -1 or result.find("You're not ready") != -1:
             try:
                 self.local_monsters.pop(0)
             except:

tkls-Priest/banks.txt

@@ -0,0 +1 @@
+done,done

tkls-Thief1/banks.txt

@@ -0,0 +1 @@
+done,done

tkls-Warrior2/banks.txt

@@ -0,0 +1 @@
+done,done

tkls-Wizard1/banks.txt

@@ -0,0 +1 @@
+done,done

tkls-login.txt

@@ -1,2 +1,5 @@
 192.168.254.238,False
-tkls-Warrior,mypass,4,Nuclear-Decay,dispell,True,True,False,False,False,False,2000,2500,50
+tkls-Warrior,mypass,4,Nuclear-Decay,dispell,True,True,False,False,False,False,2000,2500,50
+tkls-Warrior2,mypass,4,Nuclear-Decay,dispell,True,True,False,False,False,False,2000,2500,50
+tkls-Wizard1,mypass,4,Nuclear-Decay,dispell,True,True,False,False,False,False,2000,2500,50
+tkls-Priest,mypass,4,Nuclear-Decay,dispell,True,True,False,False,False,False,2000,2500,50