Edited maps, changed save system

7 files changed, 47 insertions, 40 deletions

diff --git a/MAFH.activity/Enemy.py b/MAFH.activity/Enemy.py
index 2c59234..4017acf 100644
--- a/MAFH.activity/Enemy.py
+++ b/MAFH.activity/Enemy.py
@@ -10,7 +10,7 @@ ENEMY = {
     '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'),'img':"Crab.png",'hp':125,'att':12,'weak':'crit'},
-    '6':{'name':_('Feren'),'img':"merchant.gif",'hp':200,'att':10,'weak':'special'},
+    '6':{'name':_('Feren'),'img':"merchant.gif",'hp':1500,'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'}
 }
@@ -32,6 +32,7 @@ class Enemy(Actor):
         self.name=ENEMY[id]['name']
         self.sprite.image=pygame.image.load(CHAR_PATH + ENEMY[id]['img'])
         self.HP = ENEMY[id]['hp']
+        self.MHP=ENEMY[id]['hp']
         self.ATT = ENEMY[id]['att']
         self.weakness=ENEMY[id]['weak']
         self.sprite.rect=(200,200,50,300)
diff --git a/MAFH.activity/Menu.py b/MAFH.activity/Menu.py
index 3fdb001..6beeffd 100644
--- a/MAFH.activity/Menu.py
+++ b/MAFH.activity/Menu.py
@@ -499,7 +499,7 @@ class Menu:
             self.tm_em_viewStatistics()
 
 #########Pause Menu Buttons######################################
-        elif name=="Save":
+        elif name=="Save" and self.name !="Pause Menu":
           dataList=player.toString()
           FILE=open(os.path.join(activity.get_activity_root(),"data/"+player.name+".txt"),"w")
           FILE.write(simplejson.dumps(dataList))
diff --git a/MAFH.activity/assets/map/bl2.txt b/MAFH.activity/assets/map/bl2.txt
index 2421f1e..bc0206e 100755
--- a/MAFH.activity/assets/map/bl2.txt
+++ b/MAFH.activity/assets/map/bl2.txt
@@ -4,27 +4,27 @@ bl2.txt
 1
 bl3.txt
 00Su00Eu0000000000000
-0000WuEu0000000000000
+0000WuEu0800800000000
 0000WuEu0000000000000
 00SuWu000000000000000
 00Su00Ee0000000000000
 NuSu00000000000000000
 00Su00Ex0000000000000
-000000Eu0000000000000
-NuSuWu000000000000000
-NuSu00000000000000000
-NuSu00000000000000000
-Nu0000Eu0000000000000
+000000Eu00000rh000000
+NuSuWp000000000000000
+NuSu000000000lv000000
+NuSu00000077000000000
+Nu0000Eu0088000000000
 00SuWu000000000000000
-NuSu00000000000000000
-NuSu00000000000000000
-NuSu00Eu0000000000000
-0000Wu000000000000000
+NuSu00000880800000000
+NuSu000000000mv000000
+NuSu00Eu0008000000000
+0000Wu0000000qv000000
 Nu0000Eu0000000000000
 Nu00Wu000000000000000
-NuSu00000000000000000
+NuSu000000000lv000000
 Nu0000Eu0000000000000
-0000WuEu00000rv000000
 0000WuEu0000000000000
 0000WuEu0000000000000
-Nu00Wu000000000000000
+0000WuEuS000000000000
+Nu00Wu00070873b000000
diff --git a/MAFH.activity/assets/map/bl3.txt b/MAFH.activity/assets/map/bl3.txt
index bc2289a..5f9fd36 100644
--- a/MAFH.activity/assets/map/bl3.txt
+++ b/MAFH.activity/assets/map/bl3.txt
@@ -4,18 +4,18 @@ bl3.txt
 1
 bl4.txt
 00SuWeEu00000000000000000

-00SuWu0000000000000000000

-00Sb00Eu00000000000000000

+00SuWu0000007000000000000

+00Sb00Eu00008000000000000

 00SuWu0000000000000000000

 NuSu00Eu00000000000000000

-Nu00Wu0000000rv0000000000

+Nu00Wu0000000qv0000000000

 NpSx00Ep00000000000000000

