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

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Giulio 2023-01-12 11:11:05 +01:00
commit 5b51ed5e95
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/bang/players.py
View File

@ -211,8 +211,8 @@ class Player:
def notify_self(self): def notify_self(self):
if any((True for c in self.equipment if isinstance(c, tvosc.Fantasma))): if any((True for c in self.equipment if isinstance(c, tvosc.Fantasma))):
self.is_ghost = True self.is_ghost = True
elif self.is_ghost and not self.game.check_event(ceh.CittaFantasma): elif self.is_ghost:
self.is_ghost = False self.is_ghost = self.game.check_event(ceh.CittaFantasma) and self.is_my_turn
if self.is_ghost: self.lives = 0 if self.is_ghost: self.lives = 0
if self.pending_action == PendingAction.DRAW and self.game.check_event(ce.Peyote): if self.pending_action == PendingAction.DRAW and self.game.check_event(ce.Peyote):
self.available_cards = [{ self.available_cards = [{

5
frontend/src/components/Chat.vue
View File

@ -5,7 +5,7 @@
<h3>{{$t("chat.chat")}}</h3> <h3>{{$t("chat.chat")}}</h3>
<button class="btn" @click="collapsed = !collapsed" style="max-height:20pt;">{{collapsed?">>":"X"}}</button> <button class="btn" @click="collapsed = !collapsed" style="max-height:20pt;">{{collapsed?">>":"X"}}</button>
</div> </div>
<h4 v-if="spectators > 0">{{$tc("chat.spectators", spectators)}}</h4> <h4 v-if="spectators > 0" style="margin:0">{{$tc("chat.spectators", spectators)}}</h4>
</div> </div>
<div class="cont"> <div class="cont">
<transition-group name="message" tag="div" id="chatbox" :style="`${collapsed?'display:none':''}`"> <transition-group name="message" tag="div" id="chatbox" :style="`${collapsed?'display:none':''}`">
@ -178,6 +178,7 @@ input {
.chat, .cont { .chat, .cont {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
max-height: 90vh;
} }
#msg-form { #msg-form {
width:100%; width:100%;
@ -197,7 +198,7 @@ input {
margin-left: 10pt; margin-left: 10pt;
} }
.chat, .cont { .chat, .cont {
height: 90vh; height: 88vh;
margin-left: 10pt; margin-left: 10pt;
} }
#submit-message { #submit-message {

1
frontend/src/components/Lobby.vue
View File

@ -329,7 +329,6 @@ export default {
this.$socket.emit('start_game') this.$socket.emit('start_game')
}, },
shufflePlayers() { shufflePlayers() {
this.started = true;
this.$socket.emit('shuffle_players') this.$socket.emit('shuffle_players')
}, },
choose(player_name) { choose(player_name) {