diff options
| author | esk7610 <esk7610@rit.edu> | 2010-02-19 18:18:05 (GMT) |
|---|---|---|
| committer | esk7610 <esk7610@rit.edu> | 2010-02-19 18:18:05 (GMT) |
| commit | 33183dac467c1be96b997bbdcf6b4693d137f66b (patch) | |
| tree | 62bbeb9e0a1a4d862bbf08a10495e2c58415fc79 /MAFH.activity | |
| parent | 8ee6d93bd18ac20c6d06e659ee22a29996ff5335 (diff) | |
| parent | 57cae2166b900baf1b125aea64775906710957cc (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:project-xavier/mainline
Diffstat (limited to 'MAFH.activity')
| -rw-r--r--[-rwxr-xr-x] | MAFH.activity/assets/map/bl1.txt | 0 | ||||
| -rw-r--r-- | MAFH.activity/pippy_app.py | 8 |
2 files changed, 6 insertions, 2 deletions
diff --git a/MAFH.activity/assets/map/bl1.txt b/MAFH.activity/assets/map/bl1.txt index 6149542..6149542 100755..100644 --- a/MAFH.activity/assets/map/bl1.txt +++ b/MAFH.activity/assets/map/bl1.txt diff --git a/MAFH.activity/pippy_app.py b/MAFH.activity/pippy_app.py index 97ced85..5772abc 100644 --- a/MAFH.activity/pippy_app.py +++ b/MAFH.activity/pippy_app.py @@ -56,9 +56,10 @@ class Player: self.name="" #player name: to be set in options menu or upon new game (character select screen?) self.multiplicationStats=[(0,0),(0,0),(0,0)] #[easy problems,medium problems,hard problems] self.divisionStats=[(0,0),(0,0),(0,0)] #[easy problems,medium problems,hard problems] - self.geometryStats=[(0,0),(0,0),(0,0)] #[easy,medium, hard] + self.geometryStats=[(0,0),(0,0),(0,0)] #[easy,medium, hard] self.shopStats=[(0,0),(0,0),(0,0)] #[spent too much money,didn't give enough money, game exact amount] self.puzzlesSolved=0 + self.bestiary=list() #Blank Bestiary self.curBattle=BattleEngine(self.battlePlayer,[None]) @@ -789,7 +790,8 @@ class BattleEngine: player.migrateMessages("You heal "+repr(-1*int(attacker.attackPower(attackName)))+" HP") else: player.migrateMessages("You attack for "+repr(int(attacker.attackPower(attackName)))+" damage") - player.migrateMessages("Enemy HP is "+repr(int(defender.HP))) + #player.migrateMessages("Enemy HP is "+repr(int(defender.HP))) + #migrates at the wrong time, replace with scan for now! defender.defendAttack(attacker.attackPower(attackName)) self.playerTurn=False @@ -1033,6 +1035,8 @@ class BattleEngine: player.migrateMessages("Remaining HP: "+repr(self.enemies[self.selEnemyIndex].HP)) player.migrateMessages("Enemy Weakness: "+repr(self.enemies[self.selEnemyIndex].weakness)) #Add Enemies to Beastiary. + player.bestiary.append(self.enemies[self.selEnemyIndex]) + #bestiary2 = set(player.bestiary) ### # Tracks how long the bonus timer has been running |