-NuSuWb0000000000000000000

+NuSuWb0000007000000000000

 NuSu00El00000000000000000

-00SlWl0000000qv0000000000

-00Sp00Ep00000000000000000

+00SlWl0000008rv0000000000

+00Sp00Ep000008v0000000000

 NuSuWp0000000000000000000

-Nu0000Eu00000000000000000

+Nu0000Eu00008000000000000

 Nl00WuEu00000000000000000

 Np00WuEu00000000000000000

-NuWu000000000000000000000

+NuWu000000007000000000000

diff --git a/MAFH.activity/assets/map/bl4.txt b/MAFH.activity/assets/map/bl4.txt
index c7a0a9d..d9a1acc 100755
--- a/MAFH.activity/assets/map/bl4.txt
+++ b/MAFH.activity/assets/map/bl4.txt
@@ -5,26 +5,26 @@ bl4.txt
 bl5.txt
 00Su00Eu00000000000000000

 0000WuEu00000000000000000

-NeSlWuEu00000000000000000

+NeSlWuEu07770000000000000

 0000WuEu00000000000000000

 00SuWu0000000000000000000

 NuSu000000000000000000000

 0000000000000000000000000

-NlSx000000000000000000000

+NlSx0000S0000000000000000

 0000000000000000000000000

 NuSu000000000000000000000

-NuSu00El00000000000000000

-0000WlEx00000000000000000

+NuSu00El07870000000000000

+0000WlExS0000000000000000

 0000000000000000000000000

-0000WxEl00000000000000000

-NuSuWl0000000000000000000

+0000WxElS0000000000000000

+NuSuWl0008780000000000000

 NuSu000000000000000000000

 0000000000000000000000000

-NxSl000000000000000000000

+NxSl0000S0000000000000000

 0000000000000000000000000

 NuSu000000000000000000000

 Nu0000Eu00000000000000000

 0000WuEu00000000000000000

-Nl00WuEu00000000000000000

-0000WuEu00000000000000000

-NuWu000000000000000000000

+Nl00WuEu08880000000000000

+0000WuEu000000000rv000000

+NuWu000000000qv0000000000

diff --git a/MAFH.activity/assets/map/bl5.txt b/MAFH.activity/assets/map/bl5.txt
index 585147e..bbf4c6f 100644
--- a/MAFH.activity/assets/map/bl5.txt
+++ b/MAFH.activity/assets/map/bl5.txt
@@ -1,6 +1,7 @@
 Dungeon 6
 bl5.txt
-4x4
+1x2
 1
 0
-Ne00000000000000000000000

+NeSu000000000000000000000

+Nx00000000600000000000000
diff --git a/MAFH.activity/pippy_app.py b/MAFH.activity/pippy_app.py
index 83caf72..97ced85 100644
--- a/MAFH.activity/pippy_app.py
+++ b/MAFH.activity/pippy_app.py
@@ -6,7 +6,7 @@ import os.path
 from random import *
 
 from PopUp import PopUp
-from Items import get_item, Item
+from Items import get_item, Item, InvalidItemException
 from Enemy import get_enemy, Enemy
 from Hero import Hero
 from Dungeon import Dungeon
@@ -285,11 +285,15 @@ class Player:
     self.battlePlayer.HP=data[12]
     i=13
     self.battlePlayer.inv_Ar=[]
-    while data[i]!= 'End Inventory':
-      self.battlePlayer.inv_Ar.append(get_item(data[i]))
-      i+=1
+    while not data[i]== 'End Inventory':
+      try:
+        self.battlePlayer.inv_Ar.append(get_item(data[i]))
+        i+=1
+        print(data[i])
+        print(get_item(data[i]).name)
+      except InvalidItemException:
+        break
     i+=1
-    line=data[i]
     j=0
     while data[i]!='End Equip':
       if data[i]==None:
@@ -393,6 +397,7 @@ class Player:
       if reload:
           self.dgn=Dungeon(self.dgn.fileName)
       elif self.dgn:
+          self.currentMenu.updateByName("Save",player,screen)
           self.battlePlayer.MHP+=2
           self.dgn=Dungeon(self.dgn.next)
       if self.dgn.theme != self.theme: