X-Git-Url: https://harishankar.org/repos/?p=butaba-adventures.git;a=blobdiff_plain;f=maingame.py;fp=maingame.py;h=75702b8645152f683e2fef58f741b747bb92363d;hp=bde655d5fe0ac086668caeee0daf937ee5f261fa;hb=e233a6fc3203883436813db4a7a76242d77b6483;hpb=9457edf26f8499b7fbeb9921fdd91a762bdfb8c4

diff --git a/maingame.py b/maingame.py
index bde655d..75702b8 100644
--- a/maingame.py
+++ b/maingame.py
@@ -2,6 +2,7 @@ import pygame
 import sys
 import random
 import os.path
+import cPickle
 
 import level
 import butaba
@@ -65,18 +66,23 @@ class MainGame:
 	# set up the levels and their interactions
 	def setup_levels (self):
 
-		self.level1 = level.Level (level.LEVEL_1)
-		self.level1e = level.Level (level.LEVEL_1E,
-									objects = [ gameobjects.Key (4, 3, "a chest key", self.img_key2, level.KEY_CHEST1),
-												gameobjects.Key (4, 3, "a room key", self.img_key, level.KEY_ROOM1),
-												gameobjects.HealthPotion (4, 2, self.img_redpotion),
+		self.level1 = level.Level (cPickle.load (file ("levels/level1.dat")))
+		self.level1w = level.Level (cPickle.load (file ("levels/level1w.dat")))
+		self.level1e = level.Level (cPickle.load (file ("levels/level1e.dat")),
+									objects = [ gameobjects.Key (5, 3, "a chest key", self.img_key2, level.KEY_CHEST1),
+												gameobjects.Key (5, 3, "a room key", self.img_key, level.KEY_ROOM1),
+												gameobjects.HealthPotion (5, 2, self.img_redpotion),
 												gameobjects.Chest (2, 5, "chest", self.img_chest, level.KEY_CHEST1, True),
-												gameobjects.GoldCoins (5, 2, self.img_goldcoins, 50)
+												gameobjects.GoldCoins (6, 2, self.img_goldcoins, 50)
 											]
 											)
 		self.level1.levelright = self.level1e
+		self.level1.levelleft = self.level1w
+
 		self.level1e.levelleft = self.level1
 
+		self.level1w.levelright = self.level1
+
 	def main_loop (self):
 		# main game loop
 		while 1: