running black on py files

FoamyGuy · FoamyGuy · commit b19a020b16c4 · 2020-05-18T20:34:31.000-05:00
diff --git a/Tilemap_Game_With_CircuitPython/basic_movement.py b/Tilemap_Game_With_CircuitPython/basic_movement.py
@@ -1,31 +1,40 @@
 import board
 import displayio
 import adafruit_imageload
-#from tilegame_assets.controls_helper import controls
+
+# from tilegame_assets.controls_helper import controls
 import ugame
 
 display = board.DISPLAY
 player_loc = {"x": 4, "y": 3}
 
 # Load the sprite sheet (bitmap)
-sprite_sheet, palette = adafruit_imageload.load("tilegame_assets/castle_sprite_sheet.bmp",
-                                                bitmap=displayio.Bitmap,
-                                                palette=displayio.Palette)
+sprite_sheet, palette = adafruit_imageload.load(
+    "tilegame_assets/castle_sprite_sheet.bmp",
+    bitmap=displayio.Bitmap,
+    palette=displayio.Palette,
+)
 
 # Create the sprite TileGrid
-sprite = displayio.TileGrid(sprite_sheet, pixel_shader=palette,
-                            width=1,
-                            height=1,
-                            tile_width=16,
-                            tile_height=16,
-                            default_tile=0)
+sprite = displayio.TileGrid(
+    sprite_sheet,
+    pixel_shader=palette,
+    width=1,
+    height=1,
+    tile_width=16,
+    tile_height=16,
+    default_tile=0,
+)
 
 # Create the castle TileGrid
-castle = displayio.TileGrid(sprite_sheet, pixel_shader=palette,
-                            width=10,
-                            height=8,
-                            tile_width=16,
-                            tile_height=16)
+castle = displayio.TileGrid(
+    sprite_sheet,
+    pixel_shader=palette,
+    width=10,
+    height=8,
+    tile_width=16,
+    tile_height=16,
+)
 
 # Create a Group to hold the sprite and add it
 sprite_group = displayio.Group()
@@ -73,14 +82,14 @@
 while True:
     cur_btn_vals = ugame.buttons.get_pressed()
     if not prev_btn_vals & ugame.K_UP and cur_btn_vals & ugame.K_UP:
-        player_loc["y"] = max(1, player_loc["y"]-1)
+        player_loc["y"] = max(1, player_loc["y"] - 1)
     if not prev_btn_vals & ugame.K_DOWN and cur_btn_vals & ugame.K_DOWN:
-        player_loc["y"] = min(6, player_loc["y"]+1)
+        player_loc["y"] = min(6, player_loc["y"] + 1)
 
     if not prev_btn_vals & ugame.K_RIGHT and cur_btn_vals & ugame.K_RIGHT:
-        player_loc["x"] = min(8, player_loc["x"]+1)
+        player_loc["x"] = min(8, player_loc["x"] + 1)
     if not prev_btn_vals & ugame.K_LEFT and cur_btn_vals & ugame.K_LEFT:
-        player_loc["x"] = max(1, player_loc["x"]-1)
+        player_loc["x"] = max(1, player_loc["x"] - 1)
 
     # update the the player sprite position
     sprite.x = 16 * player_loc["x"]
diff --git a/Tilemap_Game_With_CircuitPython/basic_movement_transparent_sprite.py b/Tilemap_Game_With_CircuitPython/basic_movement_transparent_sprite.py
@@ -4,29 +4,37 @@
 import ugame
 
 display = board.DISPLAY
-player_loc = {"x":4, "y":3}
+player_loc = {"x": 4, "y": 3}
 
 # Load the sprite sheet (bitmap)
-sprite_sheet, palette = adafruit_imageload.load("tilegame_assets/castle_sprite_sheet_edited.bmp",
-                                                bitmap=displayio.Bitmap,
-                                                palette=displayio.Palette)
+sprite_sheet, palette = adafruit_imageload.load(
+    "tilegame_assets/castle_sprite_sheet_edited.bmp",
+    bitmap=displayio.Bitmap,
+    palette=displayio.Palette,
+)
 # make the color at 0 index transparent.
 palette.make_transparent(0)
 
 # Create the sprite TileGrid
