Debugged a bit. Now player can progress through all levels. TODO: add enemies in dgn 4-5 gen, and 1-2 ice

8 files changed, 48 insertions, 54 deletions

diff --git a/MAFH.activity/Enemy.py b/MAFH.activity/Enemy.py
index d1ee6dc..2c59234 100644
--- a/MAFH.activity/Enemy.py
+++ b/MAFH.activity/Enemy.py
@@ -9,8 +9,10 @@ ENEMY = {
     '2':{'name':_('Goblin'),'img':"concept_goblin.gif",'hp':40,'att':3,'weak':'fire'},
     '3':{'name':_('Orc'),'img':"concept_orc.gif",'hp':50,'att':5,'weak':'lightning'},
     '4':{'name':_('Stone Golem'),'img':"concept_orc.gif",'hp':10,'att':6,'weak':'missile'},
-    #'5':{'name':_('Serratula')},
-    #'6':{'name':_('Feren')},
+    '5':{'name':_('Serratula'),'img':"Crab.png",'hp':125,'att':12,'weak':'crit'},
+    '6':{'name':_('Feren'),'img':"merchant.gif",'hp':200,'att':10,'weak':'special'},
+    '7':{'name':_('Cave Crab'),'img':"Crab.png",'hp':50,'att':7,'weak':'missile'},
+    '8':{'name':_('Frost Giant'),'img':"frost_giant.gif",'hp':45,'att':9,'weak':'fire'}
 }
 
 class Enemy(Actor):
diff --git a/MAFH.activity/Shop.py b/MAFH.activity/Shop.py
index bfd2f18..5cbc890 100644
--- a/MAFH.activity/Shop.py
+++ b/MAFH.activity/Shop.py
@@ -220,7 +220,7 @@ class Shop:
     bgSprite=pygame.sprite.Sprite()
     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.image=pygame.transform.scale(pygame.image.load(CHAR_PATH+"merchant.gif"),(550,550))
     merchantSprite.rect=pygame.Rect(640,160,200,200)
     merchantGroup=pygame.sprite.Group(merchantSprite)
     bgGroup=pygame.sprite.Group(bgSprite)
diff --git a/MAFH.activity/assets/map/al1.txt b/MAFH.activity/assets/map/al1.txt
index b40fb9b..e3af6c7 100755
--- a/MAFH.activity/assets/map/al1.txt
+++ b/MAFH.activity/assets/map/al1.txt
@@ -9,7 +9,7 @@ Nx0000Eu00000lv000000
 00Su000000000qv000000
 000000000000000000000
 NuSl000000000lhlh0000
-Nu0000Eu0000000000000
+Nu0000Eu0030000000000
 00SuWuEu00000lv000000
 Nl00Wu000000000000000
 000000000000000000000
diff --git a/MAFH.activity/assets/map/al4.txt b/MAFH.activity/assets/map/al4.txt
index a709c52..6d109bc 100755
--- a/MAFH.activity/assets/map/al4.txt
+++ b/MAFH.activity/assets/map/al4.txt
@@ -3,23 +3,23 @@ al4.txt
 4x5
 0
 al5.txt
-000000000000000000000

-00Su00Eu0000000000000

-0000WuEu0000000000000

-00SuWu000000000000000

-00Su00Eu0000000000000

-Nu00Wu000000000000000

-000000000000000000000

-Nu0000Ex0000000000000

-Nu0000Eu0000000000000

-00SuWuEu0000000000000

-0000WuEu0000000000000

-00SuWu000000000000000

-000000000000000000000

-Nu0000000000000000000

-000000000000000000000

-NuSu00000000000000000

-000000000000000000000

-00Se00Eu0000000000000

-0000WuEu0000000000000

-Nu00Wu000000000000000

