X-Git-Url: https://harishankar.org/repos/?p=butaba-adventures.git;a=blobdiff_plain;f=maingame.py;fp=maingame.py;h=02527db2d80bd5f2ffe3822f89a0b31f95e5580c;hp=05e8916ad103d9397a8ede0b1216b9a4f10064d9;hb=0b36c3ccd4cb9cdf58fa5285366f023a8c931c61;hpb=6552a4a3522d0b48177a9c2ebedda92b824874f7 diff --git a/maingame.py b/maingame.py index 05e8916..02527db 100644 --- a/maingame.py +++ b/maingame.py @@ -75,9 +75,12 @@ class MainGame: key2 = gameobjects.Key (5, 3, "a chest key", self.img_key, constants.KEY_CHEST2) potion = gameobjects.HealthPotion (5, 2, self.img_redpotion) gold50 = gameobjects.GoldCoins (6, 2, self.img_goldcoins, 50) - gold75 = gameobjects.GoldCoins (6, 2, self.img_goldcoins, 75) + gold25 = gameobjects.GoldCoins (6, 2, self.img_goldcoins, 25) + gold10 = gameobjects.GoldCoins (6, 2, self.img_goldcoins, 10) + potion2 = gameobjects.HealthPotion (5, 2, self.img_redpotion) + potion3 = gameobjects.HealthPotion (5, 2, self.img_redpotion) - chest1.objects = [ gold50, gold75 ] + chest1.objects = [ gold50, gold25, potion2, potion3, key2, gold10 ] # create the levels self.level1 = level.Level (cPickle.load (file ("levels/level1.dat")), @@ -86,7 +89,7 @@ class MainGame: self.level1w = level.Level (cPickle.load (file ("levels/level1w.dat"))) self.level1e = level.Level (cPickle.load (file ("levels/level1e.dat")), - objects = [ key1, key2, potion, chest2 ]) + objects = [ key1, potion, chest2 ]) # set up the interaction between levels self.level1.levelright = self.level1e @@ -135,15 +138,11 @@ class MainGame: # drink a health potion if it is in the player's inventory def inventory_drink_health_potion (self): - # if health is maxed out then ignore - if self.butaba.health == butaba.Butaba.MAXHEALTH: - self.status_message = "You already have maximum health." - else: - # look for a health potion - for item in self.butaba.inventory: - if isinstance (item, gameobjects.HealthPotion) is True: - self.use_object (self.butaba, item) - break + # look for a health potion + for item in self.butaba.objects: + if isinstance (item, gameobjects.HealthPotion) is True: + self.use_object (self.butaba, item) + break def move_butaba_up (self): # clear any status messages @@ -158,9 +157,8 @@ class MainGame: # if there is a level above set current level to that one if self.currentlevel.leveltop is not None: lastrow = len (self.currentlevel.leveltop.background) - 1 - # if there is any object in that place interact with it - # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel.leveltop, lastrow, self.butaba.col) is False: + # interact with objects + if self.level_interact (self.currentlevel.leveltop, lastrow, self.butaba.col) is False: return # make sure there is no obstacle @@ -171,7 +169,7 @@ class MainGame: else: # if there is any object in that place interact with it # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel, self.butaba.row-1, self.butaba.col) is False: + if self.level_interact (self.currentlevel, self.butaba.row-1, self.butaba.col) is False: return if self.check_background_obstacle (self.currentlevel, self.butaba.row-1, self.butaba.col) is False: @@ -191,7 +189,7 @@ class MainGame: if self.currentlevel.levelbottom is not None: # interact with objects if any # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel.levelbottom, 0, self.butaba.col) is False: + if self.level_interact (self.currentlevel.levelbottom, 0, self.butaba.col) is False: return # make sure there is no obstacle at that position if self.check_background_obstacle (self.currentlevel.levelbottom, 0, self.butaba.col) is False: @@ -201,7 +199,7 @@ class MainGame: else: # interact with objects if any # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel, self.butaba.row+1, self.butaba.col) is False: + if self.level_interact (self.currentlevel, self.butaba.row+1, self.butaba.col) is False: return if self.check_background_obstacle (self.currentlevel, self.butaba.row+1, self.butaba.col) is False: self.butaba.row += 1 @@ -213,16 +211,24 @@ class MainGame: else: return False - # get and interact with objects if present in a particular row/col - def interact_objects (self, level, row, col): + # get and interact with objects and characters if present in a particular row/col + def level_interact (self, level, row, col): objs = [] # get list of objects at current location for obj in level.objects: if obj.row == row and obj.col == col: objs.append (obj) + notblock = self.interact_objects (level, objs) + + return notblock + + + # interaction with objects + def interact_objects (self, container, objs): # overall flag for blocking/non-blocking objects notblock = True + # now perform interaction for obj in objs: # run the object interact function @@ -233,13 +239,15 @@ class MainGame: ans = utility.ask_question (self.screen, "Found %s." % obj.text, ["Pick up", "Use", "Ignore"], self.img_menu) # if the answer is "pick up" if ans == 1: - self.pickup_object (self.currentlevel, obj) + self.pickup_object (container, obj) elif ans == 2: # use the object according to its type - self.use_object (self.currentlevel, obj) + self.use_object (container, obj) # if it cannot be picked up, try to use it anyway else: - self.use_object (self.currentlevel, obj) + ans = utility.ask_question (self.screen, "Found %s." % obj.text, ["Use", "Ignore"], self.img_menu) + if ans == 1: + self.use_object (container, obj) return notblock @@ -263,9 +271,12 @@ class MainGame: def use_object (self, container, obj): # if the object is a health potion if isinstance (obj, gameobjects.HealthPotion) is True: - obj.use (self.butaba) - container.objects.remove (obj) - self.status_message = "You gained health" + if self.butaba.health < butaba.Butaba.MAXHEALTH: + obj.use (self.butaba) + container.objects.remove (obj) + self.status_message = "You gained health" + else: + self.status_message = "You already have maximum health!" # if the object is a chest elif isinstance (obj, gameobjects.Chest) is True: # if chest is locked, try to open it @@ -293,14 +304,16 @@ class MainGame: self.status_message += " and gained experience!" # display the contents of the chest else: - utility.display_container_contents (self.screen, obj, self.img_chestbg, 30) + item = utility.get_container_object (self.screen, obj, self.img_chestbg, 30) + if item is not None: + self.interact_objects (obj, [ item, ]) # if the object is gold coins elif isinstance (obj, gameobjects.GoldCoins) is True: obj.use (self.butaba) self.status_message = "You picked up %d gold." % obj.value # remove the gold coins after adding it to Butaba's gold - container.remove (obj) + container.objects.remove (obj) def move_butaba_left (self): # clear any status messages @@ -319,7 +332,7 @@ class MainGame: lastcol = len (self.currentlevel.levelleft.background[0]) - 1 # interact with objects if any # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel.levelleft, self.butaba.row, lastcol) is False: + if self.level_interact (self.currentlevel.levelleft, self.butaba.row, lastcol) is False: return # make sure there is no obstacle at that position of movement if self.check_background_obstacle (self.currentlevel.levelleft, self.butaba.row, lastcol) is False: @@ -329,7 +342,7 @@ class MainGame: else: # interact with objects if any # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel, self.butaba.row, self.butaba.col-1) is False: + if self.level_interact (self.currentlevel, self.butaba.row, self.butaba.col-1) is False: return if self.check_background_obstacle (self.currentlevel, self.butaba.row, self.butaba.col-1) is False: self.butaba.col -= 1 @@ -349,7 +362,7 @@ class MainGame: if self.currentlevel.levelright is not None: # interact with objects if any # if any object is a blocking object then avoid movement - if self.interact_objects (self.currentlevel.levelright, self.butaba.row, 0) is False: + if self.level_interact (self.currentlevel.levelright, self.butaba.row, 0) is False: return # make sure there is no obstacle at that position of movement @@ -361,7 +374,7 @@ class MainGame: else: # interact with objects if any # if any object is a blocking object then avoid moving - if self.interact_objects (self.currentlevel, self.butaba.row, self.butaba.col + 1) is False: + if self.level_interact (self.currentlevel, self.butaba.row, self.butaba.col + 1) is False: return if self.check_background_obstacle (self.currentlevel, self.butaba.row, self.butaba.col + 1) is False: self.butaba.col += 1