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

fix pepperbox

Browse Source
This commit is contained in:
Alberto Xamin 2020-11-28 17:39:18 +01:00
parent 28a43b57b8
commit 834d1896ed
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
2 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/expansions/dodge_city/cards.py
View File

@ -298,7 +298,7 @@ class Pepperbox(Bang):
def play_card(self, player, against, _with=None): def play_card(self, player, against, _with=None):
if self.can_be_used_now: if self.can_be_used_now:
if against != None: if against != None:
Card.play_card(player, against=against) Card.play_card(self, player, against=against)
player.game.attack(player, against) player.game.attack(player, against)
return True return True
return False return False
@ -361,7 +361,7 @@ def get_starting_deck() -> List[Card]:
PlaccaDiFerro(Suit.SPADES, 'Q'), PlaccaDiFerro(Suit.SPADES, 'Q'),
Sombrero(Suit.CLUBS, 7), Sombrero(Suit.CLUBS, 7),
Pugnale(Suit.HEARTS, 8), Pugnale(Suit.HEARTS, 8),
Derringer(Suit.SPADES, 9), Derringer(Suit.SPADES, 7),
Borraccia(Suit.HEARTS, 7), Borraccia(Suit.HEARTS, 7),
CanCan(Suit.CLUBS, 'J'), CanCan(Suit.CLUBS, 'J'),
Conestoga(Suit.DIAMONDS, 9), Conestoga(Suit.DIAMONDS, 9),

6
frontend/src/App.vue
View File

@ -36,12 +36,12 @@
<h2>{{$t("warning")}}</h2> <h2>{{$t("warning")}}</h2>
<p>{{$t("connection_error")}}</p> <p>{{$t("connection_error")}}</p>
</div> </div>
<select style="position:fixed;bottom:4pt;right:4pt;" v-model="$i18n.locale"> <select style="position:absolute;bottom:4pt;right:4pt;" v-model="$i18n.locale">
<option <option
v-for="(lang, i) in ['it.🇮🇹', 'en.🇬🇧']" v-for="(lang, i) in ['it.🇮🇹.Italiano', 'en.🇬🇧.English']"
:key="`lang-${i}`" :key="`lang-${i}`"
:value="lang.split('.')[0]"> :value="lang.split('.')[0]">
{{lang.split('.')[1]}} {{lang.split('.')[0]}} {{lang.split('.')[1]}} {{lang.split('.')[2]}}
</option> </option>
</select> </select>
</div> </div>