diff options
| author | esk7610 <esk7610@rit.edu> | 2010-02-16 18:22:39 (GMT) |
|---|---|---|
| committer | esk7610 <esk7610@rit.edu> | 2010-02-16 18:22:39 (GMT) |
| commit | bfe92e7e0ca74da27b9efe1ea14eeafdc208930c (patch) | |
| tree | 4b78e0851ddb131055298af0cea974d83be6bc29 /MAFH.activity | |
| parent | a7e498f5b26463443c459a7cdc2281c0f27ec6ce (diff) | |
| parent | 767c2a378911f94fe2147d3fecc046400c6ac2a5 (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:project-xavier/mainline
Conflicts:
MAFH.activity/pippy_app.py
Diffstat (limited to 'MAFH.activity')
| -rw-r--r-- | MAFH.activity/Menu.py | 4 | ||||
| -rw-r--r-- | MAFH.activity/pippy_app.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MAFH.activity/Menu.py b/MAFH.activity/Menu.py index 029cdea..1741451 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.geomDifficulty==2: + if player.battlePlayer.AL > 10 and player.battlePlayer.AL < 30: rotate=90*randint(0,3) sprite.image=pygame.transform.rotate(pygame.image.load(name),rotate) - elif player.geomDifficulty==3: + elif player.battlePlayer.AL > 30: 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) diff --git a/MAFH.activity/pippy_app.py b/MAFH.activity/pippy_app.py index e8c28d9..1eb2cc6 100644 --- a/MAFH.activity/pippy_app.py +++ b/MAFH.activity/pippy_app.py @@ -1104,6 +1104,7 @@ class BattleEngine: self.player.currentRoom.en2=0 self.player.currentRoom.en3=0 self.player.currentRoom.en4=0 + self.player.battlePlayer.AL+=1 victoryMenu=Menu(["Continue"],self.player,MENU_PATH+"VictoryScreen.gif",[MENU_PATH+"Blank.gif"],"Victory") self.player.battle=False |