techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into main

Browse Source
This commit is contained in:
Giulio 2021-06-24 10:27:55 +02:00
commit eeec08e0cc
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/bang/players.py
View File

@ -435,7 +435,7 @@ class Player:
return self.notify_self() return self.notify_self()
if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)): if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)):
self.hand.append(self.game.deck.draw()) self.hand.append(self.game.deck.draw())
self.manette() self.manette()
self.notify_self() self.notify_self()
def manette(self): def manette(self):
@ -688,6 +688,7 @@ class Player:
self.pending_action = PendingAction.PLAY self.pending_action = PendingAction.PLAY
self.manette() self.manette()
self.notify_self() self.notify_self()
# specifico per personaggio
elif self.is_drawing and self.character.check(self.game, chd.PatBrennan): elif self.is_drawing and self.character.check(self.game, chd.PatBrennan):
self.is_drawing = False self.is_drawing = False
card = self.available_cards.pop(card_index) card = self.available_cards.pop(card_index)

2
frontend/package.json
View File

@ -8,7 +8,7 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"core-js": "^3.15.0", "core-js": "^3.15.1",
"pretty-checkbox-vue": "^1.1.9", "pretty-checkbox-vue": "^1.1.9",
"register-service-worker": "^1.7.2", "register-service-worker": "^1.7.2",
"socket.io-client": "^4.1.2", "socket.io-client": "^4.1.2",

8
frontend/yarn.lock
View File

@ -2929,10 +2929,10 @@ core-js@^2.4.0:
resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1606326948512&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1606326948512&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw= integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=
core-js@^3.15.0, core-js@^3.6.5: core-js@^3.15.1, core-js@^3.6.5:
version "3.15.0" version "3.15.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.1.tgz#6c08ab88abdf56545045ccf5fd81f47f407e7f1a"
integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== integrity sha512-h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg==
core-util-is@1.0.2, core-util-is@~1.0.0: core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2" version "1.0.2"