diff --git a/doctor/banks.txt b/doctor/banks.txt index e40414c..2ccb0c2 100644 --- a/doctor/banks.txt +++ b/doctor/banks.txt @@ -1,4 +1 @@ -done,tra 2000,south,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done -done,tra 2000,east,east,east,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done -done,tra 2000,south,south,south,south,south,south,west,west,west,north,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done - \ No newline at end of file +done,tra 2000,east,east,east,east,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done \ No newline at end of file diff --git a/qmutants.py b/qmutants.py index 5775cef..c9bbb92 100644 --- a/qmutants.py +++ b/qmutants.py @@ -53,8 +53,8 @@ def player_add(usr,pwd,char_sel,weapon,spell,ac,ai,me,af,hu,ba): if choice == 1: player_add("epilectrik","gupass",4,"Nuclear-Decay","dispell",True,True,True,True,True,False) player_add("im bait","gupass",4,"Nuclear-Decay","dispell",True,True,True,True,True,False) - player_add("doctor","gupass",2,"Nuclear-Decay","cure poison",True,True,False,False,False,False) - player_add("robin-hood","gupass",1,"Nuclear-Decay","invisibility",True,True,False,False,False,False) + player_add("doctor","gupass",2,"Nuclear-Decay","cure poison",True,True,True,True,True,False) + player_add("robin-hood","gupass",1,"Nuclear-Decay","invisibility",True,True,True,True,True,False) player_add("assassin","gupass",4,"Nuclear-Decay","dispell",True,True,True,True,True,False) player_add("mercenary","gupass",4,"Nuclear-Decay","dispell",True,True,True,True,True,False) player_add("mutant-warrior-1","gupass",4,"Nuclear-Decay","dispell",True,True,False,False,False,False) @@ -1017,7 +1017,7 @@ class mutant(QWidget): #Detect in play if result.find("Prepare to walk a thousand years!") != -1: self.in_play = True - self.player_init() + #self.player_init() self.command_str.emit("blurb\r\n") self.command_str.emit("deaf\r\n") self.command_str.emit("memorize "+self.spell+"\r\n") @@ -1417,6 +1417,8 @@ class mutant(QWidget): self.command_str.emit(str(self.char_sel)+"\r\n") #self.mutants() self.logged_in = True + self.player_init() + #doesnt work yet def delete_line(self,line): cursor = self.console.textCursor() @@ -1430,7 +1432,7 @@ class mutant(QWidget): #main game loop def execute_loop(self, result): self.console.append(result) - self.console_lines = self.console_lines +1 + self.console_lines = self.console_lines + 1 if self.logged_in == False: self.login_listener(result) @@ -1524,10 +1526,6 @@ class MainWindow(QMainWindow): 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") - self.mutant_list = [] print(player_list) for player in player_list: @@ -1541,10 +1539,6 @@ class MainWindow(QMainWindow): tab = QWidget() tab.setLayout(mutbox) self.tabs.addTab(tab,player.usr) - - #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) @@ -1565,7 +1559,6 @@ class MainWindow(QMainWindow): self.formGroupBox.addRow(self.text_button,self.text_input) self.layout.addLayout(self.formGroupBox) - #Events like mouse movement and keyboard action that happen on the main form def eventFilter(self, source, event): #print(source) diff --git a/robin-hood/banks.txt b/robin-hood/banks.txt index e40414c..cea3caa 100644 --- a/robin-hood/banks.txt +++ b/robin-hood/banks.txt @@ -1,4 +1 @@ -done,tra 2000,south,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done -done,tra 2000,east,east,east,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done -done,tra 2000,south,south,south,south,south,south,west,west,west,north,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done - \ No newline at end of file +done,tra 2000,west,west,west,west,!deposit,drop nuclear-decay,!stock,get nuclear-decay,!return,done \ No newline at end of file