-sprite = displayio.TileGrid(sprite_sheet, pixel_shader=palette,
-                            width=1,
-                            height=1,
-                            tile_width=16,
-                            tile_height=16,
-                            default_tile=0)
+sprite = displayio.TileGrid(
+    sprite_sheet,
+    pixel_shader=palette,
+    width=1,
+    height=1,
+    tile_width=16,
+    tile_height=16,
+    default_tile=0,
+)
 
 # Create the castle TileGrid
-castle = displayio.TileGrid(sprite_sheet, pixel_shader=palette,
-                            width=10,
-                            height=8,
-                            tile_width=16,
-                            tile_height=16)
+castle = displayio.TileGrid(
+    sprite_sheet,
+    pixel_shader=palette,
+    width=10,
+    height=8,
+    tile_width=16,
+    tile_height=16,
+)
 
 # Create a Group to hold the sprite and add it
 sprite_group = displayio.Group()
@@ -74,14 +82,14 @@
 while True:
     cur_btn_vals = ugame.buttons.get_pressed()
     if not prev_btn_vals & ugame.K_UP and cur_btn_vals & ugame.K_UP:
-        player_loc["y"] = max(1, player_loc["y"]-1)
+        player_loc["y"] = max(1, player_loc["y"] - 1)
     if not prev_btn_vals & ugame.K_DOWN and cur_btn_vals & ugame.K_DOWN:
-        player_loc["y"] = min(6, player_loc["y"]+1)
+        player_loc["y"] = min(6, player_loc["y"] + 1)
 
     if not prev_btn_vals & ugame.K_RIGHT and cur_btn_vals & ugame.K_RIGHT:
-        player_loc["x"] = min(8, player_loc["x"]+1)
+        player_loc["x"] = min(8, player_loc["x"] + 1)
     if not prev_btn_vals & ugame.K_LEFT and cur_btn_vals & ugame.K_LEFT:
-        player_loc["x"] = max(1, player_loc["x"]-1)
+        player_loc["x"] = max(1, player_loc["x"] - 1)
 
     # update the the player sprite position
     sprite.x = 16 * player_loc["x"]
diff --git a/Tilemap_Game_With_CircuitPython/basic_rendering.py b/Tilemap_Game_With_CircuitPython/basic_rendering.py
@@ -5,24 +5,32 @@
 display = board.DISPLAY
 
 # Load the sprite sheet (bitmap)
-sprite_sheet, palette = adafruit_imageload.load("tilegame_assets/castle_sprite_sheet.bmp",
-                                                bitmap=displayio.Bitmap,
-                                                palette=displayio.Palette)
+sprite_sheet, palette = adafruit_imageload.load(
+    "tilegame_assets/castle_sprite_sheet.bmp",
+    bitmap=displayio.Bitmap,
+    palette=displayio.Palette,
+)
 
 # Create the sprite TileGrid
-sprite = displayio.TileGrid(sprite_sheet, pixel_shader=palette,
-                            width=1,
-                            height=1,
-                            tile_width=16,
-                            tile_height=16,
-                            default_tile=0)
+sprite = displayio.TileGrid(
+    sprite_sheet,
+    pixel_shader=palette,
+    width=1,
+    height=1,
+    tile_width=16,
+    tile_height=16,
+    default_tile=0,
+)
 
 # Create the castle TileGrid
-castle = displayio.TileGrid(sprite_sheet, pixel_shader=palette,
-                            width=10,
-                            height=8,
-                            tile_width=16,
-                            tile_height=16)
+castle = displayio.TileGrid(
+    sprite_sheet,
+    pixel_shader=palette,
+    width=10,
+    height=8,
+    tile_width=16,
+    tile_height=16,
+)
 
 # Create a Group to hold the sprite and add it
 sprite_group = displayio.Group()
