Merge pull request #54 from albertoxamin/dev

dependency resolution
This commit is contained in:
Alberto Xamin 2021-06-18 22:26:05 +02:00 committed by GitHub
commit 87896298f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 462 additions and 462 deletions

View File

@ -43,6 +43,7 @@ class Game:
self.attack_in_progress = False self.attack_in_progress = False
self.characters_to_distribute = 2 # personaggi da dare a inizio partita self.characters_to_distribute = 2 # personaggi da dare a inizio partita
self.debug = self.name == 'debug' self.debug = self.name == 'debug'
self.is_changing_pwd = False
def reset(self): def reset(self):
print('resetting lobby') print('resetting lobby')
@ -116,12 +117,16 @@ class Game:
self.sio.emit('chat_message', room=self.name, data=f'_joined|{player.name}') self.sio.emit('chat_message', room=self.name, data=f'_joined|{player.name}')
def set_private(self): def set_private(self):
if self.password == '': if not self.is_changing_pwd:
self.password = ''.join(random.choice("AEIOUJKZT123456789") for x in range(6)) self.is_changing_pwd = True
print(self.name, 'is now private pwd', self.password) if self.password == '':
else: self.password = ''.join(random.choice("AEIOUJKZT123456789") for x in range(6))
self.password = '' print(self.name, 'is now private pwd', self.password)
self.notify_room() else:
self.password = ''
self.notify_room()
eventlet.sleep(0.2)
self.is_changing_pwd = False
def notify_character_selection(self): def notify_character_selection(self):
self.notify_room() self.notify_room()

View File

@ -1,7 +1,7 @@
certifi==2020.11.8 certifi==2021.5.30
dnspython==1.16.0 dnspython==1.16.0
eventlet==0.29.1 eventlet==0.31.0
greenlet==0.4.17 greenlet==1.1.0
python-engineio==3.13.2 python-engineio==3.14.2
python-socketio==4.6.0 python-socketio==4.6.1
six==1.15.0 six==1.16.0

View File

@ -8,27 +8,27 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"core-js": "^3.6.5", "core-js": "^3.14.0",
"pretty-checkbox-vue": "^1.1.9", "pretty-checkbox-vue": "^1.1.9",
"register-service-worker": "^1.7.1", "register-service-worker": "^1.7.2",
"socket.io-client": "^3.0.3", "socket.io-client": "^4.1.2",
"vue": "^2.6.11", "vue": "^2.6.14",
"vue-clipboard2": "^0.3.1", "vue-clipboard2": "^0.3.1",
"vue-i18n": "^8.22.2", "vue-i18n": "^8.24.4",
"vue-router": "^3.2.0", "vue-router": "^3.5.1",
"vue-socket.io": "^3.0.10" "vue-socket.io": "^3.0.10"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.13",
"@vue/cli-plugin-pwa": "~4.5.0", "@vue/cli-plugin-pwa": "~4.5.13",
"@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-service": "~4.5.0", "@vue/cli-service": "~4.5.13",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"eslint": "^6.7.2", "eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^7.11.1",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.14",
"workbox-webpack-plugin": "^6.0.2" "workbox-webpack-plugin": "^6.1.5"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,

File diff suppressed because it is too large Load Diff