Fixed dungeon skipping bug

2 files changed, 17 insertions, 15 deletions

diff --git a/MAFH.activity/Menu.py b/MAFH.activity/Menu.py
index 1741451..3fdb001 100644
--- a/MAFH.activity/Menu.py
+++ b/MAFH.activity/Menu.py
@@ -29,10 +29,10 @@ class Menu:
             sprite=pygame.sprite.Sprite()
 
             if self.name=="Glyph Menu":
-              if player.battlePlayer.AL > 10 and player.battlePlayer.AL < 30:
+              if player.geomDifficulty==2:
                 rotate=90*randint(0,3)
                 sprite.image=pygame.transform.rotate(pygame.image.load(name),rotate)
-              elif player.battlePlayer.AL > 30:
+              elif player.geomDifficulty==3:
                 rotate=90*randint(0,3)
                 flip=randint(0,2)
                 sprite.image=pygame.transform.flip(pygame.transform.rotate(pygame.image.load(name),rotate),flip==1,flip==2)
@@ -132,7 +132,6 @@ class Menu:
     #when 'New Game' is selected
     def tm_ap_newGame(self,player):
         #creates a new game file to work with, runs new game
-        player.dgnIndex=-1
         player.playerFacing=1
         player.traversal=False
         player.mainMenu=False
@@ -661,8 +660,8 @@ class Menu:
           player.currentMenu=player.curBattle.battleMenu
         
         elif name=="LoseContinue":
-           # player.currentX=player.dgn
-           # player.currentY=player.dgn
+            player.currentX=player.dgn.start[0]
+            player.currentY=player.dgn.start[1]
             player.playerFacing=1
             player.nextDungeon(True)
             player.dgnMap.updateMacro(player)
@@ -689,8 +688,7 @@ class Menu:
     def createInventory(self,player):
       invOptions=[]
       invImages=[]
-      ##Create a 10X2 menu of all items in player's inventory
-      ##TODO: make scrollable
+      ##Create a menu of all items in player's inventory
       x=0
       y=0
       i=0
@@ -702,5 +700,5 @@ class Menu:
      
       player.inventoryMenu.sX=485
       player.inventoryMenu.sY=11
-     # self.inventoryMenu.bgSurface=self.bgSurface
+     
       player.currentMenu=player.inventoryMenu
diff --git a/MAFH.activity/pippy_app.py b/MAFH.activity/pippy_app.py
index 1eb2cc6..471f9c0 100644
--- a/MAFH.activity/pippy_app.py
+++ b/MAFH.activity/pippy_app.py
@@ -123,7 +123,7 @@ class Player:
   def toString(self):
     dataList=[]
     dataList.append(self.name)
-    dataList.append(self.dgnIndex)
+    dataList.append(self.dgn.fileName)
     dataList.append(self.critDifficulty)
     dataList.append(self.divDifficulty)
     dataList.append(self.geomDifficulty)
@@ -271,9 +271,7 @@ class Player:
     self.currentRoomGroup=pygame.sprite.Group(self.currentRoomSprite)
   def fromData(self,data):
     self.name=data[0]
-    self.dgnIndex=data[1]-1
-    ##FIXME: nextDungeon now uses file name not by id
-    self.nextDungeon()
+    self.dgn=Dungeon(data[1])
     self.critDifficulty=data[2]
     self.divDifficulty=data[3]
     self.geomDifficulty=data[4]
@@ -334,7 +332,7 @@ class Player:
     else:
       self.traversal=True
     if self.traversal:
-      self.nextDungeon()
+      self.nextDungeon(True)
       self.loadImages(self.dgn.theme)
       self.dgnMap.updateMacro(self)
       self.battlePlayer=Hero(self)
@@ -1858,8 +1856,14 @@ def updateMenu(event,player):
         menu.select("up")
 
       elif newKey=='[9]' or newKey=='backspace':
-        player.mainMenu=False
-        player.traversal=True
+        if player.currentMenu.name=="Save Files":
+          file=player.currentMenu.options[player.currentMenu.currentOption]
+          if not file=="":
+            os.remove(os.path.join(activity.get_activity_root(),"data/")+file[5:len(file)])
+            player.currentMenu.tm_ap_loadGame(player)
+        else:
+          player.mainMenu=False
+          player.traversal=True
         
 
 def updateTraversal(event,player,screen):