From bf007b892cd8e2aaf6f9a565ae3f166e53716501 Mon Sep 17 00:00:00 2001 From: Kevin Hockey Date: Mon, 28 Jun 2010 21:37:32 +0000 Subject: Added pictures of glyphs to assets folder. Added some debugging statements. --- diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py index fe6cc39..4435641 100644 --- a/MAFH2/BattleEngine.py +++ b/MAFH2/BattleEngine.py @@ -90,6 +90,7 @@ class BattleEngine(GameEngineElement): menu.set_disp('Fire Cast!') self.game_engine.add_object('firemenu', MagicMenuHolder( self.menu_callback ) ) self.game_engine.get_object('firemenu').show_menu('fire') + print("got here") #self.__attack_phase(menu) elif selection == 'heal': diff --git a/MAFH2/MagicMenu.py b/MAFH2/MagicMenu.py index 46ddd6f..b41ba3e 100644 --- a/MAFH2/MagicMenu.py +++ b/MAFH2/MagicMenu.py @@ -91,13 +91,13 @@ class MagicMenuHolder( GameEngineElement ): [_('7'), lambda: self.menu_called("heal7"), 140], [_('8'), lambda: self.menu_called("heal8"), 140] ] - self.menu = MagicMenu(menu_options, 237, 375, menu_type) + self.menu = MagicMenu(menu_options, 237, 375, menu_type, spell_type) class MagicMenu(GameEngineElement): - def __init__(self, magic_menu, x, y, type): + def __init__(self, magic_menu, x, y, type, spell_type): GameEngineElement.__init__(self, has_draw=True, has_event=True) - self.menu = Menu(magic_menu, type ) + self.menu = Menu(magic_menu, spell_type) self.menu.set_pos(x, y) self.add_to_engine() @@ -108,7 +108,6 @@ class MagicMenu(GameEngineElement): def draw(self, screen): self.menu.draw( screen ) -#not finished class Menu(object): def __init__(self, options, spelltype): """Initialize the EzMenu! options should be a sequence of lists in the @@ -135,17 +134,17 @@ class Menu(object): self.btn4 = pygame.image.load(PUZZLE_PATH + "FireGlyph4btn.gif") #filler buttons - self.btn5 = pygame.image.load(PUZZLE_PATH + "LigGlyph1btn.gif") + self.btn5 = pygame.image.load(PUZZLE_PATH + "LightningGlyph1btn.gif") self.btn6 = pygame.image.load(PUZZLE_PATH + "HealGlyph1btn.gif") self.btn7 = pygame.image.load(PUZZLE_PATH + "MissileGlyph1btn.gif") - self.btn8 = pygame.image.load(PUZZLE_PATH + "LigGlyph2btn.gif") + self.btn8 = pygame.image.load(PUZZLE_PATH + "LightningGlyph2btn.gif") elif(spelltype == 1): #lightning attack - self.btn1 = pygame.image.load(PUZZLE_PATH + "LigGlyph1btn.gif") - self.btn2 = pygame.image.load(PUZZLE_PATH + "LigGlyph2btn.gif") - self.btn3 = pygame.image.load(PUZZLE_PATH + "LigGlyph3btn.gif") - self.btn4 = pygame.image.load(PUZZLE_PATH + "LigGlyph4btn.gif") + self.btn1 = pygame.image.load(PUZZLE_PATH + "LightningGlyph1btn.gif") + self.btn2 = pygame.image.load(PUZZLE_PATH + "LightningGlyph2btn.gif") + self.btn3 = pygame.image.load(PUZZLE_PATH + "LightningGlyph3btn.gif") + self.btn4 = pygame.image.load(PUZZLE_PATH + "LightningGlyph4btn.gif") self.btn5 = pygame.image.load(PUZZLE_PATH + "HealGlyph1btn.gif") self.btn6 = pygame.image.load(PUZZLE_PATH + "MissileGlyph1btn.gif") @@ -160,7 +159,7 @@ class Menu(object): self.btn4 = pygame.image.load(PUZZLE_PATH + "MissileGlyph4btn.gif") self.btn5 = pygame.image.load(PUZZLE_PATH + "HealGlyph1btn.gif") - self.btn6 = pygame.image.load(PUZZLE_PATH + "LigGlyph1btn.gif") + self.btn6 = pygame.image.load(PUZZLE_PATH + "LightningGlyph1btn.gif") self.btn7 = pygame.image.load(PUZZLE_PATH + "FireGlyph1btn.gif") self.btn8 = pygame.image.load(PUZZLE_PATH + "FireGlyph2btn.gif") elif(spelltype == 3): @@ -170,7 +169,7 @@ class Menu(object): self.btn3 = pygame.image.load(PUZZLE_PATH + "HealGlyph3btn.gif") self.btn4 = pygame.image.load(PUZZLE_PATH + "HealGlyph4btn.gif") - self.btn5 = pygame.image.load(PUZZLE_PATH + "LigGlyph1btn.gif") + self.btn5 = pygame.image.load(PUZZLE_PATH + "LightningGlyph1btn.gif") self.btn6 = pygame.image.load(PUZZLE_PATH + "MissileGlyph1btn.gif") self.btn7 = pygame.image.load(PUZZLE_PATH + "FireGlyph1btn.gif") self.btn8 = pygame.image.load(PUZZLE_PATH + "FireGlyph2btn.gif") @@ -220,11 +219,12 @@ class Menu(object): if j >= self.cols: i+=1 j=0 - + + print("out of for") def update(self, event): """Update the menu and get input for the menu.""" - return_val = False + return_val = True if event.type == pygame.KEYDOWN: if event.key == pygame.K_DOWN: if self.cols != 1: diff --git a/MAFH2/assets/image/puzzle/FireGlyph1btn.gif b/MAFH2/assets/image/puzzle/FireGlyph1btn.gif new file mode 100755 index 0000000..557a4f6 --- /dev/null +++ b/MAFH2/assets/image/puzzle/FireGlyph1btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/FireGlyph2btn.gif b/MAFH2/assets/image/puzzle/FireGlyph2btn.gif new file mode 100755 index 0000000..f1fa520 --- /dev/null +++ b/MAFH2/assets/image/puzzle/FireGlyph2btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/FireGlyph3btn.gif b/MAFH2/assets/image/puzzle/FireGlyph3btn.gif new file mode 100755 index 0000000..7ea713e --- /dev/null +++ b/MAFH2/assets/image/puzzle/FireGlyph3btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/FireGlyph4btn.gif b/MAFH2/assets/image/puzzle/FireGlyph4btn.gif new file mode 100755 index 0000000..e30fc3c --- /dev/null +++ b/MAFH2/assets/image/puzzle/FireGlyph4btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/HealGlyph1btn.gif b/MAFH2/assets/image/puzzle/HealGlyph1btn.gif new file mode 100755 index 0000000..6587c52 --- /dev/null +++ b/MAFH2/assets/image/puzzle/HealGlyph1btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/HealGlyph2btn.gif b/MAFH2/assets/image/puzzle/HealGlyph2btn.gif new file mode 100755 index 0000000..6266047 --- /dev/null +++ b/MAFH2/assets/image/puzzle/HealGlyph2btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/HealGlyph3btn.gif b/MAFH2/assets/image/puzzle/HealGlyph3btn.gif new file mode 100755 index 0000000..e4b83dc --- /dev/null +++ b/MAFH2/assets/image/puzzle/HealGlyph3btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/HealGlyph4btn.gif b/MAFH2/assets/image/puzzle/HealGlyph4btn.gif new file mode 100755 index 0000000..f70cf49 --- /dev/null +++ b/MAFH2/assets/image/puzzle/HealGlyph4btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/LightningGlyph1btn.gif b/MAFH2/assets/image/puzzle/LightningGlyph1btn.gif new file mode 100755 index 0000000..42eb89f --- /dev/null +++ b/MAFH2/assets/image/puzzle/LightningGlyph1btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/LightningGlyph2btn.gif b/MAFH2/assets/image/puzzle/LightningGlyph2btn.gif new file mode 100755 index 0000000..256be1d --- /dev/null +++ b/MAFH2/assets/image/puzzle/LightningGlyph2btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/LightningGlyph3btn.gif b/MAFH2/assets/image/puzzle/LightningGlyph3btn.gif new file mode 100755 index 0000000..e23df78 --- /dev/null +++ b/MAFH2/assets/image/puzzle/LightningGlyph3btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/LightningGlyph4btn.gif b/MAFH2/assets/image/puzzle/LightningGlyph4btn.gif new file mode 100755 index 0000000..291c40f --- /dev/null +++ b/MAFH2/assets/image/puzzle/LightningGlyph4btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/MissileGlyph1btn.gif b/MAFH2/assets/image/puzzle/MissileGlyph1btn.gif new file mode 100755 index 0000000..f357fc7 --- /dev/null +++ b/MAFH2/assets/image/puzzle/MissileGlyph1btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/MissileGlyph2btn.gif b/MAFH2/assets/image/puzzle/MissileGlyph2btn.gif new file mode 100755 index 0000000..54d6453 --- /dev/null +++ b/MAFH2/assets/image/puzzle/MissileGlyph2btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/MissileGlyph3btn.gif b/MAFH2/assets/image/puzzle/MissileGlyph3btn.gif new file mode 100755 index 0000000..e1838c5 --- /dev/null +++ b/MAFH2/assets/image/puzzle/MissileGlyph3btn.gif Binary files differ diff --git a/MAFH2/assets/image/puzzle/MissileGlyph4btn.gif b/MAFH2/assets/image/puzzle/MissileGlyph4btn.gif new file mode 100755 index 0000000..ec2aa33 --- /dev/null +++ b/MAFH2/assets/image/puzzle/MissileGlyph4btn.gif Binary files differ -- cgit v0.9.1