From 95119e4d2f79003b96812dbbb469db6b6a81157b Mon Sep 17 00:00:00 2001
From: Aaron Perley <aaron.perley@gmail.com>
Date: Mon, 17 Oct 2016 00:47:07 -0400
Subject: Bugfixes

---
 fish_show.py | 115 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 58 insertions(+), 57 deletions(-)

(limited to 'fish_show.py')

diff --git a/fish_show.py b/fish_show.py
index a94a422..7af4c0b 100644
--- a/fish_show.py
+++ b/fish_show.py
@@ -127,63 +127,64 @@ class FishShow(Show):
 
     def update(self):
         event = self.recv_event()
-        if event and event[0] == 'spawn':
-            new_fish = Fish.by_type(event[1]['type'])
-            if new_fish:
-                self.fishes.add(new_fish)
-
-        for col in self.lights:
-            for light in col:
-                light.update_base(self.depth)
-
-        for fish in list(self.fishes):
-            if not fish.update():
-                self.fishes.remove(fish)
-
-            for x in xrange(int(fish.x), int(fish.x+fish.width+1)):
-                if x < len(self.lights):
-                    for light in self.lights[x]:
-                        light.update_fish(fish)
-
-        for col in self.lights:
-            for light in col:
-                light.blit()
-
-
-        self.tick_count += 1
-        if self.tick_count % self.TICKS_PER_DEPTH == 0:
-            self.depth += 1
-            print("DEPTH: ", self.depth)
-            if self.depth == 1:
-                """boat, dolphin"""
-                self.send_event('enable image', {'name': 'boat'})
-                self.send_event('enable image', {'name': 'dolphin'})
-            elif self.depth == 2:
-                """dolphin, jellyfish"""
-                self.send_event('disable image', {'name': 'boat'})
-                self.send_event('enable image', {'name': 'jellyfish'})
-            elif self.depth == 3:
-                """jellyfish, nemo, dory, whale"""
-                self.send_event('disable image', {'name': 'dolphin'})
-            	self.send_event('enable image', {'name': 'nemo'})
-            	self.send_event('enable image', {'name': 'dory'})
-            	self.send_event('enable image', {'name': 'whale'})
-            elif self.depth == 4:
-                """nemo, dory, whale, shark"""
-                self.send_event('disable image', {'name': 'jellyfish'})
-                self.send_event('enable image', {'name': 'shark'})
-            elif self.depth == 5:
-                """whale, shark, stingray"""
-                self.send_event('disable image', {'name': 'nemo'})
-                self.send_event('disable image', {'name': 'dory'})
-                self.send_event('enable image', {'name': 'stingray'})
-            elif self.depth == 6:
-                """stingray, eel"""
-                self.send_event('disable image', {'name': 'whale'})
-                self.send_event('disable image', {'name': 'shark'})
-            	self.send_event('enable image', {'name': 'eel'})
-
-        if self.depth > self.MAX_DEPTH:
+        if self.depth <= self.MAX_DEPTH:
+            if event and event[0] == 'spawn':
+                new_fish = Fish.by_type(event[1]['type'])
+                if new_fish:
+                    self.fishes.add(new_fish)
+
+            for col in self.lights:
+                for light in col:
+                    light.update_base(self.depth)
+
+            for fish in list(self.fishes):
+                if not fish.update():
+                    self.fishes.remove(fish)
+
+                for x in xrange(int(fish.x), int(fish.x+fish.width+1)):
+                    if x < len(self.lights):
+                        for light in self.lights[x]:
+                            light.update_fish(fish)
+
+            for col in self.lights:
+                for light in col:
+                    light.blit()
+
+
+            self.tick_count += 1
+            if self.tick_count % self.TICKS_PER_DEPTH == 0:
+                self.depth += 1
+                print("DEPTH: ", self.depth)
+                if self.depth == 1:
+                    """boat, dolphin"""
+                    self.send_event('enable image', {'name': 'boat'})
+                    self.send_event('enable image', {'name': 'dolphin'})
+                elif self.depth == 2:
+                    """dolphin, jellyfish"""
+                    self.send_event('disable image', {'name': 'boat'})
+                    self.send_event('enable image', {'name': 'jellyfish'})
+                elif self.depth == 3:
+                    """jellyfish, nemo, dory, whale"""
+                    self.send_event('disable image', {'name': 'dolphin'})
+                    self.send_event('enable image', {'name': 'nemo'})
+                    self.send_event('enable image', {'name': 'dory'})
+                    self.send_event('enable image', {'name': 'whale'})
+                elif self.depth == 4:
+                    """nemo, dory, whale, shark"""
+                    self.send_event('disable image', {'name': 'jellyfish'})
+                    self.send_event('enable image', {'name': 'shark'})
+                elif self.depth == 5:
+                    """whale, shark, stingray"""
+                    self.send_event('disable image', {'name': 'nemo'})
+                    self.send_event('disable image', {'name': 'dory'})
+                    self.send_event('enable image', {'name': 'stingray'})
+                elif self.depth == 6:
+                    """stingray, eel"""
+                    self.send_event('disable image', {'name': 'whale'})
+                    self.send_event('disable image', {'name': 'shark'})
+                    self.send_event('enable image', {'name': 'eel'})
+
+        else:
             self.send_event('disable image', {'name': 'stingray'})
             self.send_event('disable image', {'name': 'eel'})
 
-- 
cgit v1.3.1