+000000000000000000000
+00Su00Eu00000rvqv0000
+0000WuEu0000000000000
+00SuWu000000000000000
+00Su00Eu0000000000000
+Nu00Wu000000000000000
+000000000000000000000
+Nu0000Ex0000000000000
+Nu0000Eu0000000000000
+00SuWuEu0000000000000
+0000WuEu0000000000000
+00SuWu000000000000000
+000000000000000000000
+Nu0000000000000000000
+000000000000000000000
+NuSu00000000000000000
+000000000000000000000
+00Se00Eu0000000000000
+0000WuEu0000000000000
+Nu00Wu000000000000000
diff --git a/MAFH.activity/assets/map/al5.txt b/MAFH.activity/assets/map/al5.txt
index 4839bf9..b323933 100755
--- a/MAFH.activity/assets/map/al5.txt
+++ b/MAFH.activity/assets/map/al5.txt
@@ -2,7 +2,7 @@ Dungeon 5
 al5.txt
 5x4
 0
-al5.txt
+bl1.txt
 0000Wu000000000000000

 00Su00000000000000000

 000000000000000000000

@@ -11,10 +11,10 @@ al5.txt
 0000WxEu0000000000000

 NuSuWuEu0000000000000

 0000WuEu0000000000000

-NuSuWuEu0000000000000

+NuSuWuEu00000qv000000

 0000Wu000000000000000

 000000000000000000000

-NuSu00000000000000000

+NuSu000000000rv000000

 000000000000000000000

 NuSu00000000000000000

 000000000000000000000

diff --git a/MAFH.activity/assets/map/al6.txt b/MAFH.activity/assets/map/bl1.txt
index 274ba4d..450f62c 100755
--- a/MAFH.activity/assets/map/al6.txt
+++ b/MAFH.activity/assets/map/bl1.txt
@@ -1,13 +1,13 @@
 Dungeon 6
-al6.txt
+bl1.txt
 5x5
-0
-al7.txt
+1
+bl2.txt
 00Su00Eu00000000000000000

 0000WuEu00000000000000000

 0000WuEu00000000000000000

-0000WuEu00000000000000000

-0000WuEe00000000000000000

+0000WuEu00000qv0000000000

+0000WuEe00000rv0000000000

 NuSu000000000000000000000

 0000000000000000000000000

 0000000000000000000000000

diff --git a/MAFH.activity/assets/map/al7.txt b/MAFH.activity/assets/map/bl2.txt
index 2ce236a..f04b997 100755
--- a/MAFH.activity/assets/map/al7.txt
+++ b/MAFH.activity/assets/map/bl2.txt
@@ -1,6 +1,6 @@
 Dungeon 6
-al7.txt
+bl2.txt
 1x1
-0
+1
 0
 00Se00000000000000000
diff --git a/MAFH.activity/pippy_app.py b/MAFH.activity/pippy_app.py
index 471f9c0..83caf72 100644
--- a/MAFH.activity/pippy_app.py
+++ b/MAFH.activity/pippy_app.py
@@ -388,13 +388,13 @@ class Player:
       for item in self.battlePlayer.inv_Ar:
         if item.type=="key":
           self.battlePlayer.inv_Ar.remove(item)
+      if self.dgn==None:
+        self.dgn=Dungeon('al1.txt')
       if reload:
           self.dgn=Dungeon(self.dgn.fileName)
       elif self.dgn:
           self.battlePlayer.MHP+=2
           self.dgn=Dungeon(self.dgn.next)
-      else:
-          self.dgn=Dungeon('al1.txt')
       if self.dgn.theme != self.theme:
         self.loadImages(self.dgn.theme)
         self.theme=self.dgn.theme
@@ -670,7 +670,7 @@ class BattleEngine:
           screen.blit(inputText,pygame.Rect(250,400,200,30))
       
       
-      if self.timeBonus<1:
+      if self.timeBonus<1 and self.timeBonus>=0:
         screen.blit(pygame.transform.scale(pygame.image.load(HUD_PATH+"bt_"+repr(int(self.timeBonus*10)*10)+".gif"),(275,50)),(5,200,150,50))
     pygame.display.flip()
 
@@ -687,6 +687,7 @@ class BattleEngine:
   def attack(self,attacker,attackName):
     defender=self.enemies[self.selEnemyIndex]
     if attackName=="critical":