diff --git a/Tilemap_Game_With_CircuitPython/code.py b/Tilemap_Game_With_CircuitPython/code.py
@@ -10,7 +10,13 @@
 from adafruit_display_text import label
 from tilegame_assets.tiles import TILES
 from tilegame_assets.tiles import take_item
-from tilegame_assets.states import *
+from tilegame_assets.states import (
+    STATE_PLAYING,
+    STATE_MAPWIN,
+    STATE_WAITING,
+    STATE_LOST_SPARKY,
+    STATE_MINERVA,
+)
 from tilegame_assets.fun_facts import FACTS
 from tilegame_assets.text_helper import wrap_nicely
 
@@ -76,14 +82,17 @@
 def get_tile(coords):
     return GAME_STATE["CURRENT_MAP"][coords[0], coords[1]]
 
+
 # return from TILES dict the tile object with stats and behavior for the tile at the given coords.
 def get_tile_obj(coords):
     return TILES[GAME_STATE["CURRENT_MAP"][coords[0], coords[1]]]
 
+
 # check the can_walk property of the tile at the given coordinates
 def is_tile_moveable(tile_coords):
     return TILES[GAME_STATE["CURRENT_MAP"][tile_coords[0], tile_coords[1]]]["can_walk"]
 
+
 print("after funcs {}".format(gc.mem_free()))
 
 # display object variable
diff --git a/Tilemap_Game_With_CircuitPython/tilegame_assets/fun_facts.py b/Tilemap_Game_With_CircuitPython/tilegame_assets/fun_facts.py
@@ -9,5 +9,5 @@
     "Circuitpython was initially released July 19, 2017.",
     "The displayio module was introducted in Circuipython 4.0. It simplified drawing images and text on screens.",
     "The adafruit_dotstar and neopixel libraries make it easy control dazzling addressable RGB LEDs.",
-    "You can sense human touch on an IO pin with the touchio module."
+    "You can sense human touch on an IO pin with the touchio module.",
 ]
diff --git a/Tilemap_Game_With_CircuitPython/tilegame_assets/text_helper.py b/Tilemap_Game_With_CircuitPython/tilegame_assets/text_helper.py
@@ -4,13 +4,13 @@ def wrap_nicely(string, max_chars):
     :param str string: The text to be wrapped.
     :param int max_chars: The maximum number of characters on a line before wrapping.
     """
-    string = string.replace('\n', '').replace('\r', '') # strip confusing newlines
-    words = string.split(' ')
+    string = string.replace("\n", "").replace("\r", "")  # strip confusing newlines
+    words = string.split(" ")
     the_lines = []
     the_line = ""
     for w in words:
-        if len(the_line+' '+w) <= max_chars:
-            the_line += ' '+w
+        if len(the_line + " " + w) <= max_chars:
+            the_line += " " + w
         else:
             the_lines.append(the_line)
             the_line = w
@@ -19,5 +19,5 @@ def wrap_nicely(string, max_chars):
     the_lines[0] = the_lines[0][1:]
     the_newline = ""
     for w in the_lines:
-        the_newline += '\n'+w
+        the_newline += "\n" + w
     return the_newline
diff --git a/Tilemap_Game_With_CircuitPython/tilegame_assets/tiles.py b/Tilemap_Game_With_CircuitPython/tilegame_assets/tiles.py

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`"Circuitpython was initially released July 19, 2017.",`
`10`	`10`	`"The displayio module was introducted in Circuipython 4.0. It simplified drawing images and text on screens.",`
`11`	`11`	`"The adafruit_dotstar and neopixel libraries make it easy control dazzling addressable RGB LEDs.",`
`12`		`- "You can sense human touch on an IO pin with the touchio module."`
	`12`	`+ "You can sense human touch on an IO pin with the touchio module.",`
`13`	`13`	`]`