From 4515c584f468e1a6e9b1bdefb4c5f44e905ea798 Mon Sep 17 00:00:00 2001 From: MJ Rossetti Date: Thu, 7 Sep 2017 19:12:29 -0400 Subject: [PATCH 1/4] Resolve load error and erroneous file reference. --- lessons/7-spawning.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lessons/7-spawning.md b/lessons/7-spawning.md index a204419..e617633 100644 --- a/lessons/7-spawning.md +++ b/lessons/7-spawning.md @@ -65,12 +65,14 @@ Make a file called `spawn.csv` and let's populate it: Now we'll make a new generator: + import csv + def file_spawner(file_name): with open(path.join(path.dirname(__file__), file_name), "r") as spawn_file: - spawn_reader = csv.reader(csvfile) + spawn_reader = csv.reader(spawn_file) for row in spawn_reader: yield float(row[0]), int(row[1]) Then replace our simple spawner with this. - self.spawner = Spawner(self, file_spawner('spawn.csv'), Enemy) \ No newline at end of file + self.spawner = Spawner(self, file_spawner('spawn.csv'), Enemy) From c09e0cea3a549cfb5e1a1d0aacade4893f93c55c Mon Sep 17 00:00:00 2001 From: MJ Rossetti Date: Thu, 7 Sep 2017 19:18:36 -0400 Subject: [PATCH 2/4] Resolve issue by setting next_time --- lessons/7-spawning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lessons/7-spawning.md b/lessons/7-spawning.md index e617633..1d2a2be 100644 --- a/lessons/7-spawning.md +++ b/lessons/7-spawning.md @@ -27,7 +27,7 @@ So let's make a spawner! def prime(self): try: - self.next_spawn, self.next_position = next(self.generator) + self.next_time, self.next_position = next(self.generator) except StopIteration: self.running = False From de865ac3b6a117ea3ff5f6c63fb16b23bc72d9a3 Mon Sep 17 00:00:00 2001 From: MJ Rossetti Date: Thu, 7 Sep 2017 19:30:50 -0400 Subject: [PATCH 3/4] Fix collision instructions --- lessons/6-enemies.md | 1 + 1 file changed, 1 insertion(+) diff --git a/lessons/6-enemies.md b/lessons/6-enemies.md index edf20ab..be9407c 100644 --- a/lessons/6-enemies.md +++ b/lessons/6-enemies.md @@ -48,6 +48,7 @@ Let's make some collisions! enemies = self.groups["enemy"] groupcollide(player, enemies, True, True) groupcollide(enemies, bullets, True, True) + self.spawner.spawn(time_delta) `groupcollide` takes two sprite groups and checks every sprite inside against each other. The two booleans are telling group collide to kill From 5f9b12b90b66242eede34a236a9b7bf67718f7b6 Mon Sep 17 00:00:00 2001 From: MJ Rossetti Date: Thu, 7 Sep 2017 19:51:42 -0400 Subject: [PATCH 4/4] Ensure these params are integers --- lessons/3-first-sprite.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lessons/3-first-sprite.md b/lessons/3-first-sprite.md index 24b2150..cbf14de 100644 --- a/lessons/3-first-sprite.md +++ b/lessons/3-first-sprite.md @@ -67,5 +67,5 @@ What if I don't like how big it is? image = image.load("player.png") scaled_image = smoothscale(image, - (image.get_width() * 0.5, - image.get_height() * 0.5)) + ( int(image.get_width() * 0.5), + int(image.get_height() * 0.5)) )