+      self.player.atkTutorial=True
       attacker.setBonusAP(attacker.currentAnswer+int(self.timeBonus*10))
       if isinstance(defender,Enemy) and defender.weakness=='normal':
         attacker.setBonusAP(attacker.BAB*2)
@@ -695,10 +696,10 @@ class BattleEngine:
       tup=(tup[0]+1,tup[1])
       self.player.multiplicationStats[self.player.critDifficulty-1]=tup
       if not player.scanTutorial:
-        player.popUp=PopUp(10,10,["To discover an enemy's weakness","select scan"])
-        player.scanTutorial=True
+        self.player.popUp=PopUp(10,10,["To discover an enemy's weakness","select scan"])
+        self.player.scanTutorial=True
       else:
-        player.popUp=None
+        self.player.popUp=None
     elif attackName=="Fire":
       attacker.setBonusAP(int(self.timeBonus*20)+10)
       if isinstance(defender,Enemy) and defender.weakness=='fire':
@@ -710,7 +711,7 @@ class BattleEngine:
       tup=self.player.geometryStats[self.player.geomDifficulty-1]
       tup=(tup[0]+1,tup[1])
       self.player.geometryStats[self.player.geomDifficulty-1]=tup
-      self.player.geomTutorial=True
+      self.player.magTutorial=True
       self.player.popUp=None
 
     elif attackName=="Heal":
@@ -721,7 +722,7 @@ class BattleEngine:
       tup=self.player.geometryStats[self.player.geomDifficulty-1]
       tup=(tup[0]+1,tup[1])
       self.player.geometryStats[self.player.geomDifficulty-1]=tup
-      self.player.geomTutorial=True
+      self.player.magTutorial=True
       self.player.popUp=None
 
     elif attackName=="Lightning":
@@ -735,7 +736,7 @@ class BattleEngine:
       tup=self.player.geometryStats[self.player.geomDifficulty-1]
       tup=(tup[0]+1,tup[1])
       self.player.geometryStats[self.player.geomDifficulty-1]=tup
-      self.player.geomTutorial=True
+      self.player.magTutorial=True
       self.player.popUp=None
  
     elif attackName=="Missile":
@@ -749,7 +750,7 @@ class BattleEngine:
       tup=self.player.geometryStats[self.player.geomDifficulty-1]
       tup=(tup[0]+1,tup[1])
       self.player.geometryStats[self.player.geomDifficulty-1]=tup
-      self.player.geomTutorial=True
+      self.player.magTutorial=True
       self.player.popUp=None
 
     elif attackName=="Division":
@@ -1675,7 +1676,7 @@ def startPuzzle(player):
   player.inPuzzle=True
   player.traversal=False
   if not player.puzzleTutorial:
-    player.popUp=PopUp(10,10,["This door has a special kind of lock","To unlock it, you have to","Re-arrange the tiles so they make an image"])
+    player.popUp=PopUp(10,10,["This door has a special kind of lock","To unlock it, you have to","Re-arrange the tiles","using the arrow keys","to make the image whole"])
   else:
     player.popUp=None
 def stopPuzzle(player,solved):
@@ -2029,15 +2030,6 @@ def drawPuzzle(player,screen):
   #draw background and completed image
   screen.fill((0,0,0),(0,0,1200,900))
   screen.blit(player.puzzle.puzBG,(75,-750,1200,900))
-  if player.puzzleTutorial==False:
-    font=pygame.font.SysFont("cmr10",35,False,False)
-    y=0
-    screen.fill((255,255,255),(0,2,1200,200))
-    lines=["This door is locked with a special lock.  In order to unlock it, you must"," re-arrange the tiles and make the image whole.  Use the arrow keys ","to slide the tiles.  You can view the completed image by pressing","any other button.  To give up, press  or backspace."]
-    screen.blit(pygame.image.load(TOUR_PATH+"button/"+"buttonX.gif"),(570,150,40,40))
-    for message in lines:
-      screen.blit(font.render(message,True,(75,0,0)),(0,20+y,200,300))
-      y+=40
   if player.puzzle.showFull:
     screen.blit(player.puzzle.completedPuzzle,(300,100,600,400))
   else: