bug fixes

3 files changed, 13 insertions, 18 deletions

diff --git a/MAFH.activity/Menu.py b/MAFH.activity/Menu.py
index 6beeffd..6a45bb6 100644
--- a/MAFH.activity/Menu.py
+++ b/MAFH.activity/Menu.py
@@ -339,11 +339,7 @@ class Menu:
             screen.blit(font.render(message,True,(0,15,0)),(520,350+k,200,300))
             k+=40
       elif self.name=="Defeat":
-          if not self.alphaDrawn:
-            alphaLayer=pygame.image.load(ENV_PATH+"Black.gif")
-            alphaLayer.set_alpha(70)
-            screen.blit(alphaLayer,(0,0,1200,900))
-          self.alphaDrawn=True
+          screen.blit(pygame.image.load(ENV_PATH+"Black.gif"),(0,0,0,0))
           font=pygame.font.SysFont("cmr10",40,False,False)
           screen.blit(font.render("You have been defeated",True,(150,0,0)),(450,400,0,0))
           font=pygame.font.SysFont("cmr10",24,False,False)
diff --git a/MAFH.activity/Shop.py b/MAFH.activity/Shop.py
index 5cbc890..7553d21 100644
--- a/MAFH.activity/Shop.py
+++ b/MAFH.activity/Shop.py
@@ -79,7 +79,7 @@ class Shop:
       if player.shopTutorial==False:
         self.message=[]
         self.message.append("If you want to leave")
-        self.message.append("press    or backspace")
+        self.message.append("press x or backspace")
       if newKey=='escape':
         sys.exit()
       elif newKey=='[6]' or newKey=='right':
@@ -221,13 +221,13 @@ class Shop:
     bgSprite.image=pygame.image.load(MENU_PATH+"ShopBG.gif")
     bgSprite.rect=(0,0,600,900)
     merchantSprite.image=pygame.transform.scale(pygame.image.load(CHAR_PATH+"merchant.gif"),(550,550))
-    merchantSprite.rect=pygame.Rect(640,160,200,200)
+    merchantSprite.rect=pygame.Rect(750,160,200,200)
     merchantGroup=pygame.sprite.Group(merchantSprite)
     bgGroup=pygame.sprite.Group(bgSprite)
     bgGroup.draw(screen)
     screen.blit(font.render("Buy              Sell",True,(0,0,0)),(190,30,50,50))
     merchantGroup.draw(screen)
-    screen.blit(pygame.image.load(MENU_PATH+"Speech.gif"),(550,0,400,400))
+    screen.blit(pygame.image.load(MENU_PATH+"Speech.gif"),(560,0,400,400))
     if self.buyMode:
 
       i=0
diff --git a/MAFH.activity/pippy_app.py b/MAFH.activity/pippy_app.py
index b8a4360..c946b39 100644
--- a/MAFH.activity/pippy_app.py
+++ b/MAFH.activity/pippy_app.py
@@ -588,20 +588,20 @@ class BattleEngine:
         denom2=randint(4,5)
         denom3=randint(6,7)
         denom4=randint(8,9)
-        divisionOptions=["1/"+repr(denom1)+"Power","1/"+repr(denom2)+"Power","1/"+repr(denom3)+"Power","1/"+repr(denom4)+"Power"]
+        divisionOptions=["1/"+repr(denom1)+"Power","2/"+repr(denom2)+"Power","4/"+repr(denom3)+"Power","1/"+repr(denom4)+"Power"]
         divisionBackground=MENU_PATH+"battleMenubackground.gif"
         divisionOptImg=[MENU_PATH+"Blank.gif",MENU_PATH+"Blank.gif",MENU_PATH+"Blank.gif",MENU_PATH+"Blank.gif"]
         self.divisionMenu=Menu(divisionOptions,player,divisionBackground,divisionOptImg,"Division Menu")
         self.divisionMenu.background.rect=(0,300,200,200) 
       elif player.divDifficulty==3:
-        denom1=randint(2,3)
-        denom2=randint(4,5)
-        denom3=randint(6,7)
-        denom4=randint(8,9)
+        denom1=randint(2,9)
+        denom2=randint(2,9)
+        denom3=randint(2,9)
+        denom4=randint(2,9)
         num1=randint(1,2)
         num2=randint(3,4)
-        num3=randint(1,2)
-        num4=randint(3,4)
+        num3=randint(5,6)
+        num4=randint(7,9)
         divisionOptions=[repr(num1)+"/"+repr(denom1)+"Power",repr(num2)+"/"+repr(denom2)+"Power",repr(num3)+"/"+repr(denom3)+"Power",repr(num4)+"/"+repr(denom4)+"Power"]
         divisionBackground=MENU_PATH+"battleMenubackground.gif"
         divisionOptImg=[MENU_PATH+"Blank.gif",MENU_PATH+"Blank.gif",MENU_PATH+"Blank.gif",MENU_PATH+"Blank.gif"]
@@ -1796,8 +1796,6 @@ def updateMenu(event,player):
           for i in range(10):
             menu.select("down")
  
-      elif newKey=='[5]':
-        print('check')
 
       elif newKey=='[6]' or newKey=='right':
         if menu.name=="Defeat":
@@ -2039,7 +2037,8 @@ def drawPuzzle(player,screen):
         if not piece.isHole:
           totalGroup.add(spt)
     totalGroup.draw(screen)
-  pygame.display.flip()
+  if player.popUp==None:
+    pygame.display.flip()
 def drawWaiting(player,screen):
   screen.fill(0,(0,0,1290,700),0)
 def drawMacroMap(player,screen):