diff --git a/README.md b/README.md index e51aa96..a986844 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ move to. On a PC just click with the mouse. Scoring: Hug people to increase your score. Every 25 hugs increases the current wave. Enemies become more frequent on higher waves. Hug as many people as you can -before the time runs out. +before the time runs out. Avoid the guys that want to hug you until you explode! Aditional assets ---------------- @@ -94,3 +94,8 @@ http://www.jamendo.com/es/list/a91205/8bit-easter The fonts Press Start 2P and Profaisal-EliteRiqa are available in http://openfontlibrary.org Check the font directory for more information on the fonts. + +Know issues +----------- + + *) Music does not always loops on Android. This is a known problem with pgs4a 0.9.4. \ No newline at end of file diff --git a/TODO b/TODO deleted file mode 100644 index 41d0062..0000000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -Stuff left: - 2) Center the letters in ScoreState. diff --git a/music/Press_Start_Inicial.mp3 b/music/Press_Start_Inicial.mp3 deleted file mode 100644 index 4f4e04f..0000000 Binary files a/music/Press_Start_Inicial.mp3 and /dev/null differ diff --git a/music/Wind_Waker_Inicio (Original).mp3 b/music/Wind_Waker_Inicio (Original).mp3 deleted file mode 100644 index d039979..0000000 Binary files a/music/Wind_Waker_Inicio (Original).mp3 and /dev/null differ diff --git a/music/Wind_Waker_Inicio (Remix).mp3 b/music/Wind_Waker_Inicio (Remix).mp3 deleted file mode 100644 index 5de3ba8..0000000 Binary files a/music/Wind_Waker_Inicio (Remix).mp3 and /dev/null differ diff --git a/music/Wind_Waker_Main (Original).mp3 b/music/Wind_Waker_Main (Original).mp3 deleted file mode 100644 index ea147cd..0000000 Binary files a/music/Wind_Waker_Main (Original).mp3 and /dev/null differ diff --git a/score.py b/score.py index 9969ac2..df623e8 100644 --- a/score.py +++ b/score.py @@ -63,21 +63,27 @@ class ScoreState(BaseState): letter_list = ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'z', 'x', 'c', 'v', 'b', 'n', 'm'] - q_x_position = int((float(pygame.display.Info().current_w) * 88.0 ) / 1024.0) + + image = cached_image_loader.get_image_to_screen_percent('gfx/Fuente/a.png') + q_x_position = self.banner.rect.left + (image.get_width() // 2) q_y_position = int((float(pygame.display.Info().current_h) * 438.0 ) / 768.0) letter_sep = int((float(pygame.display.Info().current_w) * 10.0 ) / 1024.0) + for l in letter_list: image = cached_image_loader.get_image_to_screen_percent('gfx/Fuente/' + l + '.png') letter_actor = BaseActor(89, image, string.upper(l), False, True, False) if l == 'a': - q_x_position = int((float(pygame.display.Info().current_w) * 154.0 ) / 1024.0) - q_y_position = int((float(pygame.display.Info().current_h) * 543.0 ) / 768.0) + q_x_position = self.banner.rect.left + image.get_width() + q_y_position = int((float(pygame.display.Info().current_h) * 543.0) / 768.0) elif l == 'z': - q_x_position = int((float(pygame.display.Info().current_w) * 199.0 ) / 1024.0) - q_y_position = int((float(pygame.display.Info().current_h) * 649.0 ) / 768.0) + q_x_position = self.banner.rect.left + int(1.5 * image.get_width()) + q_y_position = int((float(pygame.display.Info().current_h) * 649.0) / 768.0) letter_actor.set_position([q_x_position, q_y_position]) self.letters[l] = letter_actor - q_x_position += image.get_width() + letter_sep + if l == 'i': + q_x_position += image.get_width() + (2 * letter_sep) + else: + q_x_position += image.get_width() + letter_sep self.letter_y = int((float(pygame.display.Info().current_h) * 265.0 ) / 768.0) diff --git a/sfx/Explo_3.wav b/sfx/Explo_3.wav deleted file mode 100644 index 61e5e7c..0000000 Binary files a/sfx/Explo_3.wav and /dev/null differ diff --git a/sfx/Game_Over_1.wav b/sfx/Game_Over_1.wav deleted file mode 100644 index b2279d2..0000000 Binary files a/sfx/Game_Over_1.wav and /dev/null differ diff --git a/sfx/new_stage_1.wav b/sfx/new_stage_1.wav deleted file mode 100644 index 101dd23..0000000 Binary files a/sfx/new_stage_1.wav and /dev/null differ diff --git a/sfx/on_a_tree.wav b/sfx/on_a_tree.wav deleted file mode 100644 index 9310d32..0000000 Binary files a/sfx/on_a_tree.wav and /dev/null differ diff --git a/sfx/press_start_1.wav b/sfx/press_start_1.wav deleted file mode 100644 index 960e739..0000000 Binary files a/sfx/press_start_1.wav and /dev/null differ diff --git a/state.py b/state.py index a8c1617..7436d2e 100644 --- a/state.py +++ b/state.py @@ -1,5 +1,6 @@ -# Miguel Angel Astor Romero. Created on 7-1-2013. # -################################################### +########################################### +# Created on 1-7-2013. Miguel Angel Astor # +########################################### import pygame # Valid game states.