X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=erdslangetjie%2F__main__.py;h=362bded7dd84ffe240d2982c8e2ce918f839d0cd;hb=8b5efac1072a15677a33e20d888c265e380d0e07;hp=b4c25c2814b7e60d9e02470dbd0d1b4e19dead0a;hpb=1f3785002aba3ffe7e905d4f7b86c0782f1ca15c;p=erdslangetjie.git

diff --git a/erdslangetjie/__main__.py b/erdslangetjie/__main__.py
index b4c25c2..362bded 100644
--- a/erdslangetjie/__main__.py
+++ b/erdslangetjie/__main__.py
@@ -12,7 +12,7 @@ from kivy.clock import Clock
 from kivy.config import Config
 
 from erdslangetjie.level import LevelList
-from erdslangetjie.data import load_image
+from erdslangetjie.data import load_image, load_sound
 from erdslangetjie.player import ThePlayer, Nemesis
 
 
@@ -42,8 +42,10 @@ class GameWindow(RelativeLayout):
 
         self.mouse_move = False
 
+        self.caught = load_sound('sounds/caught.ogg')
+
         self.player = ThePlayer()
-        self.nemesis = Nemesis()
+        self.nemesis = Nemesis(self.app.config)
         if not self.level_obj.enter_pos:
             raise RuntimeError('No entry point')
         self.player_tile = None
@@ -123,20 +125,15 @@ class GameWindow(RelativeLayout):
                 if true_point[0] >= self.view.size[0]:
                     self.view.scroll_x += self.x_scroll_margin
                     true_point = self.to_parent(*check_point)
-                    #print '-x', self.view.scroll_x, self.view.scroll_y
                 elif true_point[0] < 0:
                     self.view.scroll_x -= self.x_scroll_margin
                     true_point = self.to_parent(*check_point)
-                    #print '+x', self.view.scroll_x, self.view.scroll_y
                 elif true_point[1] >= self.view.size[1]:
                     self.view.scroll_y += self.y_scroll_margin
                     true_point = self.to_parent(*check_point)
-                    #print '+y', self.view.scroll_x, self.view.scroll_y
                 elif true_point[1] < 0:
                     self.view.scroll_y -= self.y_scroll_margin
                     true_point = self.to_parent(*check_point)
-                    #print '-y', self.view.scroll_x, self.view.scroll_y
-                #print true_point, self.view.size
 
     def included(self, point, margin):
         if point[0] < margin:
@@ -192,11 +189,17 @@ class GameWindow(RelativeLayout):
 
     def do_nemesis_move(self):
         self.nemesis.move(self.level_obj, self.player.pos)
-        self.move_counter += 1
         self.check_state()
-        self.reset_timer()
+        if self.move_counter > 4:
+            self.move_counter = 0
+            self.draw_nemesis()
+            self.nemesis.move(self.level_obj, self.player.pos)
+            self.check_state()
+        else:
+            self.move_counter += 1
         self.draw_nemesis()
         self.draw_player()
+        self.reset_timer()
 
     def timed_move(self, event):
         if not self.level_obj:
@@ -206,12 +209,7 @@ class GameWindow(RelativeLayout):
     def reset_timer(self):
         self.timer_set = True
         Clock.unschedule(self.timed_move)
-        if self.move_counter > 4:
-            self.move_counter = 0
-            # The superhero is faster than the player
-            Clock.schedule_once(self.timed_move, 0.02)
-        else:
-            Clock.schedule_once(self.timed_move, 1)
+        Clock.schedule_once(self.timed_move, 3)
 
     def check_caught(self):
         return self.nemesis.pos == self.player.pos
@@ -245,13 +243,20 @@ class GameWindow(RelativeLayout):
             # Jump to next level
             self.level_obj = self.level_list.advance_to_next_level()
             if not self.load_level():
-                self.app.game_over(True)
+                app = self.app
+                self.app = None
+                self._closed()
+                app.game_over(True)
             return
         elif self.check_caught():
             # Caught
+            if self.app.config.getdefault('bane', 'sound', '0') != '0':
+                self.caught.play()
             self.reset_level()
-            self.load_level()
-            self.app.game_over(False)
+            app = self.app
+            self.app = None
+            self._closed()
+            app.game_over(False)
             return
         elif self.level_obj.is_button(self.player.pos):
             self.level_obj.trigger_button(self.player.pos)
@@ -335,14 +340,47 @@ class LostScreen(Screen):
 
 class GameApp(App):
 
-    title = "Peter's thread snake"
+    title = "Bane's Befuddlement"
 
     def __init__(self):
         super(GameApp, self).__init__()
         self.levels = LevelList()
+        self.game = None
+
+    def build_config(self, config):
+        config.setdefaults('bane', {
+            'start_level': 'levels/level1.txt',
+            'sound': 'True'
+            })
+
+    def build_settings(self, settings):
+        config_json = """[
+            { "type": "title",
+              "title": "Bane's Befuddlement"
+            },
+
+            { "type": "options",
+              "title": "Start Level",
+              "desc": "Level to start at",
+              "section": "bane",
+              "key": "start_level",
+              "options": ["%s"] },
+
+            { "type": "bool",
+              "title": "Sound",
+              "desc": "Enable sound",
+              "section": "bane",
+              "key": "sound"
+             }
+             ]""" % '", "'.join(self.levels.get_level_names())
+        settings.add_json_panel("Bane's Befuddlement",
+                self.config, data=config_json)
 
     def build(self):
         root = ScrollView(size_hint=(None, None))
+        level_name = self.config.getdefault('bane', 'start_level', None)
+        if level_name:
+            self.levels.set_level_to(level_name)
         return root
 
     def on_start(self):
@@ -369,15 +407,15 @@ class GameApp(App):
 
     def start_game(self, label, ref):
         """Start the game"""
-        game = GameWindow(self.levels, self)
-        game.build()
+        self.game = GameWindow(self.levels, self)
+        self.game.build()
         self.root.clear_widgets()
-        self.root.add_widget(game)
+        self.root.add_widget(self.game)
         # Ensure the player is visible
         self.root.scroll_x = 0
         self.root.scroll_y = 0
-        game.draw_player()
-        game.draw_nemesis()
+        self.game.draw_player()
+        self.game.draw_nemesis()
 
     def game_over(self, won):
         if won:
@@ -385,6 +423,8 @@ class GameApp(App):
             self.levels.reset()
         else:
             screen = LostScreen(self)
+        del self.game
+        self.game = None
         self.root.clear_widgets()
         self.root.add_widget(screen)