Merge branch 'animationrework' of ssh://git.fedorahosted.org/git/fortune_hunter into animationrework

3 files changed, 4 insertions, 3 deletions

diff --git a/MAFH2/Map.py b/MAFH2/Map.py
index 6c88c9b..659e238 100644
--- a/MAFH2/Map.py
+++ b/MAFH2/Map.py
@@ -86,9 +86,10 @@ class Map(GameEngineElement):
             mapView=pygame.transform.rotate(mapView,angle)

             angle=180

 

-        sideDifference=self.sizeX-self.sizeY

-        angle=angle*(math.pi/180)

-        curSect=pygame.Rect(0,0,200,200)

+        sideDifference=self.sizeX-self.sizeY #Getting the difference between the height and width of the dungeon

+        angle=angle*(math.pi/180) #Getting the angle the dungeon is rotated to

+        curSect=pygame.Rect(0,0,200,200) #Creating the rectangle for the mini-map

+        #Sets the position of the mini-map rectangle

         curSect.top+=((x*40-81)*math.cos(angle))-((y*40-81)*math.sin(angle))

         curSect.left-=((x*40-81)*math.sin(angle))+((y*40-81)*math.cos(angle))

 

diff --git a/MAFH2/assets/image/character/anim_test.psd b/MAFH2/assets/image/character/anim_test.psd
new file mode 100644
index 0000000..1b4fe08
--- /dev/null
+++ b/MAFH2/assets/image/character/anim_test.psd
diff --git a/MAFH2/assets/image/character/dragon.psd b/MAFH2/assets/image/character/dragon.psd
new file mode 100644
index 0000000..b2ca16b
--- /dev/null
+++ b/MAFH2/assets/image/character/dragon.psd