From: Bernard Blackham Date: Fri, 2 Mar 2007 12:33:13 +0000 (+0000) Subject: fix bugs and solve world poverty. X-Git-Tag: IMPORT-FROM-UCCCVS~22 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=b20f1351704e4e2ae94cb8cee201969f6363dc54;p=uccvend-vendserver.git fix bugs and solve world poverty. --- diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 073b14f..17d29d0 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -396,7 +396,7 @@ def make_selection(v, vstatus): logging.warning('user %s tried to dispense a bad door'%vstatus.username) vstatus.mk.set_message(center('BAD DOOR')) sleep(1) - elif vstatus.cur_selection == '91': + elif vstatus.cur_selection == '81': cookie(v) elif vstatus.cur_selection == '99': scroll_options(vstatus.username, vstatus.mk) @@ -467,19 +467,63 @@ def handle_getting_pin_key(state, event, params, v, vstatus): def handle_getting_uid_key(state, event, params, v, vstatus): #print "handle_getting_uid_key (s,e,p)", state, " ", event, " ", params key = params + # complicated key handling here: - if len(vstatus.cur_user) < 5: + + + + if len(vstatus.cur_user) <8: if key == 11: vstatus.cur_user = '' reset_idler(v, vstatus) return - vstatus.cur_user += chr(key + ord('0')) - vstatus.mk.set_message('UID: '+vstatus.cur_user) + #logging.info('dob: '+vstatus.cur_user) + if len(vstatus.cur_user) > 5: + vstatus.mk.set_message('>'+vstatus.cur_user) + else: + vstatus.mk.set_message('UID: '+vstatus.cur_user) + + + # Easter egg for nikita's birthday -- DGB + if len(vstatus.cur_user) == 8: + if vstatus.cur_user != "07051980": + vstatus.mk.set_messages( + [(' '*9+'ONE MORE TRY NiKiTa'+' '*10, False, 3)]) + vstatus.cur_user = '' + reset_idler(v, vstatus, 3) + return + + # Do stuff here + vstatus.mk.set_messages( + [(center(' GUILD MAILBOX NUMBER 64 '), False, 20), + (center(' GUILD MAILBOX NUMBER 64 '), False, 20), + (center(' GUILD MAILBOX NUMBER 64 '), False, 20), + (center(' GUILD MAILBOX NUMBER 64 '), False, 20)]) + # Reset + vstatus.cur_user = '' + vstatus.cur_pin = '' + #reset_idler(v, vstatus, 10) + reset_idler(v, vstatus, 2) + return + # End easter egg part 1 if len(vstatus.cur_user) == 5: uid = int(vstatus.cur_user) + + # Easter egg for nikita's birthday -- DGB + if vstatus.cur_user == '07051': + if key == 11: + vstatus.cur_user = '' + reset_idler(v, vstatus) + return +# vstatus.cur_user += chr(key + ord('0')) + logging.info(' == 5 dob: '+vstatus.cur_user) + vstatus.mk.set_message('>'+vstatus.cur_user) + return + # end easter egg part 2 + if uid == 0: logging.info('user '+vstatus.cur_user+' has a bad PIN') pfalken=""" @@ -679,14 +723,14 @@ def handle_door_idle(state, event, params, v, vstatus): pass def handle_door_event(state, event, params, v, vstatus): - if params == 1: #door open + if params == 0: #door open vstatus.change_state(STATE_DOOR_OPENING) logging.warning("Entering open door mode") v.display("-FEED ME-") #door_open_mode(v); vstatus.cur_user = '' vstatus.cur_pin = '' - elif params == 0: #door closed + elif params == 1: #door closed vstatus.change_state(STATE_DOOR_CLOSING) reset_idler(v, vstatus, 3) diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py index ee9b063..5fb5451 100644 --- a/sql-edition/servers/VendingMachine.py +++ b/sql-edition/servers/VendingMachine.py @@ -94,7 +94,8 @@ class VendingMachine: elif code == '401': self.events.append((DOOR, 0)) elif code == '610': - self.events.append((SWITCH, None)) + # NOP this. Nothing handles this yet. + #self.events.append((SWITCH, None)) self.interpret_switches(text) elif code[0] == '2': self.events.append((KEY, int(code[1:3])))