Skip to content

Commit 1c4deb7

Browse files
authored
Merge pull request adafruit#1040 from dastels/clue_dice
Some formatting tweaks
2 parents 9c5c115 + 7c4e518 commit 1c4deb7

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

CLUE_Dice_Roller/clue_dice_roller.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,30 @@
3232
button_a = Debouncer(lambda: clue.button_a)
3333
button_b = Debouncer(lambda: clue.button_b)
3434

35-
3635
# Set up display
3736

38-
display = board.DISPLAY
39-
selection_font = bitmap_font.load_font('/Helvetica-Bold-36.bdf')
40-
selection_font.load_glyphs(b'0123456789XDd')
41-
selection_color = 0x0000FF
37+
select_font = bitmap_font.load_font('/Helvetica-Bold-36.bdf')
38+
select_font.load_glyphs(b'0123456789XDd')
39+
select_color = 0x0000FF
4240

4341
roll_font = bitmap_font.load_font('/Anton-Regular-104.bdf')
44-
roll_font.load_glyphs(b'0123456789XDd')
42+
roll_font.load_glyphs(b'0123456789X')
4543
roll_color = 0xFFFFFF
4644

47-
selection_label = label.Label(selection_font, x=0, y=25, text='XdXXX', color=selection_color)
45+
select_label = label.Label(select_font, x=0, y=25, text='XdXXX', color=select_color)
4846
roll_label = label.Label(roll_font, x=0, y=150, text='XXX', color=roll_color)
4947

5048
group = displayio.Group()
51-
group.append(selection_label)
49+
group.append(select_label)
5250
group.append(roll_label)
5351

54-
display.show(group)
52+
board.DISPLAY.show(group)
5553

5654
# Helper functions
5755

5856
def roll(count, sides):
5957
for i in range(15):
60-
roll_value = sum([randint(1, sides) for d in range(count + 1)])
58+
roll_value = sum([randint(1, sides) for _ in range(count + 1)])
6159
roll_label.text = str(roll_value)
6260
roll_label.x = 120 - (roll_label.bounding_box[2] // 2)
6361
duration = (i * 0.05) / 2
@@ -66,8 +64,8 @@ def roll(count, sides):
6664

6765

6866
def update_display(count, sides):
69-
selection_label.text = '{0}d{1}'.format(count + 1, SIDES[sides])
70-
selection_label.x = 120 - (selection_label.bounding_box[2] // 2)
67+
select_label.text = '{0}d{1}'.format(count + 1, SIDES[sides])
68+
select_label.x = 120 - (select_label.bounding_box[2] // 2)
7169
roll_label.text = ''
7270

7371

0 commit comments

Comments
 (0)