From 27296d88d5f7249809ea39d5cf83c0d3ba745d6d Mon Sep 17 00:00:00 2001 From: Max Lange Date: Sun, 13 Sep 2015 16:03:49 +0200 Subject: [PATCH 01/28] Fixed displaying unicode filnames on save selection --- src/menu.py | 5 +++-- src/settings.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/menu.py b/src/menu.py index 9085a4c..19a0aad 100644 --- a/src/menu.py +++ b/src/menu.py @@ -377,9 +377,10 @@ def savegames(): tmp = saves[a].replace("\\", "/") #20 and 11 are values for size and ratio and #were found trough testing which looks best - saves_buttons.append(menu.disp_elem.button(tmp, 0, xaxis[a], 0, yaxis[a], + saves_buttons.append(menu.disp_elem.button(tmp.decode("utf-8"), + 0, xaxis[a], 0, yaxis[a], pygame.Rect((0, 0), (screenx, screeny)), - tmp, settings.typeface, 20, 11, + tmp.decode("utf-8"), settings.typeface, 20, 11, color, ["./assets/templates/nr1.design"])) a = 0 diff --git a/src/settings.py b/src/settings.py index d6235ec..5674c99 100644 --- a/src/settings.py +++ b/src/settings.py @@ -183,7 +183,7 @@ def init(): saves = [] for filename in os.listdir("./saves"): if filename.endswith(".ini"): - filename = unicode(filename[:-4]) + filename = filename[:-4].decode("utf-8") saves.append(filename) if fullscreen: From 83d3069860727f896eb4ac9374ba1188bc4fcf4d Mon Sep 17 00:00:00 2001 From: Max Lange Date: Sun, 13 Sep 2015 17:13:57 +0200 Subject: [PATCH 02/28] changed design on savegame load menu --- assets/templates/load.menu | 8 +++ assets/templates/savescreen.menu | 7 --- saves/Test.ini | 11 ---- src/menu.py | 101 ++++++++++++++----------------- src/settings.py | 4 +- 5 files changed, 56 insertions(+), 75 deletions(-) create mode 100644 assets/templates/load.menu delete mode 100644 assets/templates/savescreen.menu delete mode 100644 saves/Test.ini diff --git a/assets/templates/load.menu b/assets/templates/load.menu new file mode 100644 index 0000000..7ab28a9 --- /dev/null +++ b/assets/templates/load.menu @@ -0,0 +1,8 @@ +&./assets/templates/default.vars +*|Load saved game|30 |$typeface|$color |$half + 0|%10 + 0| +*|$savename |20 |$typeface|$color |$half + 0|%20 + 0| +@|Return |$size|5|$typeface|$color|$box1|%80 + 0|%30 + 0| +/add project stats here +@|Previous |$size|5|$typeface|$color|$box1|%20 + 0|%90 + 0| +@|Load |$size|5|$typeface|$color|$box1|%50 + 0|%90 + 0| +@|Next |$size|5|$typeface|$color|$box1|%80 + 0|%90 + 0| diff --git a/assets/templates/savescreen.menu b/assets/templates/savescreen.menu deleted file mode 100644 index 5d2cf87..0000000 --- a/assets/templates/savescreen.menu +++ /dev/null @@ -1,7 +0,0 @@ -&./assets/templates/default.vars -/#TODO halp -*|Load saved game|30 |$typeface|$color |$half + 0|%10 + 0| -*|$savename |20 |$typeface|$color |$half + 0|%20 + 0| -/add project stats here -@|Previous |$size|$ratio|$typeface|$color|$box1|%30 + 0|%90 + 0| -@|Next |$size|$ratio|$typeface|$color|$box1|%70 + 0|%90 + 0| diff --git a/saves/Test.ini b/saves/Test.ini deleted file mode 100644 index e613c04..0000000 --- a/saves/Test.ini +++ /dev/null @@ -1,11 +0,0 @@ -[main] -fullscreen = False -screenx_current = 960 -screeny_current = 540 -debugscreen = False -debugmode = False -skip = True -posx = 564 -posy = 206 -volume = 0.5 - diff --git a/src/menu.py b/src/menu.py index 19a0aad..0ff336e 100644 --- a/src/menu.py +++ b/src/menu.py @@ -232,9 +232,10 @@ def pause(): settings.save(savename) if event == "Load Game": savegame = savegames() - if savegame != "Exit": + if savegame is not None: settings.load(savegame) sounds.music.play("unpause") + settings.upd("get_saves") run = False if event == "Settings": options() @@ -347,67 +348,57 @@ def inputpopup(x, y, header): def savegames(): - """creates wall with savegames to select""" + """Menu to select a saved game.""" - settings.upd("get_saves") + #Loads in values + list_of_saves = settings.saves + D_saves = len(list_of_saves) + currently_selected = 0 - saves = settings.saves - screen = settings.screen - screenx = settings.screenx_current - screeny = settings.screeny_current - color = settings.color - fade = settings.fade - fade_pos = settings.fade_pos + #Defines Menu + settings_menu = menu_template("load", 0, 255, 255, + {"savename": list_of_saves[currently_selected]}, + []) - xaxis = [] - yaxis = [] - saves_buttons = [] run = True - - fade.set_alpha(20) - - for y in range(10): - y += 1 - for x in range(5): - x += 1 - xaxis.append(screenx / 6 * x) - yaxis.append(screeny / 11 * y + 50) - - for a in range(len(saves)): - tmp = saves[a].replace("\\", "/") - #20 and 11 are values for size and ratio and - #were found trough testing which looks best - saves_buttons.append(menu.disp_elem.button(tmp.decode("utf-8"), - 0, xaxis[a], 0, yaxis[a], - pygame.Rect((0, 0), (screenx, screeny)), - tmp.decode("utf-8"), settings.typeface, 20, 11, - color, ["./assets/templates/nr1.design"])) - - a = 0 while run: - settings.upd("get_events") - for a in range(len(saves)): - saves_buttons[a].update(settings.events) - for event in settings.events: - if event.type == QUIT: - settings.quit() - if event.type == KEYDOWN: - key = pygame.key.name(event.key) - if key == "escape": - return "Exit" - if event.type == USEREVENT and event.code == "MENU": - for a in range(len(saves)): - if saves_buttons[a].klicked: - pygame.display.flip() - pygame.time.delay(200) - return saves[a] - screen.blit(fade, fade_pos) - for a in range(len(saves)): - saves_buttons[a].blit(screen) - pygame.display.flip() + #Get all events and handle them + events = settings_menu.run() + for event in events: + #Exits savegame menu + if event in ["event.EXIT", "event.QUIT", "Return"]: + run = False + return None + #Sets the current selected savegame to load + if event == "Load": + return list_of_saves[currently_selected] + #Shows next savegame + if event == "Next": + #Points to an later save + currently_selected += 1 + #Wraps to the beginning to create a not ending loop + if currently_selected + 1 > D_saves: + currently_selected = currently_selected - D_saves + settings_menu = menu_template("load", 0, 255, 255, + {"savename": list_of_saves[currently_selected]}, + []) + #Lets the button last longer in klicked mode + pygame.time.delay(50) + #Shows previous savegame + if event == "Previous": + #Points to an earlier save + currently_selected -= 1 + #Wraps to the end to create a not ending loop + if currently_selected < 0: + currently_selected = D_saves - currently_selected - 1 + settings_menu = menu_template("load", 0, 255, 255, + {"savename": list_of_saves[currently_selected]}, + []) + #Lets the button last longer in klicked mode + pygame.time.delay(50) - run = True + pygame.display.flip() def options(): diff --git a/src/settings.py b/src/settings.py index 5674c99..2d0c210 100644 --- a/src/settings.py +++ b/src/settings.py @@ -378,8 +378,8 @@ def load(name): if not (saves == []): #tries to load and returns values in terminal that couldnt be loaded + import ConfigParser try: - #from ConfigParser import * from . import sounds #lint:disable fullscreen = config.getboolean("main", "fullscreen") @@ -392,7 +392,7 @@ def load(name): pos_y = config.getfloat("main", "posx") sounds.music.volume = config.getfloat("main", "volume") #lint:enable - except SafeConfigParser.NoOptionError as test: + except ConfigParser.NoOptionError as test: print(("Saved game couldn't be loaded completly: " + str(test))) except Exception: print(("Unexpected error:", sys.exc_info()[0])) From eaca7287fb09139884ee6f9363f696e282c60167 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 14:21:19 +0200 Subject: [PATCH 03/28] simplified design loading --- assets/templates/nr1.design | 14 +++----- libs/menu/creator.py | 6 ++-- libs/menu/disp_elem.py | 66 +++++++++++++++---------------------- 3 files changed, 35 insertions(+), 51 deletions(-) diff --git a/assets/templates/nr1.design b/assets/templates/nr1.design index ef87f49..9744af5 100644 --- a/assets/templates/nr1.design +++ b/assets/templates/nr1.design @@ -1,10 +1,6 @@ -type = button -#corner = ./assets/sprites/design1.tif -line = ./assets/sprites/design1.tif -#line_orientation = vertical or horiontal -#inner_color = (255,128,128,100) -#Can create templates if line xor corner is missing -#line_orientation determines wether the given template is for the left or the top -# default is for the top +design = ./assets/sprites/design1.tif +#loads a design image +# consisting of stripes with the pattern +inner_color = (0,0,50,20) #inner_color sets the color inside the button -# default is trancparency \ No newline at end of file +# default is trancparency diff --git a/libs/menu/creator.py b/libs/menu/creator.py index 2bc8cbf..0d58e89 100644 --- a/libs/menu/creator.py +++ b/libs/menu/creator.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pygame -import disp_elem +from . import disp_elem def convert2list(string): @@ -291,9 +291,9 @@ class create_menu(): text = self.vars[text[1:]] #Determines wether relation argument is given - additional_arguments = 1 if ident > 0 else 0 + are_additional_arguments = 1 if ident > 0 else 0 #Through relation argument there might be another "|" - if line.count("|") == 10 + additional_arguments: + if line.count("|") == 10 + are_additional_arguments: line = line[line.index("|") + 1:].lstrip() if line[0] == "$": options = self.vars[line[1: line.index("|")].strip()] diff --git a/libs/menu/disp_elem.py b/libs/menu/disp_elem.py index 9810cc6..f9426c5 100644 --- a/libs/menu/disp_elem.py +++ b/libs/menu/disp_elem.py @@ -329,16 +329,12 @@ class create_outline(): self.resources[option] = var def create_template(self, pos): - corner = None - line = None - line_orient = None + from .creator import convert2list + design = self.resources["design"] + design = pygame.image.load(design) self.color = None - if "corner" in self.resources: - corner = pygame.image.load(self.resources["corner"]) - if "line" in self.resources: - line = pygame.image.load(self.resources["line"]) - if "line_orientation" in self.resources: - line_orient = pygame.image.load(self.resources["line_orientation"]) + + #gets selected background color if "inner_color" in self.resources: color = convert2list(self.resources["inner_color"]) if len(color) == 3: @@ -347,36 +343,28 @@ class create_outline(): self.color = (int(color[0]), int(color[1]), int(color[2]), int(color[3])) else: self.color = (0, 0, 0, 0) - if corner is None: - if line is None: - print("No image given to create design.") - else: - if line_orient == "vertical": - line = pygame.transform.rotate(line, -90) - line_rect = line.get_rect() - size = line_rect.h - #crop the line to the wished string - line_string = pygame.Surface((1, size)) - line_string.blit(line, (0, 0), pygame.Rect(pos, 0, 1, size)) - line = line_string - line_rect = line.get_rect() - self.pixels = {} - self.pattern = pygame.Surface((1, size)) - for a in range(size): - self.pattern.set_at((0, a), line.get_at((0, a))) - corner = pygame.Surface((size, size)) - for a in range(size): - for x in range(size): - for y in range(size): - if x >= a and y >= a: - corner.set_at((x, y), self.pattern.get_at((0, a))) - else: - if line is None: - size = corner.get_height() - self.line = pygame.Surface((1, size)) - for a in range(size): - self.line.set_at((0, a), corner.get_at((size - 1, a))) - return [line, corner] + + design_rect = design.get_rect() + size = design_rect.h + #extract the selected collum + line_string = pygame.Surface((1, size)) + line_string.blit(design, (0, 0), pygame.Rect(pos, 0, 1, size)) + design = line_string + design_rect = design.get_rect() + self.pixels = {} + #create the final surface to blit pattern to + self.pattern = pygame.Surface((1, size)) + #set the pixel colors for the pattern + for a in range(size): + self.pattern.set_at((0, a), design.get_at((0, a))) + #transforms linear pattern into a corner + corner = pygame.Surface((size, size)) + for a in range(size): + for x in range(size): + for y in range(size): + if x >= a and y >= a: + corner.set_at((x, y), self.pattern.get_at((0, a))) + return [self.pattern, corner] def create_box(self, mode, rect): posx = rect.x From 0d9238b889d7adb85083dd5d7bbdbf267e1f20b6 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 14:30:46 +0200 Subject: [PATCH 04/28] fixed back button in loading save screen's formular --- src/menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/menu.py b/src/menu.py index 0ff336e..55bb3fe 100644 --- a/src/menu.py +++ b/src/menu.py @@ -391,7 +391,7 @@ def savegames(): currently_selected -= 1 #Wraps to the end to create a not ending loop if currently_selected < 0: - currently_selected = D_saves - currently_selected - 1 + currently_selected = D_saves + currently_selected settings_menu = menu_template("load", 0, 255, 255, {"savename": list_of_saves[currently_selected]}, []) From 04ae21e03709ee643c02fe04caeff9c1be8f726c Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 15:59:43 +0200 Subject: [PATCH 05/28] the relative argument now refers to previous element instead of last element of that type --- assets/templates/default.vars | 2 +- libs/menu/creator.py | 72 ++++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/assets/templates/default.vars b/assets/templates/default.vars index a82f5f8..e85dff0 100644 --- a/assets/templates/default.vars +++ b/assets/templates/default.vars @@ -1,7 +1,7 @@ <#box1 = (./assets/templates/nr1.design,6) <#box2 = (./assets/templates/nr1.design,./assets/sprites/knob1.tif,6) <%ratio = 1100 -<~size = 25 +<~size = 20 <"typeface = monospace <*color = (255,255,10) <%half = 50 diff --git a/libs/menu/creator.py b/libs/menu/creator.py index 0d58e89..8d358fb 100644 --- a/libs/menu/creator.py +++ b/libs/menu/creator.py @@ -48,6 +48,8 @@ class create_menu(): self.elems = {"buttons": [], "sliders": [], "surfs": {}} ident = 0 + all_elems = {} + elem_id = 1 with open(filename) as conf_file: for line in conf_file: @@ -56,7 +58,6 @@ class create_menu(): continue #This checks for the identation - old_ident = ident ident = 0 if line[0] == "~": ident = line[:line.index("|") - 1].count("~") # Counts identation marks @@ -136,6 +137,8 @@ class create_menu(): 0 ) )] + all_elems[elem_id] = self.elems["surfs"][text] + elem_id += 1 if line[0] == "*": # A title is defined in language line = line[2:] @@ -183,6 +186,8 @@ class create_menu(): pos = pygame.Rect((xpos, ypos), (0, 0)) self.elems["surfs"][text] = [img, pos] + all_elems[elem_id] = self.elems["surfs"][text] + elem_id += 1 if line[0] == "@": # A button is defined in language line = line[2:] @@ -193,9 +198,9 @@ class create_menu(): content = text #Determines wether relation argument is given - additional_arguments = 1 if ident > 0 else 0 + are_additional_arguments = 1 if ident > 0 else 0 #Through relation argument there might be another "|" - if line.count("|") == 5 + additional_arguments: + if line.count("|") == 5 + are_additional_arguments: imagemode = True line = line[line.index("|") + 1:].lstrip() if line.strip()[0] == "$": @@ -260,24 +265,26 @@ class create_menu(): rel_y, abs_y = analyse_num(line, self.vars) #If relative to another button if ident > 0: - #Adds absolute x and y value to current button - #TODO: the referring element to is not always a button - if relation[:3] == "top": - abs_y += self.elems["buttons"][-1 * (ident - old_ident)].pos.top - if relation[:6] == "bottom": - abs_y += self.elems["buttons"][-1 * (ident - old_ident)].pos.bottom - if relation[-4:] == "left": - abs_x += self.elems["buttons"][-1 * (ident - old_ident)].pos.left - if relation[-5:] == "right": - abs_x += self.elems["buttons"][-1 * (ident - old_ident)].pos.right - #Ignores relative placement - rel_x = 0 - rel_y = 0 + if type(all_elems[elem_id - 1]) != type(pygame.Surface): + #Adds absolute x and y value to current slider + if relation[:3] == "top": + abs_y += all_elems[elem_id - 1].pos.top + if relation[:6] == "bottom": + abs_y += all_elems[elem_id - 1].pos.bottom + if relation[-4:] == "left": + abs_x += all_elems[elem_id - 1].pos.left + if relation[-5:] == "right": + abs_x += all_elems[elem_id - 1].pos.right + #Ignores relative placement + rel_x = 0 + rel_y = 0 self.elems["buttons"].append(disp_elem.button(text, rel_x, abs_x, rel_y, abs_y, ref, content, typeface, size, ratio, color, design[:3])) + all_elems[elem_id] = self.elems["buttons"][-1] + elem_id += 1 #Centers non-relative buttons so their center is on the #given x and y coordiante if ident == 0: @@ -291,9 +298,9 @@ class create_menu(): text = self.vars[text[1:]] #Determines wether relation argument is given - are_additional_arguments = 1 if ident > 0 else 0 + additional_arguments = 1 if ident > 0 else 0 #Through relation argument there might be another "|" - if line.count("|") == 10 + are_additional_arguments: + if line.count("|") == 10 + additional_arguments: line = line[line.index("|") + 1:].lstrip() if line[0] == "$": options = self.vars[line[1: line.index("|")].strip()] @@ -373,22 +380,25 @@ class create_menu(): rel_y, abs_y = analyse_num(line, self.vars) if ident > 0: - #Adds absolute x and y value to current button - if relation[:3] == "top": - abs_y += self.elems["sliders"][-1 * (ident - old_ident)].pos.top - if relation[:6] == "bottom": - abs_y += self.elems["sliders"][-1 * (ident - old_ident)].pos.bottom - if relation[-4:] == "left": - abs_x += self.elems["sliders"][-1 * (ident - old_ident)].pos.left - if relation[-5:] == "right": - abs_x += self.elems["sliders"][-1 * (ident - old_ident)].pos.right - #Ignores relative placement - rel_x = 0 - rel_y = 0 + if type(all_elems[elem_id - 1]) != type(pygame.Surface): + #Adds absolute x and y value to current slider + if relation[:3] == "top": + abs_y += all_elems[elem_id - 1].pos.top + if relation[:6] == "bottom": + abs_y += all_elems[elem_id - 1].pos.bottom + if relation[-4:] == "left": + abs_x += all_elems[elem_id - 1].pos.left + if relation[-5:] == "right": + abs_x += all_elems[elem_id - 1].pos.right + #Ignores relative placement + rel_x = 0 + rel_y = 0 self.elems["sliders"].append(disp_elem.slider(text, default_value, size, ratio, typeface, color, img, rel_x, abs_x, rel_y, abs_y, ref, options)) + all_elems[elem_id] = self.elems["sliders"][-1] + elem_id += 1 if ident == 0: self.elems["sliders"][-1].center() @@ -396,6 +406,8 @@ class create_menu(): self.elems["surfs"]["background"] = [pygame.transform.smoothscale( pygame.image.load(self.vars["background"][0]).convert(), ref.size), pygame.Rect(0, 0, 0, 0)] + all_elems[elem_id] = self.elems["surfs"]["background"] + elem_id += 1 def blit(self, screen, events): try: From 7836c3673b2e159bec1a33994853e593329a9bc8 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 16:32:52 +0200 Subject: [PATCH 06/28] selected world in warp menu is highlighted when selected --- src/menu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/menu.py b/src/menu.py index 55bb3fe..c134bf1 100644 --- a/src/menu.py +++ b/src/menu.py @@ -297,8 +297,8 @@ def choose_world(): pygame.time.wait(128) for elem in world_menu.menu.elems["buttons"]: if elem.name == "world" + str(selected): - elem.state = 1 - #print elem.name + elem.state = 2 + elem.blit(settings.screen) pygame.display.flip() pygame.mouse.set_visible(False) From 9c2fa59beab44ae77e0e970a97fff6871bd2dfca Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 18:24:54 +0200 Subject: [PATCH 07/28] targets and warp statioin now in screen and partly solved #3 --- src/draw.py | 2 +- src/objects.py | 136 +++++++++++++++++++++++++++---------------------- src/worlds.py | 75 +-------------------------- 3 files changed, 77 insertions(+), 136 deletions(-) diff --git a/src/draw.py b/src/draw.py index 21ef717..fe8d85d 100644 --- a/src/draw.py +++ b/src/draw.py @@ -210,7 +210,7 @@ def status(): borderpos = border.get_rect() borderpos.bottomright = (settings.screenx_current, settings.screeny_current) - pos = bar.fill((62, 186, 23)) + pos = bar.fill((62, 186, 23, 10)) pos.right = settings.screenx_current pos.top = settings.screeny_current - (pos.h / 100.0) * specials.energy settings.screen.blit(bar, pos) diff --git a/src/objects.py b/src/objects.py index 12578e7..6542d5e 100644 --- a/src/objects.py +++ b/src/objects.py @@ -3,6 +3,7 @@ import pygame import random import math from . import settings +from . import menu from pygame.locals import * """Classes for creating objects""" @@ -68,59 +69,6 @@ class stars(): self.pointy = self.relative_y * self.screeny -class inputfield(): - - def __init__(self, x, y, typ, text, color): - print "used" - """Creates a new inputfield""" - self.font = pygame.font.SysFont(settings.typeface, 30) - self.header = text - if typ == 1: - self.field = settings.field - elif typ == 2: - self.field = settings.field1 - self.pos = settings.field.get_rect() - self.pos = self.pos.move(x - (self.pos.w / 2.0), y - (self.pos.h / 2.0)) - self.text = "" - self.render_text = settings.modrender(settings.typeface, 30, self.text, - True, color, - self.pos.size, 9) - self.textpos = self.render_text.get_rect() - self.textpos.center = self.pos.center - self.render_header = settings.modrender(settings.typeface, 30, self.header, - True, color, - settings.screen.get_rect().size, 0) - self.headerpos = self.render_header.get_rect() - self.headerpos.center = self.pos.center - self.headerpos.y -= 50 - - def gettext(self): - """Returns text if return is pressed or removes one if return is pressed""" - from . import interface - key = interface.getall(False) - if key is not None and self.textpos.width < self.pos.width - 18: - self.text = self.text + key - if key is None: - key = interface.getall(True) - if key == "return": - return self.text - if key == "backspace": - self.text = self.text[:len(self.text) - 1] - - def blit(self): - """Blits the inputfield""" - color = settings.color - screen = settings.screen - self.render_text = settings.modrender(settings.typeface, 30, self.text, - True, color, - self.pos.size, 9) - self.textpos = self.render_text.get_rect() - self.textpos.center = self.pos.center - screen.blit(self.render_header, self.headerpos) - screen.blit(self.field, self.pos) - screen.blit(self.render_text, self.textpos) - - class bullet(): def __init__(self, angle, reference): @@ -194,13 +142,8 @@ class target(): def update(self): """Adjusts position according to screen size""" - self.pos_x = self.pos_xper * float(settings.world.background_pos.w - - 20 - self.pos.w) + 10 + self.pos.w / 2.0 - self.pos_y = self.pos_yper * float(settings.world.background_pos.h - - 20 - self.pos.h) + 10 + self.pos.h / 2.0 - self.pos_x = self.pos_xper * float(settings.world.background_pos.w - - 20 - self.pos.w) + 10 + self.pos.w / 2.0 - self.pos_y = self.pos_yper * ((settings.screeny_current - self.pos.h) * 2.0) + self.pos_x = self.pos_xper * 2 * float(settings.screenx_current - self.pos.w) + self.pos_y = self.pos_yper * 2 * float(settings.screeny_current - self.pos.h) def move(self, x, y): """Moves rect according to playerposition""" @@ -246,4 +189,75 @@ class target(): if self.inscreen: settings.screen.blit(self.image, self.pos) return True - return False \ No newline at end of file + return False + + +class warp_station(): + + def __init__(self): + self.x_pos = random.random() + self.y_pos = random.random() + self.screen = settings.screen + self.update() + + def update(self): + self.img = pygame.image.load("./assets/sprites/station1.tif") + self.img = pygame.transform.smoothscale(self.img, + (int(settings.screenx_current * 0.1), + int(settings.screenx_current * 0.1) + )) + self.pos = self.img.get_rect() + self.pos.x = self.x_pos * 2 * float(settings.screenx_current - self.pos.w) + self.pos.y = self.y_pos * 2 * float(settings.screeny_current - self.pos.h) + self.anchorx, self.anchory = self.pos.topleft + + def move(self, playerpos): + self.pos.left = self.anchorx - playerpos.x + self.pos.top = self.anchory - playerpos.y + + def test(self, playerpos): + def testpoint(point): + x_sqr = ((point[0] * point[0]) + - (2.0 * self.pos.centerx * point[0]) + + (self.pos.centerx * self.pos.centerx)) + y_sqr = ((point[1] * point[1]) + - (2.0 * self.pos.centery * point[1]) + + (self.pos.centery * self.pos.centery)) + if math.sqrt(x_sqr + y_sqr) < self.pos.w / 2.0: + return True + else: + return False + + def test_collide(): + test = testpoint(playerpos.topleft) + test = test or testpoint(playerpos.bottomleft) + test = test or testpoint(playerpos.topright) + test = test or testpoint(playerpos.bottomright) + return test + if test_collide(): + #Warps to the selected world and gets a bit pushed off the station + selected_num = menu.choose_world() + if selected_num >= 0: + settings.world = settings.localmap[selected_num] + settings.world.adjust_to_screen() + settings.player.up = False + settings.player.down = False + settings.player.left = False + settings.player.right = False + settings.up = False + settings.down = False + settings.left = False + settings.right = False + while test_collide(): + if settings.player.pos.center[0] < self.pos.center[0]: + settings.player.move_ip(-20, 0) + else: + settings.player.move_ip(20, 0) + if settings.player.pos.center[1] < self.pos.center[1]: + settings.player.move_ip(0, -20) + else: + settings.player.move_ip(0, 20) + playerpos = settings.player.pos + + def blit(self): + self.screen.blit(self.img, self.pos) \ No newline at end of file diff --git a/src/worlds.py b/src/worlds.py index 6d66a87..8274089 100644 --- a/src/worlds.py +++ b/src/worlds.py @@ -1,10 +1,7 @@ from . import settings from . import objects from . import draw -from . import menu import pygame -import random -import math """An abstact level for handeling multiple worlds.""" @@ -36,77 +33,7 @@ class world(): tmptarget = objects.target() self.targets.append(tmptarget) - class warp(): - - def __init__(self): - self.x_pos = random.random() - self.y_pos = random.random() - self.screen = settings.screen - self.update() - - def update(self): - self.img = pygame.image.load("./assets/sprites/station1.tif") - self.img = pygame.transform.smoothscale(self.img, - (int(settings.screenx_current * 0.1), - int(settings.screenx_current * 0.1) - )) - self.pos = self.img.get_rect() - self.pos.x = self.x_pos * (settings.world.background_pos.w - self.pos.w) - self.pos.y = self.y_pos * (settings.world.background_pos.h - self.pos.h) - self.anchorx, self.anchory = self.pos.topleft - - def move(self, playerpos): - self.pos.left = self.anchorx - playerpos.x - self.pos.top = self.anchory - playerpos.y - - def test(self, playerpos): - def testpoint(point): - x_sqr = ((point[0] * point[0]) - - (2.0 * self.pos.centerx * point[0]) - + (self.pos.centerx * self.pos.centerx)) - y_sqr = ((point[1] * point[1]) - - (2.0 * self.pos.centery * point[1]) - + (self.pos.centery * self.pos.centery)) - if math.sqrt(x_sqr + y_sqr) < self.pos.w / 2.0: - return True - else: - return False - - def test_collide(): - test = testpoint(playerpos.topleft) - test = test or testpoint(playerpos.bottomleft) - test = test or testpoint(playerpos.topright) - test = test or testpoint(playerpos.bottomright) - return test - if test_collide(): - #Warps to the selected world and gets a bit pushed off the station - selected_num = menu.choose_world() - if selected_num >= 0: - settings.world = settings.localmap[selected_num] - settings.world.adjust_to_screen() - settings.player.up = False - settings.player.down = False - settings.player.left = False - settings.player.right = False - settings.up = False - settings.down = False - settings.left = False - settings.right = False - while test_collide(): - if settings.player.pos.center[0] < self.pos.center[0]: - settings.player.move_ip(-20, 0) - else: - settings.player.move_ip(20, 0) - if settings.player.pos.center[1] < self.pos.center[1]: - settings.player.move_ip(0, -20) - else: - settings.player.move_ip(0, 20) - playerpos = settings.player.pos - - def blit(self): - self.screen.blit(self.img, self.pos) - - self.warp1 = warp() + self.warp1 = objects.warp_station() self.adjust_to_screen() From 00f686441a01db09ff23975f54ff7f4d8092e2eb Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 19:12:53 +0200 Subject: [PATCH 08/28] workaround for targets behind powerbar --- src/draw.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/draw.py b/src/draw.py index fe8d85d..f6cd2b4 100644 --- a/src/draw.py +++ b/src/draw.py @@ -205,12 +205,14 @@ def adjustscreen(): def status(): xsize = int(settings.screenx_current * 0.05) ysize = int(settings.screeny_current * 0.3) + 10 - bar = pygame.Surface((xsize, ysize)) - border = pygame.transform.scale(settings.border1, (xsize, ysize)) + bar = pygame.Surface((xsize, ysize)).convert_alpha() + border = pygame.transform.scale( + settings.border1, (xsize, ysize)).convert_alpha() + border.set_alpha(0) borderpos = border.get_rect() borderpos.bottomright = (settings.screenx_current, settings.screeny_current) - pos = bar.fill((62, 186, 23, 10)) + pos = bar.fill((62, 186, 23, 40)) pos.right = settings.screenx_current pos.top = settings.screeny_current - (pos.h / 100.0) * specials.energy settings.screen.blit(bar, pos) From 1f088f82ec2438ec612ab27832cdafb40d1c7fd0 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 17 Sep 2015 21:55:30 +0200 Subject: [PATCH 09/28] fixed issue #7 --- libs/menu/disp_elem.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/menu/disp_elem.py b/libs/menu/disp_elem.py index f9426c5..0080fdf 100644 --- a/libs/menu/disp_elem.py +++ b/libs/menu/disp_elem.py @@ -283,8 +283,13 @@ class slider(): self.knob_pos.left = self.pos.left + tmp if type(self.options_list) == bool: - text = self.name + ": " + str(self.value * 100)[:3] + "%" - text = text.replace("0.0", "0").replace(".", "") + #adding a "." to the end to ensure at least one is included + text = str(self.value * 100)[:3] + "." + #removes "." and everything behind it + text = text[:text.index(".")] + #Adds the description and the % at the end + text = self.name + ": " + text + "%" + #Turns text into a pygame.Surface self.render_text = self.typeface.render(text, True, self.color) self.is_defined_list = False else: From 84650dfc153caad9984a9db6e1efe5bf662faa6b Mon Sep 17 00:00:00 2001 From: Max Lange Date: Fri, 18 Sep 2015 18:15:12 +0200 Subject: [PATCH 10/28] Some improvements towards PEP-8 --- .gitignore | 3 ++ Run.py | 15 +++---- libs/menu/IO.py | 2 +- libs/menu/creator.py | 57 +++++++++++-------------- libs/menu/disp_elem.py | 84 ++++++++++++++++++------------------- libs/tygamusic/tygamusic.py | 79 +++++++++++++++++----------------- src/chat.py | 2 +- src/draw.py | 24 +++++------ src/interface.py | 14 +++---- src/main.py | 24 +++++------ src/menu.py | 68 +++++++++++++++--------------- src/midi_in.py | 4 +- src/missions.py | 2 +- src/movement.py | 2 +- src/namings.py | 10 ++--- src/objects.py | 30 ++++++------- src/player.py | 30 +++++++------ src/settings.py | 38 ++++++++--------- src/sounds.py | 2 +- src/specials.py | 7 ++-- src/worlds.py | 14 +++---- 21 files changed, 252 insertions(+), 259 deletions(-) diff --git a/.gitignore b/.gitignore index d39ce24..cf3bac5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ #the Ninja project file **.nja +#The Flake8 config file +**tox.ini + #empty folders screenshots/* assets/sprites/player/* diff --git a/Run.py b/Run.py index 47f0743..09d0007 100644 --- a/Run.py +++ b/Run.py @@ -13,8 +13,9 @@ try: os.environ['SDL_VIDEO_CENTERED'] = '1' pygame.init() + # checks if font module is availible pygame.font -#Checks for correct version + # Checks for correct version if pygame.version.ver < "1.9.1": raise SystemExit("Old Pygame version: " + pygame.version.ver) if sys.version[:5] < "2.7.6": @@ -22,20 +23,20 @@ try: if sys.version[:5] >= "3.0.0": raise SystemExit("No support for Python3") -#Run the game + # Run the game from src import main main.void() -#Handeling errors +# Handeling errors except ImportError as message: if str(message)[len(str(message)) - 6:] == "pygame": # pygame not installed raise SystemExit("Pygame not installed") else: - #unknown import error + # unknown import error print (("ERROR IMPORTING MODULES: %s" % message)) raise SystemExit(traceback.format_exc()) except AttributeError as detail: - #excuted if font module is not installed + # excuted if font module is not installed detail = str(detail) print(detail) if detail[len(detail) - 5:][:4] == "font": # Basicly the name of the module @@ -45,7 +46,7 @@ except AttributeError as detail: print("") raise SystemExit(traceback.format_exc()) except Exception as detail: - #general errors + # general errors print(("Unexpected error:", sys.exc_info()[0])) print("") - raise SystemExit(traceback.format_exc()) \ No newline at end of file + raise SystemExit(traceback.format_exc()) diff --git a/libs/menu/IO.py b/libs/menu/IO.py index a213003..f0d785c 100644 --- a/libs/menu/IO.py +++ b/libs/menu/IO.py @@ -32,4 +32,4 @@ def read(filename, variable): ident = line.index("<") varname = (line[ident + 2:line.index("=") - 1]).strip() if varname == variable: - return line[line.index("=") + 1:].strip() \ No newline at end of file + return line[line.index("=") + 1:].strip() diff --git a/libs/menu/creator.py b/libs/menu/creator.py index 8d358fb..2dd8664 100644 --- a/libs/menu/creator.py +++ b/libs/menu/creator.py @@ -57,14 +57,14 @@ class create_menu(): if len(line) < 1 or line[0] == "/": continue - #This checks for the identation + # This checks for the identation ident = 0 if line[0] == "~": ident = line[:line.index("|") - 1].count("~") # Counts identation marks line = line[ident:] # removes identation marks for analysis - #Here are the diferent types of elements - #and comments that can be used + # Here are the diferent types of elements + # and comments that can be used if line[0] == "&": # An import of existing variables file2 = line[1:] self.vars.update(create_menu(file2, {}, pygame.Rect(1, 1, 1, 1)).vars) @@ -77,9 +77,9 @@ class create_menu(): self.vars[var[1:]] = float(elem) if var[0] == "#": # A desing variable elems = convert2list(elem) - #this adds non-existing types - #(hoverover and klicked) - #to the desing if they are missing + # this adds non-existing types + # (hoverover and klicked) + # to the desing if they are missing try: elems[len(elems) - 1] = int(elems[len(elems) - 1]) if len(elems) == 2: @@ -128,15 +128,9 @@ class create_menu(): self.elems["surfs"][text] = [pygame.image.load(img[0]).convert_alpha(), pygame.Rect( - ( - (ref.w * rel_x) + abs_x, - (ref.h * rel_y) + abs_y, - ), - ( - 0, - 0 - ) - )] + ((ref.w * rel_x) + abs_x, + (ref.h * rel_y) + abs_y,), + (0, 0))] all_elems[elem_id] = self.elems["surfs"][text] elem_id += 1 @@ -197,9 +191,9 @@ class create_menu(): text = self.vars[text[1:]] content = text - #Determines wether relation argument is given + # Determines wether relation argument is given are_additional_arguments = 1 if ident > 0 else 0 - #Through relation argument there might be another "|" + # Through relation argument there might be another "|" if line.count("|") == 5 + are_additional_arguments: imagemode = True line = line[line.index("|") + 1:].lstrip() @@ -250,8 +244,8 @@ class create_menu(): quit() if ident > 0: - #Reads the relation point - #(Topleft, Topright, Bottomleft, Bottomright) + # Reads the relation point + # (Topleft, Topright, Bottomleft, Bottomright) line = line[line.index("|") + 1:].lstrip() if line[0] == "$": relation = self.vars[line[1: line.index("|")].strip()] @@ -263,10 +257,10 @@ class create_menu(): rel_x, abs_x = analyse_num(line[0: line.index("|")].strip(), self.vars) line = line[line.index("|") + 1:-1].lstrip() rel_y, abs_y = analyse_num(line, self.vars) - #If relative to another button + # If relative to another button if ident > 0: if type(all_elems[elem_id - 1]) != type(pygame.Surface): - #Adds absolute x and y value to current slider + # Adds absolute x and y value to current slider if relation[:3] == "top": abs_y += all_elems[elem_id - 1].pos.top if relation[:6] == "bottom": @@ -275,7 +269,7 @@ class create_menu(): abs_x += all_elems[elem_id - 1].pos.left if relation[-5:] == "right": abs_x += all_elems[elem_id - 1].pos.right - #Ignores relative placement + # Ignores relative placement rel_x = 0 rel_y = 0 @@ -285,8 +279,8 @@ class create_menu(): typeface, size, ratio, color, design[:3])) all_elems[elem_id] = self.elems["buttons"][-1] elem_id += 1 - #Centers non-relative buttons so their center is on the - #given x and y coordiante + # Centers non-relative buttons so their center is on the + # given x and y coordiante if ident == 0: self.elems["buttons"][-1].center() @@ -297,9 +291,9 @@ class create_menu(): if text[0] == "$": text = self.vars[text[1:]] - #Determines wether relation argument is given + # Determines wether relation argument is given additional_arguments = 1 if ident > 0 else 0 - #Through relation argument there might be another "|" + # Through relation argument there might be another "|" if line.count("|") == 10 + additional_arguments: line = line[line.index("|") + 1:].lstrip() if line[0] == "$": @@ -325,7 +319,6 @@ class create_menu(): options = False line = line[line.index("|") + 1:].lstrip() if line.strip()[0] == "$": - #print line[1: line.index("|")].strip() default_value = float(self.vars[line[1: line.index("|")].strip()]) else: default_value = float(line[: line.index("|")].strip()) @@ -364,8 +357,8 @@ class create_menu(): quit() if ident > 0: - #Reads the relation point - #(Topleft, Topright, Bottomleft, Bottomright) + # Reads the relation point + # (Topleft, Topright, Bottomleft, Bottomright) line = line[line.index("|") + 1:].lstrip() if line[0] == "$": relation = self.vars[line[1: line.index("|")].strip()] @@ -381,7 +374,7 @@ class create_menu(): if ident > 0: if type(all_elems[elem_id - 1]) != type(pygame.Surface): - #Adds absolute x and y value to current slider + # Adds absolute x and y value to current slider if relation[:3] == "top": abs_y += all_elems[elem_id - 1].pos.top if relation[:6] == "bottom": @@ -390,7 +383,7 @@ class create_menu(): abs_x += all_elems[elem_id - 1].pos.left if relation[-5:] == "right": abs_x += all_elems[elem_id - 1].pos.right - #Ignores relative placement + # Ignores relative placement rel_x = 0 rel_y = 0 @@ -438,4 +431,4 @@ class create_menu(): for elem in self.elems: if type(elem) != pygame.Surface: if elem.name == name: - return elem \ No newline at end of file + return elem diff --git a/libs/menu/disp_elem.py b/libs/menu/disp_elem.py index 0080fdf..206093d 100644 --- a/libs/menu/disp_elem.py +++ b/libs/menu/disp_elem.py @@ -6,7 +6,7 @@ import string def modrender(typeface, size, text, antialias, color, maxsize, borderoff): - #local typeface! + # local typeface! nofit = True while nofit: tmpfont = pygame.font.SysFont(typeface, size) @@ -20,7 +20,7 @@ def modrender(typeface, size, text, antialias, color, maxsize, borderoff): def getmaxsize(typeface, size, text, antialias, color, maxsize, borderoff): - #local typeface! + # local typeface! nofit = True while nofit: tmpfont = pygame.font.SysFont(typeface, size) @@ -38,46 +38,46 @@ class button(): def __init__(self, name, rel_x, x, rel_y, y, ref, content_in, typeface, size, ratio, color, button_designs): """Initalises with x and y as center point""" - #basic font and then everything should be clear - #three different instances of create_outline! - #this way three images can be generated + # basic font and then everything should be clear + # three different instances of create_outline! + # this way three images can be generated - #This prepares button for either to contain text or an image + # This prepares button for either to contain text or an image self.isimage = False if content_in != name: # True = Image if type(content_in) == pygame.Surface: # Surf already exists content = content_in contentpos = content.get_rect() self.isimage = True - elif type(content_in) == str: # Only string is provided, image needs loading + elif type(content_in) == str: # Only string is provided image needs loading content = pygame.image.load(content_in).convert_alpha() contentpos = content.get_rect() self.isimage = True else: # False = Font/Text - #Loads the font + # Loads the font self.font = pygame.font.SysFont(typeface, int(size)) - #renders the text and creates a rect + # renders the text and creates a rect content = self.font.render(name, True, color) contentpos = content.get_rect() - #creating emtpy surface that is the size of the desired button + # creating emtpy surface that is the size of the desired button tmp_centertext_image = pygame.Surface((contentpos.h * ratio, contentpos.h)).convert_alpha() tmp_centertext_image.fill((0, 0, 0, 0)) tmp_center_pos = tmp_centertext_image.get_rect() - #blitting the text onto the surface + # bliting the text onto the surface contentpos.center = tmp_center_pos.center tmp_centertext_image.blit(content, contentpos) - #Adding image to interface + # Adding image to interface content = tmp_centertext_image contentpos = content.get_rect() - #saving typeface for later use + # saving typeface for later use self.typeface = typeface - #creating ouline templates + # creating ouline templates normal = create_outline(button_designs[0]) hover = create_outline(button_designs[0]) klick = create_outline(button_designs[0]) @@ -85,20 +85,20 @@ class button(): self.state = 0 self.name = name self.klicked = False - #calcualte absolute position - #and define rect + # calcualte absolute position + # and define rect x = x + rel_x * float(ref.w) y = y + rel_y * float(ref.h) self.pos = pygame.Rect((x, y), contentpos.size) self.move(x, y) - #move buttons and create images - #also adds content inside button + # move buttons and create images + # also adds content inside button for num in range(len(self.buttons)): self.buttons[num].create_box(num, self.pos) - #defines position in the middle of button + # defines position in the middle of button contentpos.centerx = self.buttons[num].pos.centerx - self.buttons[num].pos.x contentpos.centery = self.buttons[num].pos.centery - self.buttons[num].pos.y - #blits content centered in button + # blits content centered in button self.buttons[num].box.blit(content, contentpos) self.pos.size = self.buttons[0].pos.size @@ -109,17 +109,17 @@ class button(): def changetext(self, text, color): """Changes the text inside the button""" - #renders the text and creates a rect + # renders the text and creates a rect content = self.font.render(text, True, color) contentpos = content.get_rect() - #creating emtpy surface that is the size of the desired button + # creating emtpy surface that is the size of the desired button tmp_centertext_image = pygame.Surface((contentpos.h * ratio, contentpos.h)).convert_alpha() tmp_centertext_image.fill((0, 0, 0, 0)) tmp_center_pos = tmp_centertext_image.get_rect() - #blitting the text onto the surface + # bliting the text onto the surface contentpos.center = tmp_center_pos.center tmp_centertext_image.blit(content, contentpos) content = tmp_centertext_image @@ -134,8 +134,8 @@ class button(): self.pos = self.pos.move(x, y) def update(self, events): - #changes image when hovered over or being clicked - #also posts a menu event to show that a button has been clicked + # changes image when hovered over or being clicked + # also posts a menu event to show that a button has been clicked if self.pos.collidepoint(pygame.mouse.get_pos()) and not self.klicked: self.state = 1 for event in events: @@ -283,13 +283,13 @@ class slider(): self.knob_pos.left = self.pos.left + tmp if type(self.options_list) == bool: - #adding a "." to the end to ensure at least one is included + # adding a "." to the end to ensure at least one is included text = str(self.value * 100)[:3] + "." - #removes "." and everything behind it + # removes "." and everything behind it text = text[:text.index(".")] - #Adds the description and the % at the end + # Adds the description and the % at the end text = self.name + ": " + text + "%" - #Turns text into a pygame.Surface + # Turns text into a pygame.Surface self.render_text = self.typeface.render(text, True, self.color) self.is_defined_list = False else: @@ -339,7 +339,7 @@ class create_outline(): design = pygame.image.load(design) self.color = None - #gets selected background color + # gets selected background color if "inner_color" in self.resources: color = convert2list(self.resources["inner_color"]) if len(color) == 3: @@ -351,18 +351,18 @@ class create_outline(): design_rect = design.get_rect() size = design_rect.h - #extract the selected collum + # extract the selected collum line_string = pygame.Surface((1, size)) line_string.blit(design, (0, 0), pygame.Rect(pos, 0, 1, size)) design = line_string design_rect = design.get_rect() self.pixels = {} - #create the final surface to blit pattern to + # create the final surface to blit pattern to self.pattern = pygame.Surface((1, size)) - #set the pixel colors for the pattern + # set the pixel colors for the pattern for a in range(size): self.pattern.set_at((0, a), design.get_at((0, a))) - #transforms linear pattern into a corner + # transforms linear pattern into a corner corner = pygame.Surface((size, size)) for a in range(size): for x in range(size): @@ -380,24 +380,24 @@ class create_outline(): width += border * 2 height += border * 2 self.top = pygame.Surface((width, border)) - #creating top frame line + # creating top frame line for pos in range(width): self.top.blit(self.modes[mode][0], pygame.Rect(pos, 0, 0, 0)) - #blit left top corner + # blit left top corner self.top.blit(self.modes[mode][1], pygame.Rect(0, 0, 0, 0)) - #blit right top corner + # blit right top corner self.top.blit(pygame.transform.flip(self.modes[mode][1], True, False), pygame.Rect(width - border, 0, 0, 0)) - #create bottom line + # create bottom line self.bottom = pygame.transform.flip(self.top, False, True) - #create left frame line + # create left frame line self.left = pygame.Surface((border, height)) tmp_line = pygame.transform.rotate(self.modes[mode][0], 90) for pos in range(height): self.left.blit(tmp_line, pygame.Rect(0, pos, 0, 0)) - #create right frame line + # create right frame line self.right = pygame.transform.flip(self.left, True, False) - #Merge all together + # Merge all together final = pygame.Surface((width, height), pygame.SRCALPHA) final.fill(self.color) final.blit(self.left, pygame.Rect(0, 0, 0, 0)) @@ -408,4 +408,4 @@ class create_outline(): self.pos = self.box.get_rect() self.pos.x = posx - border self.pos.y = posy - border - return (self.pos, self.box) \ No newline at end of file + return (self.pos, self.box) diff --git a/libs/tygamusic/tygamusic.py b/libs/tygamusic/tygamusic.py index 879bfe0..c726d66 100644 --- a/libs/tygamusic/tygamusic.py +++ b/libs/tygamusic/tygamusic.py @@ -91,16 +91,16 @@ self._timeplayed (dict) def get_music(self): """Return all files with given conditions.""" - #Look up tygamusic.CreateQueue.__init__.__doc__ for more info + # Look up tygamusic.CreateQueue.__init__.__doc__ for more info files = [] - #Runs through all files and checks for filetype + # Runs through all files and checks for filetype for filename in os.listdir(self._path): supportedmusic = [ filename.endswith(".ogg") or filename.endswith(".mp3") or filename.endswith(".mid") or filename.endswith(".midi") or filename.endswith(".wav")] - #Adds file if it is supported format + # Adds file if it is supported format # and doesn't begin with specified beinning if (supportedmusic[0] and filename[0:len(self.__exception)] != self.__exception): @@ -124,21 +124,20 @@ shouldplaynextsong (bool) if music has ended """ - #print self.volume - #Adjust volume to its own volume. + # Adjust volume to its own volume. pygame.mixer.music.set_volume(self.volume) - #Adds a random song to playlist + # Adds a random song to playlist # if it is smaller than the amount of music provided if len(self.playlist) < len(self.files) - 1 and self.files != [None]: self.add_random("end") - #If no events are specified pygame.event.get() + # If no events are specified pygame.event.get() # will be called. if type(events) == bool: if events: events = pygame.event.get() else: return - #Playes next song if the last one has ended. + # Playes next song if the last one has ended. if self.__endevent in events and shouldplaynextsong: self.playlist.pop(0) self._playing = False @@ -157,41 +156,41 @@ Operations: "unpause" "stop" -Look up individual options's comments in sourcecode for an in depth explanation. +Look up individual options's comments below for an in depth explanation. """ options = list(options) if options[0] == "play" and len(self.playlist) != 0: - #first song of playlist is played if none is playing + # first song of playlist is played if none is playing if len(options) == 1: options.append(0) if len(options) == 2: - #Playes new song or loads it, if neccessary. + # Playes new song or loads it, if neccessary. if not self._playing: pygame.mixer.music.load(self._path + self.playlist[0]) pygame.mixer.music.play(options[1], 0) - #Add new song to dict + # Add new song to dict self._timeplayed[self.playlist[0]] = 0 if self._playing: pygame.mixer.music.play(options[1], 0) self._playing = True if options[0] == "next": - #remove old song + # remove old song self._timeplayed[self.playlist[0]] = 0 self.playlist.pop(0) self._playing = False - #add second option if not given + # add second option if not given if len(options) == 1: options.append(0) self.play("play", options[1]) if options[0] == "pause" and len(self.playlist) != 0: - #Pauses current music and saves its position. - #The -1000 makes it more natural because resuming + # Pauses current music and saves its position. + # The -1000 makes it more natural because resuming # can only be done in whole seconds # and makes it easier to recognize position. currentpos = int(pygame.mixer.music.get_pos() / 1000.0 - 1000) - #When song just started negative results may possible. + # When song just started negative results may possible. if currentpos <= 0: currentpos += 1000 try: # try is cheaper than if @@ -203,8 +202,8 @@ Look up individual options's comments in sourcecode for an in depth explanation. pygame.mixer.music.pause() if options[0] == "unpause" and len(self.playlist) != 0: - #Restarts music and removes previous music if it hasnt been paused yet. - #the check is needed if someone unpauses more than pauses + # Restarts music and removes previous music if it hasnt been paused yet. + # the check is needed if someone unpauses more than pauses if self._pauselevel > 0: self._pauselevel -= 1 while self._timeplayed[self.playlist[0]] == 0 and len(self.playlist) > 1: @@ -214,13 +213,13 @@ Look up individual options's comments in sourcecode for an in depth explanation. self._playing = True if options[0] == "stop": - #Stops current song. + # Stops current song. pygame.mixer.music.stop() self._timeplayed[self.playlist[0]] = 0 self._playing = False if options[0] == "loop": - #Playes current song in a loop. + # Playes current song in a loop. self._timeplayed[self.playlist[0]] = 0 pygame.mixer.music.load(self._path + self.playlist[0]) self.play("play", -1) @@ -234,16 +233,16 @@ pos (int) Alternativly "end" can be passed too to add a song to the end. """ - #Makes it easier to add song at end by using "end" as pos. + # Makes it easier to add song at end by using "end" as pos. if type(pos) is str: if pos == "end" and len(self.playlist) != 0: pos = len(self.playlist) else: pos = 0 - #Ensures that we actually have songs to load. + # Ensures that we actually have songs to load. if self.files != [None]: - #Selects a new song and ensures that never two songs are directly + # Selects a new song and ensures that never two songs are directly # after each other. newsong = self.files[random.randint(0, len(self.files) - 1)] result = False @@ -251,33 +250,33 @@ pos (int) while not result: newsong = self.files[random.randint(0, len(self.files) - 1)] try: - #checks right neighbor is diffrent + # checks right neighbor is diffrent right = not (newsong == self.playlist[pos + 1]) except: - #if has no neighbor, left decides - #(if left is true then end result is true - # if left is false then end result is false) + # if has no neighbor, left decides + # (if left is true then end result is true + # if left is false then end result is false) right = True try: - #checks left neighbor if diffrent and decides - #if one of both partner is diffrent as newsong + # checks left neighbor if diffrent and decides + # if one of both partner is diffrent as newsong result = right and not (newsong == self.playlist[pos]) except: - #if no left neighbor right decides + # if no left neighbor right decides result = right else: - #If it is only song, there are no neighbours to check. + # If it is only song, there are no neighbours to check. newsong = self.files[random.randint(0, len(self.files) - 1)] - #Adds song at pos to playlist. + # Adds song at pos to playlist. self.queue(newsong, pos) def remove_dublicates(self): """Removes dublicate songs whilst preserving order.""" - #These three lines werent done by me - #and only slightly modified - #Thanks to http://www.peterbe.com/plog/uniqifiers-benchmark - #for creating them (i think he did it but im not sure) + # These three lines werent done by me + # and only slightly modified + # Thanks to http://www.peterbe.com/plog/uniqifiers-benchmark + # for creating them (i think he did it but im not sure) seen = set() seen_add = seen.add self.playlist = [x for x in self.playlist if not (x in seen or seen_add(x))] @@ -291,12 +290,12 @@ pos (int) Alternativly "end" can be passed too to add a song to the end. """ - #makes it easier to add song at end by using "end" as pos + # makes it easier to add song at end by using "end" as pos if type(pos) is str: if pos == "end": pos = len(self.playlist) else: pos = 0 - #adds song at pos to playlist - self.playlist.insert(pos, song) \ No newline at end of file + # adds song at pos to playlist + self.playlist.insert(pos, song) diff --git a/src/chat.py b/src/chat.py index e86f595..540530f 100644 --- a/src/chat.py +++ b/src/chat.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from . import interface """Useless module atm""" -#maybe implemented some next version +# maybe implemented some next version def getinput(oldinput): diff --git a/src/draw.py b/src/draw.py index f6cd2b4..d5dc6ac 100644 --- a/src/draw.py +++ b/src/draw.py @@ -11,7 +11,7 @@ from pygame.locals import * def init(): """Some variable initializing""" - #nothing to explain here + # nothing to explain here global fullscreenold global playerup global alpha @@ -25,7 +25,7 @@ def init(): no16to9 = False show = 0 if settings.aspect_ratio != 16.0 / 9: - #makes a black stripe if not 16 to 9 + # makes a black stripe if not 16 to 9 no16to9 = True delta_screeny = settings.screeny - settings.screeny_current correcture = pygame.Surface((settings.screenx, delta_screeny)) @@ -36,7 +36,7 @@ def init(): def ingame(): """Draws everything while game runs""" - #nothing to explain here i guess + # nothing to explain here i guess screen = settings.screen @@ -60,7 +60,7 @@ def ingame(): def debug(): """shows debug info on screen""" - #nothing to explain here too? + # nothing to explain here too? debugscreen = settings.debugscreen rot_dest = settings.player.rot_dest @@ -153,9 +153,9 @@ def drawsongname(): show = 40 * 8 font = pygame.font.SysFont(typeface, 15) song = sounds.music.playlist[0].replace("_", " ")[:-4] - #To all of you: - #USE BACKGROUND COLOR - #cant apply alpha otherwise (took hours to figure out) + # To all of you: + # USE BACKGROUND COLOR + # cant apply alpha otherwise (took hours to figure out) songname = font.render(song, True, settings.color, (0, 0, 5)) font_pos = songname.get_rect() font_pos.right = screenx - 10 @@ -169,7 +169,7 @@ def drawsongname(): songname.set_alpha(int(alpha)) except: pass - #Timing error is not important + # Timing error is not important if pygame.mixer.music.get_volume() != 0.0 and show != 0: screen.blit(songname, font_pos) @@ -186,7 +186,7 @@ def drawworldname(): def adjustscreen(): """Changes to fullscreen and back""" - #changes resolution and so on when fullscreen is toggled + # changes resolution and so on when fullscreen is toggled global fullscreenold screenx = settings.screenx @@ -206,8 +206,8 @@ def status(): xsize = int(settings.screenx_current * 0.05) ysize = int(settings.screeny_current * 0.3) + 10 bar = pygame.Surface((xsize, ysize)).convert_alpha() - border = pygame.transform.scale( - settings.border1, (xsize, ysize)).convert_alpha() + border = pygame.transform.scale(settings.border1, (xsize, ysize) + ).convert_alpha() border.set_alpha(0) borderpos = border.get_rect() borderpos.bottomright = (settings.screenx_current, @@ -216,4 +216,4 @@ def status(): pos.right = settings.screenx_current pos.top = settings.screeny_current - (pos.h / 100.0) * specials.energy settings.screen.blit(bar, pos) - settings.screen.blit(border, borderpos) \ No newline at end of file + settings.screen.blit(border, borderpos) diff --git a/src/interface.py b/src/interface.py index f9e5d63..6365b65 100644 --- a/src/interface.py +++ b/src/interface.py @@ -19,8 +19,8 @@ def init(): def handle(): - #handles user input - #i think nothing to explain here + # handles user input + # i think nothing to explain here midi_in.do() @@ -63,10 +63,10 @@ def handle(): settings.left = True if key == "d" or key == "right": settings.right = True - if key == "o" and settings.player.pos.x >= 0.9 \ - and settings.player.pos.y >= 0.9: - pygame.mixer.music.load("./assets/music/$not$ard_tatort.ogg") - pygame.mixer.music.play(1, 0.0) + if key == "o": + if settings.player.pos.x >= 0.9 and settings.player.pos.y >= 0.9: + pygame.mixer.music.load("./assets/music/$not$ard_tatort.ogg") + pygame.mixer.music.play(1, 0.0) if key == "f" or key == "space": tmp = objects.bullet(settings.player.rotation, settings.player.pos) settings.bullets.append(tmp) @@ -89,7 +89,7 @@ def handle(): settings.dstars, settings.dtargets) if key == "h": for target in settings.world.targets: - print target.pos + print((target.pos)) if len(key) == 3 and settings.debugmode: if key[0] == "[" and key[2] == "]": num = int(key[1]) diff --git a/src/main.py b/src/main.py index 7a550dc..6eef786 100644 --- a/src/main.py +++ b/src/main.py @@ -15,10 +15,10 @@ from . import specials from . import sounds from pygame.locals import * -#Starts timer/clock for the movement, so it stays constant +# Starts timer/clock for the movement, so it stays constant pygame.time.set_timer(USEREVENT + 1, 25) -#initialize all variables for the modules +# initialize all variables for the modules settings.init() interface.init() draw.init() @@ -33,43 +33,43 @@ if not settings.skip: print(("Loading time:" + str(settings.loading_time / 1000.0))) print(("Your seed is:" + str(settings.seed))) -#start clock for checking time how long has been played +# start clock for checking time how long has been played global clock clock = settings.clock -#start the missions +# start the missions missions.init() def main(): while settings.run: - #get events/user-input + # get events/user-input settings.upd("get_events") sounds.music.update(settings.events) sounds.music.volume = settings.volume - #handle the user input + # handle the user input interface.handle() - #handles the movement every 25 milliseconds + # handles the movement every 25 milliseconds for event in settings.events: if event.type == USEREVENT + 1: movement.handle() - #makes a clock tick (pygame internal stuff) + # makes a clock tick (pygame internal stuff) clock.tick() - #display everything + # display everything draw.ingame() - #check if missions have been fulfilled + # check if missions have been fulfilled missions.handle("ingame") while True: - #basic cycle: Start game, when won show main menu + # basic cycle: Start game, when won show main menu main() settings.run = True settings.reset() - menu.main() \ No newline at end of file + menu.main() diff --git a/src/menu.py b/src/menu.py index c134bf1..3cf802e 100644 --- a/src/menu.py +++ b/src/menu.py @@ -41,7 +41,7 @@ class menu_template(): variables, externals): """main menu""" - #import variables + # import variables self.screenx = settings.screenx_current self.screeny = settings.screeny_current self.screen = settings.screen @@ -52,15 +52,15 @@ class menu_template(): self.menu_name = menu_name self.fade_step2 = fade_step2 - #set mouse visible + # set mouse visible pygame.mouse.set_visible(True) - #create menu + # create menu self.menu = menu.create_menu( "./assets/templates/" + self.menu_name + ".menu", self.variables, pygame.Rect((0, 0), (self.screenx, self.screeny))) - #create fade effect + # create fade effect fade = fade_screen(self.fade_step, self.fade_step2, self.fade_max, self.screenx, self.screeny) self.menu.elems["externals"] = [fade] @@ -143,7 +143,7 @@ class menu_template(): def main(): """main menu""" - #create the planets animation + # create the planets animation class create_planet(): def __init__(self, screenx, screeny): @@ -166,23 +166,23 @@ def main(): self.__init__(screenx, screeny) planet = create_planet(settings.screenx_current, settings.screeny_current) - #Load menu + # Load menu main_menu = menu_template("main", 70, 1, 100, {}, [planet]) - #inserts menu music + # inserts menu music sounds.music.queue("$not$menue.ogg", 0) sounds.music.play("stop") sounds.music.play("play", -1) - #Define loading time on first call + # Define loading time on first call if settings.loading_time == 0: settings.loading_time = pygame.time.get_ticks() run = True - #Menu loop + # Menu loop while run: - #Calling events and checking through events + # Calling events and checking through events events = main_menu.run() for event in events: if event == "event.CONTINUE": @@ -309,8 +309,8 @@ def choose_world(): def inputpopup(x, y, header): """Method for having an inputfield or selecting savegame""" - #as said takes and input and returns a string or returns - #savegame if header is saying so + # as said takes and input and returns a string or returns + # savegame if header is saying so screen = settings.screen fade = settings.fade @@ -350,12 +350,12 @@ def inputpopup(x, y, header): def savegames(): """Menu to select a saved game.""" - #Loads in values + # Loads in values list_of_saves = settings.saves D_saves = len(list_of_saves) currently_selected = 0 - #Defines Menu + # Defines Menu settings_menu = menu_template("load", 0, 255, 255, {"savename": list_of_saves[currently_selected]}, []) @@ -363,39 +363,39 @@ def savegames(): run = True while run: - #Get all events and handle them + # Get all events and handle them events = settings_menu.run() for event in events: - #Exits savegame menu + # Exits savegame menu if event in ["event.EXIT", "event.QUIT", "Return"]: run = False return None - #Sets the current selected savegame to load + # Sets the current selected savegame to load if event == "Load": return list_of_saves[currently_selected] - #Shows next savegame + # Shows next savegame if event == "Next": - #Points to an later save + # Points to an later save currently_selected += 1 - #Wraps to the beginning to create a not ending loop + # Wraps to the beginning to create a not ending loop if currently_selected + 1 > D_saves: currently_selected = currently_selected - D_saves settings_menu = menu_template("load", 0, 255, 255, {"savename": list_of_saves[currently_selected]}, []) - #Lets the button last longer in klicked mode + # Lets the button last longer in klicked mode pygame.time.delay(50) - #Shows previous savegame + # Shows previous savegame if event == "Previous": - #Points to an earlier save + # Points to an earlier save currently_selected -= 1 - #Wraps to the end to create a not ending loop + # Wraps to the end to create a not ending loop if currently_selected < 0: currently_selected = D_saves + currently_selected settings_menu = menu_template("load", 0, 255, 255, {"savename": list_of_saves[currently_selected]}, []) - #Lets the button last longer in klicked mode + # Lets the button last longer in klicked mode pygame.time.delay(50) pygame.display.flip() @@ -405,9 +405,9 @@ def options(): """The settings menu""" button_size = menu.IO.read("./assets/templates/default.vars", "size") - #a conversion method between selector - #and actual text size - #found by trial and error + # a conversion method between selector + # and actual text size + # found by trial and error button_size = int(float(button_size) - 10) / 5 settings_menu = menu_template("settings", 0, 0, 255, @@ -436,18 +436,18 @@ def options(): settings.fullscreen = bool(event) if event == "Button Size": button_size = int(event) - #a conversion method between selector - #and actual text size - #found by trial and error + # a conversion method between selector + # and actual text size + # found by trial and error menu.IO.write("./assets/templates/default.vars", "size", 10 + (5 * button_size)) sounds.music.update(False, False) pygame.display.flip() - #explanation of the 10 + (5 * …) is written in - #the Button Size handler in events loop + # explanation of the 10 + (5 * …) is written in + # the Button Size handler in events loop menu.IO.write("./assets/templates/default.vars", "size", 10 + (5 * button_size)) menu.IO.write("./assets/templates/default.vars", "ratio", 1100) - settings.upd("adjust_screen") \ No newline at end of file + settings.upd("adjust_screen") diff --git a/src/midi_in.py b/src/midi_in.py index 6c65199..9ff4a0b 100644 --- a/src/midi_in.py +++ b/src/midi_in.py @@ -78,7 +78,7 @@ def quit(): try: del device except: - #I know, no device connected… + # I know, no device connected… pass @@ -86,4 +86,4 @@ def do(): global connected if settings.debugmode and connected: - get_input() \ No newline at end of file + get_input() diff --git a/src/missions.py b/src/missions.py index 359aa1b..3d18da9 100644 --- a/src/missions.py +++ b/src/missions.py @@ -68,4 +68,4 @@ def handle(usage): screen.blit(fade, fade_pos) screen.blit(texttime, textrect) screen.blit(texttt, textrectpertarget) - pygame.display.flip() \ No newline at end of file + pygame.display.flip() diff --git a/src/movement.py b/src/movement.py index a013665..c2a2b0c 100644 --- a/src/movement.py +++ b/src/movement.py @@ -19,4 +19,4 @@ def handle(): """Handle movement""" settings.world.move() - settings.player.move() \ No newline at end of file + settings.player.move() diff --git a/src/namings.py b/src/namings.py index e79d373..af9a80e 100644 --- a/src/namings.py +++ b/src/namings.py @@ -26,9 +26,9 @@ def run(): settings.upd("screenvalues") - #load the credits.txt and assign place + # load the credits.txt and assign place with open("./assets/lang/credits.txt") as credits_file: - #find the longest line to optimize font size + # find the longest line to optimize font size biggest = 1000 for line in credits_file: line = line[:-1] @@ -45,13 +45,13 @@ def run(): line, True, color, screen.get_rect().size, 0) line_pos = line.get_rect() - #Distance from line to line is 5 pixel more than height + # Distance from line to line is 5 pixel more than height line_pos.top = ((line_pos.h + 5) * itera) + settings.screeny_current line_pos.left = (settings.screenx_current / 2) - (line_pos.w / 2.0) lines.append(line) lines_pos.append(line_pos) - #diplays content of credits.txt + # diplays content of credits.txt while not lines_pos[len(lines_pos) - 1].top <= -80: settings.upd("get_events") for event in settings.events: @@ -72,4 +72,4 @@ def run(): for credit in range(len(lines)): lines_pos[credit].top -= 2 - pygame.mouse.set_visible(True) \ No newline at end of file + pygame.mouse.set_visible(True) diff --git a/src/objects.py b/src/objects.py index 6542d5e..90165ac 100644 --- a/src/objects.py +++ b/src/objects.py @@ -20,11 +20,11 @@ class stars(): self.image = pygame.image.load("./assets/sprites/star1.tif") imgsize = self.image.get_width() - #random size between 0 and 100 % + # random size between 0 and 100 % self.size = random.randint(0, 100) / 100.0 minimum = 0.15 maximum = 0.70 - #determing the depth of the star + # determing the depth of the star self.depth = (self.size * (maximum - minimum) ) + minimum # value mapped between .15 and .70 self.image = pygame.transform.smoothscale(self.image, @@ -33,15 +33,15 @@ class stars(): self.pos = self.image.get_rect() self.screenx = screenx - self.pos.w self.screeny = screeny - self.pos.h - #gives a percentage where star is located + # gives a percentage where star is located self.relative_x = random.randint(-100, int(100 * (self.depth))) / 100.0 self.relative_y = random.randint(-100, int(100 * (self.depth))) / 100.0 self.update(screenx / 1920.0) def move(self, x, y): """Moves the star according to player position""" - #note: x and y are the player position - #and that screenx and screeny are not actual screen width and height + # note: x and y are the player position + # and that screenx and screeny are not actual screen width and height self.pos.left = ((self.screenx - x) * self.depth) - self.pointx self.pos.top = ((self.screeny - y) * self.depth) - self.pointy @@ -89,16 +89,16 @@ class bullet(): def move(self, player_pos): """Moves the bullet""" - #movement to adjust to player position + # movement to adjust to player position tmpx = self.start[0] + (self.start[0] - player_pos[0]) - (self.pos.w / 2.0) tmpy = self.start[1] + (self.start[1] - player_pos[1]) - (self.pos.h / 2.0) - #movement by acceleration + # movement by acceleration self.distance[0] += self.move_x self.distance[1] += self.move_y - #overall position + # overall position self.pos.center = (self.distance[0] + tmpx, self.distance[1] + tmpy) - #inscreen detection + # inscreen detection if not self.pos.colliderect(settings.screen.get_rect()): self.inscreen = False @@ -175,17 +175,17 @@ class target(): def blit(self): """Blits target and explosion""" if self.gothit: - #blit explosion + # blit explosion has_finished = self.explosion.state in ["stopped", "paused"] if self.explosion.isFinished() or has_finished: - #signal to kill entity + # signal to kill entity self.kill_entity = True elif not self.kill_entity: - #otherwise show explosion + # otherwise show explosion self.explosion.blit(settings.screen, self.pos) return True else: - #show target if inscreen + # show target if inscreen if self.inscreen: settings.screen.blit(self.image, self.pos) return True @@ -235,7 +235,7 @@ class warp_station(): test = test or testpoint(playerpos.bottomright) return test if test_collide(): - #Warps to the selected world and gets a bit pushed off the station + # Warps to the selected world and gets a bit pushed off the station selected_num = menu.choose_world() if selected_num >= 0: settings.world = settings.localmap[selected_num] @@ -260,4 +260,4 @@ class warp_station(): playerpos = settings.player.pos def blit(self): - self.screen.blit(self.img, self.pos) \ No newline at end of file + self.screen.blit(self.img, self.pos) diff --git a/src/player.py b/src/player.py index f463e4d..472779a 100644 --- a/src/player.py +++ b/src/player.py @@ -9,8 +9,6 @@ class player(): def __init__(self): global settings from . import settings # lint:ok - self.img = pygame.surface.Surface # Ship image (redunant - #see self.new_ship() self.speed = 15 # Speed of player (redunant see self.new_ship()) self.rotation = 0 # Current player rotation @@ -35,7 +33,7 @@ class player(): name + "_up", name + "_upri", name + "_ri", name + "_dori", name + "_do", name + "_dole", name + "_le", name + "_uple"] - #generates new images in ./assets/sprites/player + # generates new images in ./assets/sprites/player for nameoffile in names: self.playerup = pygame.image.load("./assets/sprites/ships/" + name + ".tif") @@ -43,7 +41,7 @@ class player(): nameoffile = folder + nameoffile + ".png" pygame.image.save(pygame.transform.rotate(self.playerup, angle), nameoffile) - #loads images into ram + # loads images into ram self.playerupri = pygame.image.load(folder + name + "_upri.png") self.playerri = pygame.image.load(folder + name + "_ri.png") self.playerdori = pygame.image.load(folder + name + "_dori.png") @@ -93,7 +91,7 @@ class player(): if self.rotation < 0: self.rotation += 360 - #handles rotation and gives signal to update player image/surface + # handles rotation and gives signal to update player image/surface if self.rotation != self.rot_dest: self.update = True if self.rot_dest > self.rotation: @@ -107,14 +105,14 @@ class player(): if (self.rot_dest - self.rotation) <= -180: self.rotation += 5.625 - #this part is responsible for the movement of the player - #this calculates speed in y and x direction + # this part is responsible for the movement of the player + # this calculates speed in y and x direction self.move_x = self.speedboost * konstspeed * math.degrees(math.sin( (math.radians(self.rotation)))) self.move_y = self.speedboost * -konstspeed * math.degrees(math.cos( (math.radians(self.rotation)))) - #this actually moves the rect and ensures that you stay in screen + # this actually moves the rect and ensures that you stay in screen if self.should_move: self.rel_x += float(self.move_x * self.speed) / (windowwidth) self.rel_y += float(self.move_y * self.speed) / (windowheight) @@ -131,15 +129,15 @@ class player(): self.pos.top = int(self.rel_y * windowheight) self.pos.left = int(self.rel_x * windowwidth) -#lint:disable - #Somehow a double check is needed… + #lint:disable + # Somehow a double check is needed… if self.pos.bottom >= settings.screeny_current: self.pos.bottom += settings.screeny_current - self.pos.bottom if self.pos.right >= settings.screenx_current: self.pos.right += settings.screenx_current - self.pos.right -#lint:enable + #lint:enable - #updates player image if neccesary + # updates player image if neccesary if self.update: self.update = False self.select_picture() @@ -147,9 +145,9 @@ class player(): def select_angle(self, up, down, left, right): self.should_move = False - #sets the direction depending of input + # sets the direction depending of input if not (up == down and left == right): - #diagonal moves + # diagonal moves if up and left and not down and not right: self.should_move = True self.rot_dest = 315 @@ -162,7 +160,7 @@ class player(): if down and right and not up and not left: self.should_move = True self.rot_dest = 135 - #moving in y != x + # moving in y != x if up and not down: if left == right: self.should_move = True @@ -196,4 +194,4 @@ class player(): self.rot_dest = 0 self.rotation = 0 self.speedboost = 1 - self.pos = self.img.get_rect() \ No newline at end of file + self.pos = self.img.get_rect() diff --git a/src/settings.py b/src/settings.py index 2d0c210..acd0292 100644 --- a/src/settings.py +++ b/src/settings.py @@ -30,7 +30,7 @@ def init(): global screeny_current # current y pixels global fade # a black surface global fade_pos # position of the black surface - global fake_size # the ratio of screenx_current and the size of the background + global fake_size # the ratio of screenx_current and size of the background global bullets # list of all bullets global dstars # amount of stars global debugscreen # determines wether to show debug info @@ -73,12 +73,12 @@ def init(): global seed # the environments seed global button_ratio # The ratio from height to length of buttons - #for this operation os.urandom is used + # for this operation os.urandom is used seed_size = 16 seed = random.randint(10 ** (seed_size - 1), (10 ** seed_size) - 1) random.seed(seed) - #set up screen + # set up screen pygame.event.set_grab(False) pygame.mouse.set_visible(False) @@ -89,13 +89,13 @@ def init(): screenx_current = screenx screeny_current = int(screenx_current * 9.0 / 16.0) - #create empty folders if needed + # create empty folders if needed if not os.path.exists("./assets/sprites/player/"): os.makedirs("./assets/sprites/player/") if not os.path.exists("./screenshots/"): os.makedirs("./screenshots/") - #load images and convert them to the fatest blittable format + # load images and convert them to the fatest blittable format background = pygame.image.load("./assets/sprites/Background2.tif").convert() fade = pygame.Surface((screenx, screeny)) #TODO remove use of button @@ -111,7 +111,7 @@ def init(): fade_pos = fade.get_rect() # lint:ok - #define some konstants or default values + # define some konstants or default values clock = pygame.time.Clock() typeface = "monospace" stdfont = pygame.font.SysFont(typeface, 15) @@ -153,11 +153,11 @@ def init(): pygame.display.set_caption("Project Interstellar " + version) pygame.display.set_icon(pygame.image.load("./assets/sprites/logo.png")) - #more complex default settings like creation of stars and targets and so on + # more complex default settings like creation of stars and targets and so on if debugmode: - #Add custom handler here for when debugmode is activated + # Add custom handler here for when debugmode is activated volume = 0.0 - #fullscreen = False + # fullscreen = False pass def get_anim_source(num, quantity): @@ -249,7 +249,7 @@ def upd(level): for filename in os.listdir("./saves"): if filename.endswith(".ini"): filename = filename[:-4] - if not filename in ("default"): + if filename not in ("default"): saves.append(filename) return if level == "adjust_screen": @@ -272,7 +272,7 @@ def upd(level): def toggle(var, option1, option2): - #toggles between option1 and 2 and retunr var, saves some space + # toggles between option1 and 2 and retunr var, saves some space if var == option1: var = "yep" if var == option2: @@ -283,7 +283,7 @@ def toggle(var, option1, option2): def modrender(typeface, size, text, antialias, color, maxsize, borderoff): - #local typeface! + # local typeface! nofit = True while nofit: tmpfont = pygame.font.SysFont(typeface, size) @@ -297,7 +297,7 @@ def modrender(typeface, size, text, antialias, color, maxsize, borderoff): def getmaxsize(typeface, size, text, antialias, color, maxsize, borderoff): - #local typeface! + # local typeface! nofit = True while nofit: tmpfont = pygame.font.SysFont(typeface, size) @@ -325,7 +325,7 @@ class save(): if len(saves) >= 50: return False - #removes invalid characters + # removes invalid characters if "/" in name: name = name.replace("/", "\\") if "%" in name: @@ -333,13 +333,13 @@ class save(): current_game = name - #handles the configparser object + # handles the configparser object self.config = SafeConfigParser() self.config.read("./saves/" + name + ".ini") if not os.path.isfile("./saves/" + name + ".ini"): self.config.add_section("main") - #sets values + # sets values self.config.set("main", "fullscreen", str(fullscreen)) self.config.set("main", "screenx_current", str(screenx_current)) self.config.set("main", "screeny_current", str(screeny_current)) @@ -349,7 +349,7 @@ class save(): self.config.set("main", "posx", str(player.pos.x)) self.config.set("main", "posy", str(player.pos.y)) self.config.set("main", "volume", str(volume)) - #and writes them + # and writes them with open("./saves/" + name + ".ini", "w") as tmp: self.config.write(tmp) @@ -377,7 +377,7 @@ def load(name): config.read("./saves/" + a + ".ini") if not (saves == []): - #tries to load and returns values in terminal that couldnt be loaded + # tries to load and returns values in terminal that couldnt be loaded import ConfigParser try: from . import sounds @@ -407,4 +407,4 @@ def quit(): midi_in.quit() pygame.quit() shutil.rmtree('./assets/sprites/player') - sys.exit() \ No newline at end of file + sys.exit() diff --git a/src/sounds.py b/src/sounds.py index 565b0bf..a261d37 100644 --- a/src/sounds.py +++ b/src/sounds.py @@ -8,4 +8,4 @@ def init(): music = tygamusic.CreateQueue("./assets/music/", "$not$", settings.musicend) music.update(False, False) - music.volume = settings.volume \ No newline at end of file + music.volume = settings.volume diff --git a/src/specials.py b/src/specials.py index 6f485e4..17da69b 100644 --- a/src/specials.py +++ b/src/specials.py @@ -34,7 +34,7 @@ def update(): tmp = objects.bullet(tmpangle, settings.player.pos) settings.bullets.append(tmp) - #shoots in 8 direction and the one youre looking constantly + # shoots in 8 direction and the one youre looking constantly if settings.psycomode: tmp = objects.bullet(settings.player.rotation, settings.player.pos) settings.bullets.append(tmp) @@ -50,7 +50,6 @@ def update(): tmp = objects.bullet(tmpangle, settings.player.pos) settings.bullets.append(tmp) if event == "Add": - #lint:disable if amount < 20: amount += 1 else: @@ -77,5 +76,5 @@ def update(): if direction != "Clock": tmpan = 360 - tmpan tmp = objects.bullet(a * diffangle + tmpan, settings.player.pos) - #lint:enable - settings.bullets.append(tmp) \ No newline at end of file + settings.bullets.append(tmp) + #lint:enable diff --git a/src/worlds.py b/src/worlds.py index 8274089..dba43a3 100644 --- a/src/worlds.py +++ b/src/worlds.py @@ -12,18 +12,18 @@ class world(): pass def generate(self, background, dstars, dtargets): - #initialize a new "world" + # initialize a new "world" - #load background image + # load background image self.background = background self.background_pos = self.background.get_rect() - #set background position + # set background position self.background_pos.left = int(-(settings.player.rel_x * ( settings.screenx_current * (settings.fake_size - 1)))) self.background_pos.top = int(-(settings.player.rel_y * ( settings.screeny_current * (settings.fake_size - 1)))) - #create targets and stars + # create targets and stars self.stars = [] self.targets = [] for counter in range(dstars): @@ -75,10 +75,10 @@ class world(): def blit(self): """Blit everything in the world.""" - #blit background + # blit background settings.screen.blit(self.background, self.background_pos) - #Blit all objects + # Blit all objects settings.objects_on_screen = 0 for star in self.stars: isdisplayed = star.blitstar() @@ -126,4 +126,4 @@ class world(): for target in self.targets: target.update() - self.warp1.update() \ No newline at end of file + self.warp1.update() From e58a5de65a29be1f5fb0f3b47e365e8afc2bdc6b Mon Sep 17 00:00:00 2001 From: Max Lange Date: Sat, 19 Sep 2015 15:50:25 +0200 Subject: [PATCH 11/28] removed redunant variables --- src/menu.py | 11 +++++++++-- src/missions.py | 6 ++++-- src/namings.py | 6 ++++-- src/settings.py | 29 +++++------------------------ 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/menu.py b/src/menu.py index 3cf802e..9e6ef10 100644 --- a/src/menu.py +++ b/src/menu.py @@ -200,6 +200,7 @@ def main(): settings.quit() pygame.display.flip() sounds.music.play("next", 0) + pygame.mouse.set_visible(False) def pause(): @@ -237,6 +238,8 @@ def pause(): sounds.music.play("unpause") settings.upd("get_saves") run = False + else: + pygame.mouse.set_visible(True) if event == "Settings": options() pause_menu.update() @@ -244,6 +247,7 @@ def pause(): main() run = False pygame.display.flip() + pygame.mouse.set_visible(False) def choose_world(): @@ -313,8 +317,9 @@ def inputpopup(x, y, header): # savegame if header is saying so screen = settings.screen - fade = settings.fade - fade_pos = settings.fade_pos + fade = pygame.Surface((settings.screenx_current, settings.screeny_current)) + fade.fill((0, 0, 0, 255)) + fade_pos = fade.get_rect() infield1 = menu.disp_elem.input_field(x, y, header, settings.typeface, settings.color, settings.field) @@ -399,6 +404,7 @@ def savegames(): pygame.time.delay(50) pygame.display.flip() + pygame.mouse.set_visible(False) def options(): @@ -451,3 +457,4 @@ def options(): 10 + (5 * button_size)) menu.IO.write("./assets/templates/default.vars", "ratio", 1100) settings.upd("adjust_screen") + pygame.mouse.set_visible(False) diff --git a/src/missions.py b/src/missions.py index 3d18da9..7b1841a 100644 --- a/src/missions.py +++ b/src/missions.py @@ -37,8 +37,10 @@ def handle(usage): settings.save(settings.current_game) - fade = settings.fade - fade_pos = settings.fade_pos + fade = pygame.Surface((settings.screenx_current, settings.screeny_current)) + fade.fill((0, 0, 0)) + fade.set_alpha(0) + fade_pos = fade.get_rect() font = pygame.font.SysFont(settings.typeface, 50) diff --git a/src/namings.py b/src/namings.py index af9a80e..7fa4707 100644 --- a/src/namings.py +++ b/src/namings.py @@ -15,8 +15,10 @@ def run(): lines = [] lines_pos = [] itera = -1 - fade = settings.fade - fade_pos = settings.fade_pos + fade = pygame.Surface((settings.screenx_current, settings.screeny_current)) + fade.fill((0, 0, 0)) + fade.set_alpha(0) + fade_pos = fade.get_rect() pygame.mouse.set_visible(False) fade.set_alpha(255) diff --git a/src/settings.py b/src/settings.py index acd0292..5293881 100644 --- a/src/settings.py +++ b/src/settings.py @@ -28,21 +28,13 @@ def init(): global aspect_ratio # aspect ratio global screenx_current # current x pixels global screeny_current # current y pixels - global fade # a black surface - global fade_pos # position of the black surface global fake_size # the ratio of screenx_current and size of the background global bullets # list of all bullets global dstars # amount of stars global debugscreen # determines wether to show debug info global debugmode # Enables debugmode global isnear # easteregg - global button # image for the button - global buttonover # = when hovered over - global buttonclick # = when clicked global field # image for the inputfield - global field1 # other image for inputfield - global knob # knob image - global box # button image global bullet_img # image for the bullet global targeton_img # surf for target whenlight turned on global targetoff_img # surf for target when turned off @@ -60,18 +52,16 @@ def init(): global explosions_disp # list of showing explosions global run # boolean for main loop global dtargets # amount of targets - global include_music - global morevents - global infinitevents - global musicend - global border1 + global morevents # custom event logger + global infinitevents # A event logger which retriggers as long as condition + global musicend # custom event number to show that music ended + global border1 # A box to hold the status information about energy level global world # a placeholder for the world class global objects_on_screen # entitys currently blitted to screen global player # abstract player class global localmap # A dict of the local worlds global loading_time # time until first blit global seed # the environments seed - global button_ratio # The ratio from height to length of buttons # for this operation os.urandom is used seed_size = 16 @@ -97,11 +87,7 @@ def init(): # load images and convert them to the fatest blittable format background = pygame.image.load("./assets/sprites/Background2.tif").convert() - fade = pygame.Surface((screenx, screeny)) - #TODO remove use of button - button = pygame.image.load("./assets/sprites/Button1.tif").convert_alpha() field = pygame.image.load("./assets/sprites/inputbox1.tif").convert_alpha() - field1 = pygame.image.load("./assets/sprites/inputbox2.tif").convert_alpha() bullet_img = pygame.image.load("./assets/sprites/Bullet.tif").convert_alpha() targeton_img = pygame.image.load("./assets/sprites/mine_on.tif" ).convert_alpha() @@ -109,20 +95,17 @@ def init(): ).convert_alpha() border1 = pygame.image.load("./assets/sprites/bar1.tif").convert_alpha() - fade_pos = fade.get_rect() # lint:ok - # define some konstants or default values clock = pygame.time.Clock() typeface = "monospace" stdfont = pygame.font.SysFont(typeface, 15) - version = "0.3.2.8 dev" + version = "0.3.2.9 dev" up = False down = False left = False right = False konstspeed = 0.0025 - button_ratio = 7.0 fullscreen = False debugscreen = False debugmode = True @@ -139,7 +122,6 @@ def init(): current_game = "default" run = True dtargets = 5 - include_music = False morevents = [] bullets = [] infinitevents = {"fire1": False, "roundfire": False} @@ -216,7 +198,6 @@ def reset(): pygame.mouse.set_visible(False) player.reset() - fade_pos = fade.get_rect() # lint:ok konstspeed = 0.0025 color = (255, 255, 10) From d83d196f190741f807c96286bc9ea79caaa53356 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Sat, 19 Sep 2015 17:38:13 +0200 Subject: [PATCH 12/28] removed unused files, updated README, small fixes --- README.html | 182 +++++++++++++++++++++++++++++++++++ README.md | 26 ++--- assets/sprites/Button1.tif | Bin 24378 -> 0 bytes assets/sprites/Button2.tif | Bin 24378 -> 0 bytes assets/sprites/Button3.tif | Bin 24378 -> 0 bytes assets/sprites/inputbox2.tif | Bin 54420 -> 0 bytes assets/sprites/logo.tif | Bin 28554 -> 0 bytes assets/sprites/planet1.tif | Bin 9586 -> 0 bytes assets/sprites/star2.bmp | Bin 3738 -> 0 bytes assets/sprites/star3.bmp | Bin 3738 -> 0 bytes assets/sprites/star4.bmp | Bin 3738 -> 0 bytes assets/sprites/star5.bmp | Bin 3738 -> 0 bytes saves/default.ini | 14 +-- src/interface.py | 6 +- src/menu.py | 22 ++++- src/missions.py | 6 +- todo¬es.txt | 2 - 17 files changed, 229 insertions(+), 29 deletions(-) create mode 100644 README.html delete mode 100644 assets/sprites/Button1.tif delete mode 100644 assets/sprites/Button2.tif delete mode 100644 assets/sprites/Button3.tif delete mode 100644 assets/sprites/inputbox2.tif delete mode 100644 assets/sprites/logo.tif delete mode 100644 assets/sprites/planet1.tif delete mode 100644 assets/sprites/star2.bmp delete mode 100644 assets/sprites/star3.bmp delete mode 100644 assets/sprites/star4.bmp delete mode 100644 assets/sprites/star5.bmp delete mode 100644 todo¬es.txt diff --git a/README.html b/README.html new file mode 100644 index 0000000..83bf2bb --- /dev/null +++ b/README.html @@ -0,0 +1,182 @@ + + + + + +README + + +

Logo

+

Project Interstellar is a 2d space-adventure game

+ +

developed in and with : Python, Pygame, Git/Github and Ninja-IDE. Currently pre-alpha status.

+ +

Version 0.3.x

+

How to Run the Game

+


This is just a developement version so you need +the programming language Python version 2.x .
+
And the physics and graphics engine Pygame.
+
Both have a good guide how to install them otherwise google is your friend.
+

Windows:
+In normal case double clicking Run.py should start it. If this does not work google for "How to start a .py file". +

+
Debian based systems:
+Double click on Run.sh. If this does not work make sure it has its executable bit set. Do this by opening a terminal in this folder or navigating there with a "normal" terminal and then copy-paste this command: chmod u+x ./Run.sh +

+
Other:
+Google for: "how to run python files in" and add you OS +

+

How to play

+


Use WASD for movement (arrowkeys work too)
+
F or space will shoot a bullet
+
When on full power use C to shoot in eight directions
+
Pressing Y makes you faster while X slower
+
Use escape to pause the game
+
Can you get below my 295294ms?
+

+

Features

+

    +
  • f12 for screenshot
    • +
  • f6 to change music
    • +
  • esc to exit
    • +
  • many hidden features
    • +

+

Custom music

+

Simply paste your music into the ./assets/music folder to be included in the game. +"_" will be replaced with spaces " ". For best support use .ogg but .mp3 will work too.

+

File / Code information

+

(Codelines ver:0.3.2.7)

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileCodeNon-codeTotal
Run.py391453
tygamusic.py21880298
chat.py459
draw.py22255277
interface.py9317110
main.py443478
menu.py28768355
midi_in.py571370
missions.py521971
movement.py13929168
namings.py571673
objects.py28754341
settings.py38178459
sounds.py7411
specials.py701585
Total22205012721
+

Top3 code only:

    +
  • settings.py 381
    • +
  • menu.py 287, 68
    • +
  • objects.py 287, 54

+

Top3 Commented or empty lines:

    +
  • tygamusic 80
    • +
  • settings.py 78
    • +
  • menu.py 68

+

Top3 Total:

    +
  • settings.py 459
    • +
  • menu.py 355
    • +
  • objects.py 341

+

Contact Information

+

You can contact me on the homepage +or via email: max12354678910@gmail.com + (subject: Project_interstellar)

+

Licences

+

(Licences of used music and art and libs in LICENSES.txt)

+ + diff --git a/README.md b/README.md index 3b1f18f..5d3ff7b 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,21 @@ -![main_picture](https://lh3.googleusercontent.com/-ZjA1FSivXNw/VSaOqy8nSRI/AAAAAAAAAB4/_nW122LgHr0/s701-no/all.tiff) +![Logo](https://lh3.googleusercontent.com/-ZjA1FSivXNw/VSaOqy8nSRI/AAAAAAAAAB4/_nW122LgHr0/s701-no/all.tiff "Logo")

Project Interstellar is a 2d space-adventure game

-

developed in and with : Python, Pygame, subversion and Ninja-IDE. Currently pre-alpha status.

+

developed in and with : Python, Pygame, Git/Github and Ninja-IDE. Currently pre-alpha status.

Version 0.3.x How to Run the Game -------------------
This is just a developement version so you need -the programming language Python version 2.x:
-https://www.python.org/downloads/ -
And the physics and graphics engine pygame:
-http://www.pygame.org/download.shtml +the programming language [Python version 2.x .](https://www.python.org/downloads/release/python-2710/)
+
And the physics and graphics engine [Pygame.](http://www.pygame.org/download.shtml)

Both have a good guide how to install them otherwise google is your friend.
Windows:
In normal case double clicking Run.py should start it. If this does not work google for "How to start a .py file".

Debian based systems:
-Double click on Run.sh. If this does not work make sure it has its executable bit set. Do this by opening a treminal in this folder or navigating there with a "normal" terminal and then copy-paste this command: chmod u+x ./Run.sh +Double click on Run.sh. If this does not work make sure it has its executable bit set. Do this by opening a terminal in this folder or navigating there with a "normal" terminal and then copy-paste this command: chmod u+x ./Run.sh

Other:
Google for: "how to run python files in" and add you OS @@ -25,18 +23,20 @@ Google for: "how to run python files in" and add you OS How to play ----------- -To play, simply run the "Run.py" file located in the base directory +
Use WASD for movement (arrowkeys work too)
+
F or space will shoot a bullet
+
When on full power use C to shoot in eight directions
+
Pressing Y makes you faster while X slower
+
Use escape to pause the game
+
Can you get below my 295294ms?
+

Features --------
    -
  • wasd or arrowkeys for movement
  • f12 for screenshot
  • f6 to change music
  • esc to exit
    • -
  • f or space to shoot
    • -
  • y to move faster
    • -
  • c when power bar is filled up will shoot in 8 directions
  • many hidden features
@@ -86,7 +86,7 @@ File / Code information Contact Information ------------------- -You can contact me on the homepage: http://www.pygame.org/project-Project+Interstellar-2943-.html +You can contact me on the [homepage](http://www.pygame.org/project-Project+Interstellar-2943-.html) or via email: max12354678910@gmail.com (subject: Project_interstellar) diff --git a/assets/sprites/Button1.tif b/assets/sprites/Button1.tif deleted file mode 100644 index 679b78dc19acc2324e928b86dab6d5ca3666b17e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24378 zcmeI4y-osA5QS$KB!ozzQAxyLN0frZ(gul@bjDcN_*0qKXoJ0_&tzd~s4Q(wd;nho z=fd4&A#7w?=38@f50|s+-f!k?)C32Ej*PA)9AgFy=z-!MXt&#A1`Ozd*&fKA8E~29 z0uOkE9v~m|0ndWs9$1u*Y>m12=TX?KE}Q)GBCGTKTJNnfX28H(4}?6-XJOG=;G*js z5O6~v_B{D;Q*kzGAwWJXwD5W(Kt8-xoc&q|kPizjyxs_q4{sG`zZL@I!$J$MHv;6t zTgBP0g#h`m(8BAD0QvA%arSE=Kt3$A@OmRaKDE z|313-f4{(H_1R?42Wq|gwWh}Q8j}w@Gy2RAvn(IX{H{R{Ebf6Vk)$Mv;u+~kqHd{9 zRhM=Cyb&qI_28>SovN$=vx71>D2Qd0e+=Wgaa+fj$>?nGTv-H84#_3tKY zllysB-HiG}^=`u&4&{3e8Mw>wf(4Wxm*1_pz{NKG}6 z2BtN@JwtVwu8ZoSdO!p6hjgI5Ag_UxKNu6{zeiP@^{tKHFZiD0SnvDpNKG|png-y9 z*bAu`>SBMMuRwcdbBtTxVr)mo*`69ldlI$B#WiqNV?XBb8t7x>M4t!FIS_p;&P`o& z9YC&)$aQ;+>$3{)^}^=}&8NJOimi}8Qg!rtpiZbCkJK482t9)n8PCPa?x)7_&m^yc zoIm=IbB#d1cJfq>6pQx%2Kj^Up8BAEs3(umnb&z;p7KH}Mlawwa7HUByav4{a~ftG+V?#60`H~J zKNB1|aV)-${UMLk^ab}8`D5~}1uc1>#M-NRozlFIRUI#t&++^{dW7rY9w4mY75QWG z4dT5Ke`|UDRpH$8J(5=$CzqS@2XZlg`U5C$)U1L0F{LB!y*WKDdz|y9H{^?&zTloB ze@ymPYU-@cj(NO9J*SZK0jBQHilL9ZaRxPzKa%GMv{$BY=A?8=ZQ~w!RiwVF_Cr4V z3Ky(}{4u3pul0HS;qyJ8SJTq(g8Du0y`bU#@H+PTF7pQN`}~;uadTYWSaNT`d-BKR z{O}sD>yMllQgQi1{#bSmc-_(;^LQh7e)#cb@nx@z=2v)E=f{8Nhy1Yu`}%qR+`;kX zj|=k$_GF$Z+Mid%gAMivwaV`*Vx98?W1&CCj8T4A5kK(UAXfDU^3_y>CTSq`yMnnG z;%cfv(=<@_`{(|?c>e!>QEk@0HryNZuGjxv>m65r$MQ$@nn`EPsTutt)Xy2xKw1OW zLTGhDD}-=ttyS=S<89*`hQHp1&?(}`+bnq7__mAhwA$ga#SY(vaHX{oI>!H4->WX? zdciU7je>6*-!1ZgTmH?~rPKNRFuqstpT=*waqbix&$w$GbFtZnp5=q@+Z-Mk-!%T$ z`o1jk$9W;xzv_+NpB%J_TVee7;q4IEwyf`wU4QG1^X>Aq-#qwrZ|4QZ4zKUO0zUdO O9De?E?{N6>L-+?k~X=bo1K;eBCh`~8j#&qPLS5P-l;0-`ZtzyJ?SdLR!CTqe1|10Lpq ze8Ug;0T2B4Kv_QW8Z!i9BvAaF$gh98_WrRpV!$9a4_F?ivrtwuF51TifoKSr=gYEC zRwEzL*n$fU1jq+gfPhbceE4iwfdKiy0}${DkPn{?D-a+bcmM)E0rKIqVFd!@0}nvJ zCqO=YHmpE^eBc2H_yov@&xREUkPkcn0iOW*@Y%2e0rG(dAm9@qA3hsaAV5Cw00evj zZASMr#-7DzTtj-33*a+x9>GwV8`L!2o=pR0?h?@oZi2M5||Fge; z@-dqa{)wAUo)2aSK%kt!l1NgKM1LxWI+CEHLApY>&rR=s@fq{hVNx@52YO_6-mb>BmM|Io|&_3ikPtbdvB ZTg@Xoww&&s*nDs|7~J0MbO+a0@&!E1&^Z7A diff --git a/assets/sprites/inputbox2.tif b/assets/sprites/inputbox2.tif deleted file mode 100644 index 5599e6a6b8c8c924d42582bc250943bd274c6558..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54420 zcmeI5PiqrF7>8$*TAGE5nyB;-vMhdJ+$QkbV#m zy@`5`9z1yRD1y-O{Uy6$DYRCTE*W@I-tN1b$>h!C*{74RW!Bf%+^>&LH%~AIFaQIg zFc8PFZ!{XdUau330Sv&vR52ho$x*pawcqRYe43^{NfLrFfB_ho3I^mPxk--7eWiJo zj(59V-|2J+#sCIjU@91pljJ5js^}}ttBS7DKJzW+n#{LhpiBmG=j?USLB49Y+rHIm z`Q~cVH&+P800v;7BnHema*rI8J4?RY&sVxn?Q6A~k6gu~N-zd600Sj4P#L&K4w8%H ztb=@|`IzQaa#fs0yDRr%KZ;Gu3B~{hU|^CA6dWVx$USn9T=X|z$z_`RYF;Hz-T1Kh z`}+HZZ`a-~^ew&;i~$V5z=Rp-%Q13|oFn(hL5G=N?e&%V$-kFp%Qb~C00T$GfLt@K zugs(UqpFX7VIKxyAZI|X8OvAp8CCPXyg#z#fPqjLz*n#u3aiu!tN02A@Bj>i!T`R4 z)lgWaPFTfPFn|YOAQT4h6|9EBDs{ptzJdWf00W^gfUjUR6jrGdR`C@K-~kv2g#mm8 ztD&$;ov@0pU;q!mKqw60D_9MMRqBLQd<6q|00u%~0AImsD6CQ^tl}#ezymN43Iq5G zRzqQxI$;%G!2lkBflwI0SFjoitJDdr_zDK_01Sk}z}UXBwN|YU)*o~*9}4r-87`}G z%~rnBnBq2zO&Y}S3h!}=4%9F00S^EVFvngj9l}t^Q$yXeRH*G zYphm$oJPBP{3vYwRIR^CFa|IH0~2GQ;21ea?vaD!qE4sdlO*x=dVREZv2q>D?`ySM zzE-OZoTas)3B~{hV4xfZDg*b(K}9F+=PNm@-EMoem*bi%1Y-aLFi;W$<{Y_44w8%V zIn+VE%G+o@CdUzs0Sv%E84Tpk$z7GZXs@r-uG{U7oK|d4KJ+}}z&OA_xeUlja#PV) zjYh-wdcDE%G91ct@V6QUVBjze$W?Na9FbRb6DIp0i(3mY=u%isdu5-TmZTH9M|$vsqrTJT4rck1FoC9eerNxs%b1 zo3p%Q`Kdyi(^;;5&t&fIG< zul$+ybJcS7ebe$gS^Hr-`}Z2VZGKs+Px# diff --git a/assets/sprites/logo.tif b/assets/sprites/logo.tif deleted file mode 100644 index 43e06912fbae95399ba3d441c7bfa682f9578722..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28554 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 diff --git a/assets/sprites/planet1.tif b/assets/sprites/planet1.tif deleted file mode 100644 index 4cf63098691c767c706d21c1ec3a9a72d954f1ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9586 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 Wr)b7X8lS9OziC5NVqDe6a^e3`Pp?n_ diff --git a/assets/sprites/star2.bmp b/assets/sprites/star2.bmp deleted file mode 100644 index 442f839baa21a184df94b8f5749a65cd975009cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3738 zcma)<$#Yz16~zS+v1}Zx%2Zs1t)bO}y46xkauQ|& zqL>P@GgPWlVL_GG>{#$8uptZn1E8#-=kfLMUUwgUUn|Li6)Jt|?)P4Q=bm%Vz2DW1 zd!Kj)`ad7?_XF1CXX{G?M+Uyadms0MuKmTw&wn&9@Wt=IjhXMf|M`vo_w~#F^Wb1u zc~@8&*P?b@^V)SSXm2Q@>`+t%cU%>BOm$COjwi}mQrjC=)0UMHSdD*-X#^y z^2AhOm3b~d6xJ^L?6Uvv3o-2;h-mw{u(rP%*4}eqfSGeGslaR2U=M*kw5UCIR5|u2 zd6rcNqv=gb?A`X66<3Gl_@b)$7F6I`k@saUaq?`%yZ`+?_Yyp!;6}Cc{F1g0EcG!n z2j=@c_rUFA4=pL{UevC8UVFrx1-IZ`Ruznf4_tplwjbVR1rq88qN)cLRp5HjA6M0H zo{bU%`=igEJA!s`?G1v-$~?aygPA3UqU({i``Uuda|L3|dC&&^_J}wl+k0_|T(seWx$^%?R$`+e!bFQkWPJx2@=(`r9}`|LXRH&lIt{JgrU&IM}w zYbiC!bq%e{c%^_(v!+hK-R}>07SC6FE2;*TRU9Vgqi{bQSB89A-^61x+`GS_HdyV% z2ht|^?~&uppGb)fHRgUQ-AC)0$Ld{6seNfh%~LT|4^yjnBpU=1PFeb$@lt`jmdI<- zEOJnwMoYtRJGi0N(G``?$CP;k?PedVHHTl*;BEa@a0<0^ZeP0Kz?{T;;X!)AZ#n?6*fAC;-u zoayc4w&2HW)J`R2dH~;pp$%Sc!nYM#lRZxC)0^sDdQZCZLp<~| z^7&h|{Rp0a?IV8iXZufF{|)zvYYvaSy-AI&$+MIP()BvVgSdU1vN zsZzI9`g;v8*G=CYkJF11_+wQ)>O>FObMsg5`UCtv0rH=$f3W_>XQPAhSX$kOoSSzO zvhY^p+$uec9&pg)mpmI^!FLb7yLhWk4K>ibMeld$#k~;yaC}Xg+CXP8-$L&PXqQ0m zEnc7geqY;dczp{0r)ayi#eH;rK)<-nIr2LE&QMGEsyvFm__^rk41u5N|3!1AqqDK*%>4Dm%zRN_P1EGV9Z6-P8;kv{EX(*@DpM%v7{fXJGUuomRh?>|G$El zPcl7xwGCh&=Z-)2x;XX$U z_*R=gC!gSNuBn$W`3L*{s#-JD`_;7SFHzD{4f6;iQ4I9 z<*0viE|!K(t(e?0Pmo)4{^U3xTJ%X9t$TQ_OH4NXxff!lm;iH%d{Ym)5|(pyQT7dD zx`pO*#R~%}+9yOs%W;BE5k= zRiGbaITQBS*UWwe&Y-*-zC++~CbgL}x_#_N)Kr8#6ALvbbm~pSq{EM>30|kre42F} z+!Kqu(({i~dtm9k#Bjg$Wg^2%(ZLkp~kEWA@0M+f>t2Rw%yHK|8CVCFJ2YvL_> zg*gv)%#6vbkz;mkF<;d<|Lf@8=3bj;ddx+l#@pn@3Cyz(Sj<@cMH~*bp%HL7mFWfa1nR>^-}-0zni($#&mA;=#ynYNp0wcHGJ12bhZe$jtv>!kVnz>^ z%sdGP1?T85=n-7#iFi6e`a61B-0PuJi~iq&V*|ffoUd(sTQ%B}*9^E>7xOCfrN#W* z?DLMO3umEu3*H@cZyJ2|=#nGRU%T`)F$Z-_9{lq?GgBKM=Fz3Xy$<|3Jli1V27a;N zV7ZBdeJjk5c{pak%?$E?hrtB9!)!0~ZgJlxwzdZ^@m+_ry2tq}Ru9dL7G`hxz{LwP z=b4$?z-m#CU3fO=34L66*2$+u-87gZOJL=goiog`O|Uy$6QA3}(?)-12u!eB%wQdl z(Vp67FN4tmw@aS^zbi1zHB*-bG_rWk{4ZtlWx>&cgT;PzI9V>v4EPn%I0vRP$alfF z2jPkajthP9TEp;W_4vM74)d?`dT+0(5%iU5w7c diff --git a/assets/sprites/star3.bmp b/assets/sprites/star3.bmp deleted file mode 100644 index ea22dba620795d06a0f0278f6973c24c5ae87a57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3738 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 rcj>C}EdI?|V@$qC{RgHVXLaRCVlaYKm-~zUO1 zYO>0%tf(q0#dYf7a!;@<(|x=TgL{p#$KHKqoz%c(jj^S;rM5Cpu(NJoxl*DW*oIq| z;lz*E3=>&i3|1t&+K?SIWmi0oYqG($@zI6{D`?9~_rQKl{7P{RH^2w*oe;kxa057X zlyUL3+=Y*}a=}nJuP*~^vsfGZV6lenC15OTlH?QTJEh8Mt^arxQw#xOfZLS^VxV^`^zmIX6>h=j-G3Db-doziFjEjdwrcCkB=uqJr^zOX>#mH)X-d9*FKJC z;dsjT$O&>ktPtxGd@sQ_2A%<~>2I^AEigAV>1}8V?Ahvu4#M}*`bekCO`WNAbiTK# z3t+w0S<{b)t9rGys`<`H=gF%x`1w3BKT&Pz89&lo6tIR1=VjtugvTOrERyGCa%lj^ z<%_rCO26ggQqpx?GUA?<~NAGQI>)p*edS`h} zZ^bRW0q^tmj(!+KdcGFv88G+b<4mQbNwCIzr*SU9H9i{nXA)nV{F(%Rs=BScwHtb> zev{{~>q31;3;2Gee_M;ak;3;sRC4=6b?$tiWc#+l)`06nU0EJzA+G7wMx?W$qZ4jf zha5)*KTw|9v5QOiyM&+c4WDK>k_nbw+tFn8Iyt$ieZ=`$uAOP!(Z%*%U2cK7a#xMf zuC~^9vxPWir$!0RkHd2-nfJ>u-s^XMt1 z9{sgXUs{pvufg$1Gxh5_(7L5#-FrIUyrl*Bzq;~?!c8zXKhuNVU+Ll3ztf}N|3MFL z+|z?QAG4Q%!fK$a$+8x}nGZaju2*%qS*P9_)I7Z{rk*1D30xROVp|&0C(?QyDvuS2 z_d)u}3HI`GxS>nQOi#ePq(^`G=VQ$A|9|Vz-CMf9v7$~d(PC03_o|w&g*sjJ!Syst9pwXf z2H&D@nC!tQQnw{?xx7Jd-BjKkX_lHg%zjQaZfm}ITbJPaTH~gY-E-1my<0m zQm2i@b0{!4h(%0hV`wANka%iLu{XStX zh8!<80$m}e()zs+yLzD?>zP5UeapV4>+}uG2G7KI1MFO}L*Jr~;M0Q7$$+_n%|-Ow zu&)g`rjZ?>v>b#160p$ASe>yFeM z?d{Q{yUay=wZJrM>y}YM=%)O_Wr>F4eEZXKgbNrQ7Td#+q z7NSU(BJ#H6=_g>m*&6C1GwK4ldye{fvEOA*5L>sR0=+rkAg4NkOnf(qw*h|EL1(!5 z?7}r>xou`wO9f`y9PxV=J#i9^^g?H#GhV23%$Jv#H!q`KUM{*i&u{0Lk!QL0#d<@h z!8z8d=}0?aCPnB2FkR|4f@9)rkaM{Nt><)@zu-E{7~0HfjCINse#|mI51@yR)RXai zIfhO;?s+;{YqA$tC&4{|ZaIcdJBr49mg`T^rw)O=AM6?WR6Y!z%meuKu_`$QezvlV zq2(%Q&f6w!1|bWR=Y>R5NBI%tfI21~WsWQ@*1!=-%9 zpp9nGX$96V;Clhw0_)9yJDqAA;ypFi89e7PZ^5=2Xwn+`3LbLYn*}>tSpql4B976U zso`&`(amC7XDvAL>D#Vsr;MIV`)ow5p`XCbgPUiqJb9hxnN)Au@MEK^EM}nTG56Bm zR7b~C+c`hg@Gf{|bURv__+(OjjgL9bb4%11&l=>BndxQ}(-{ixSUbDyXOVNX zlg&GUU8FB~XlQ)4xW^<94D!jq?;P_dhtJt6SYT(E{S)jpGd8fn%r2q#9Q=k$15AUw zF_~*7drUQRgWTJUccQ==E9nmzsIo^;O!aml$$=tp7-b|$VW!|cs4izkR- z`o5B4X5cLYRyN=ri9E`&eh$1eAI3&5ne1sC18_}n%@mitrg-CbC}L*dbMDD|Le@z& zEAa$7lVVpRO)xVjN~!U_0_FrU&A@LaeV+j{%Xyjyxl|9O#&v^u7)AC%d<}37aE(RI hQ!KD^_?%;{l(Q^*OLcn20n=U71R8dNc{mY;`VT8k{Ivi8 diff --git a/assets/sprites/star5.bmp b/assets/sprites/star5.bmp deleted file mode 100644 index 1220fe78b10e219da46c528fea8c18fcc9ce5771..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3738 zcma)p@?mPkkGyh3D8I~+CXof(*=?eDB%5Gl!2~ zE?yJKKOr+U;m#Q3v^0_ ziem2SF{<_QF=x3*p4notqF)p%k}H;zD^YO2MD856SR#L=MD?6IOMJ$C-h(1J^XnCz zEtE4;AZL1=g6XwN&#hH(XRVyEb&3wHlQUAN2)z1LrUx&AxhjHPEO)tB{sR~bC5p^q z(|NAUb%Xf1{O2W^~70R1H z{|GFY-h>&~;JT~KdYF#!#P?yw(c>4fRS^wAXX%!I1tFK$pYR|B_J-uy{qTz3d*f=>ig#U(! zo%tNy-V{Dx^=|+-7HTD)_%;DE88YiQ-;VZg!F^f{`X2duNKJZCjrsxH7dSqrx<;|lN_oS?Y7C!GqU#QJk6M}jDu2ztakM62TD}A@6RLx=gLBjM9Ck!m z{ZzryYv?+u7M);iKbODoikcq2q_*W}mAboEjdME`8`-4TSha#F^5Y))nZw`Yc|e}W zt;W!6T0NMq~|F(e-a$ynf85tqb+aP9IZd`gt|ne@YFDTa;a_QFgvknb~rs(43gU&tufq zFgXU(#Vm&{uJKT79U69_=YX1tV*+2k!6$FRcvn|=e^no9M1SIVf%A8`-a41mnUxc) z?J%}at&3ZgovBrPg8Ck&w+s>EVRC2`Uz1muI0sy|Em1hcztm~dwNyxvvYg|@v<)IZ|LmKBg5B0&flKDq?W1E z%8Z>-a_Fey1K(Dx?{WFP^p_s=_Mo?$K7NZHc#9rRAJKOiV%IABubh9tb^H9c=smY|M6GxCt6^-Ll7qEM^ivzX)Nv1S z?4~Ed^}33ei0uRV#ftS|<2Jx;g4-O%_7Ez6M7(}Uekaj?9-m)9`&IoNou6<#d-sak za_1EcCDpcYg1SAdrkQ>Ccbi&rwQ8KIQf8t;sZsh7y(8!+mwLa_n}VCd&uRQ@HJhbo z6QUl;lV%-&Ni-YbcKCcklzq z7dW2o50vhG9bf*0=aEyB2j%oqzvFdEOw!kH)3fN)wnqf)5thqw_NO4+&?p<_CqJE~OwA*F^{;}Cs&a=W5^ zn-uM-rjCg11p6{v*J{^#^k~uYqkZ0bbAaYJHSEH6=^X)m(xavt;I~j$8FKurp5dN@ z)YY@-Kd9DQ-%<160R^4((w^N)jqH#=@EAVdAh*9#k?wLi{q#w+hCKtW!yMqVAKBiJ z@0H9lux-!vh_&rSY4}-ktr_2E^>|og4*OCzT+2>n+IK45xm}HYTglVSa&B%?FjxbV zJRagX1I$7_%wgoQJHVbW%6_!U_25QB%kN1J{`O#7ysd9G+Wt#FX=M!=^3GvjOkhoR z{1j{7sFne0wWCHsceR{O_U!@u)`x}xYG;sHqNf-(^Gpx>FZ;gDt&!Ck$NHtsIkrdG z-efhMfp2@U@tg6##~N%72(Sh_c5hIsy;`X*=7XEeK^(T*!-;Hz>c8VW;*kEf_U3rVQlN$`8|UfiZwK`h8SjRiH%e$-A;eKQK3fq zgL@rcbuzDX!0Tqt=%YVTuWldnh3V{r+x=)>&ug~X&SD)8xwc2yoR#Ni!(3;kWDQN2 z#UW)!_SfWRtPM+b;n(Y>ir&DtUCi{?@f}RlY3B4Y%MCEo_7(7){Oq2eE3K{`)wIpf z7H|4^$j;A~mUn5)VqrD!&JdGp@cvCbpfPz9jqO+md5c9l$fJ;p)*fa_%tR~#%?Gw`+gh9l@cw07?)j7$-C!=gj$c2| zGhLYV*U{ODe~lfQG4tkgjKL2uo2ku=pA7xZb2!%j*BY$fSg#BF&Odp7jrzd+_97)Z ZSode-OgmaTVBX+2n6b&@Xb(Q_`41Iw#Jd0h diff --git a/saves/default.ini b/saves/default.ini index f6d6648..c062e11 100644 --- a/saves/default.ini +++ b/saves/default.ini @@ -1,12 +1,12 @@ [main] -fullscreen = True -screenx_current = 1920 -screeny_current = 1080 +fullscreen = False +screenx_current = 960 +screeny_current = 540 debug = True skip = True -posx = 0 -posy = 0 -volume = 0.673913043478 +posx = 283 +posy = 497 +volume = 0.5 debugscreen = False -debugmode = True +debugmode = False diff --git a/src/interface.py b/src/interface.py index 6365b65..88b2d41 100644 --- a/src/interface.py +++ b/src/interface.py @@ -12,7 +12,8 @@ from pygame.locals import * def init(): - midi_in.init() + if settings.debugmode: + midi_in.init() """Handles user input""" @@ -22,7 +23,8 @@ def handle(): # handles user input # i think nothing to explain here - midi_in.do() + if settings.debugmode: + midi_in.do() for event in settings.events: if event.type == QUIT: diff --git a/src/menu.py b/src/menu.py index 9e6ef10..b7962f9 100644 --- a/src/menu.py +++ b/src/menu.py @@ -115,9 +115,10 @@ class menu_template(): if key == "escape": pygame.mouse.set_visible(False) events.append("event.QUIT") - if key == "return": + if key in ["return", "enter"]: pygame.mouse.set_visible(False) events.append("event.CONTINUE") + events.append(key) if event.type == USEREVENT and event.code == "MENU": klicked = self.menu.get_klicked() for elem in klicked: @@ -298,7 +299,24 @@ def choose_world(): settings.quit() if event[0:5] == "world": selected = event[5] - pygame.time.wait(128) + if event[1] in ["1", "2", "3", "4", "6", "7", "8", "9"]: + #maps keys to worlds + selected = int(event[1]) + if selected == 1: + selected = 6 + elif selected == 2: + selected = 7 + elif selected == 3: + selected = 8 + elif selected == 6: + selected = 5 + elif selected == 7: + selected = 1 + elif selected == 8: + selected = 2 + elif selected == 9: + selected = 3 + selected = str(selected) for elem in world_menu.menu.elems["buttons"]: if elem.name == "world" + str(selected): elem.state = 2 diff --git a/src/missions.py b/src/missions.py index 7b1841a..dfbe0d9 100644 --- a/src/missions.py +++ b/src/missions.py @@ -46,9 +46,9 @@ def handle(usage): points = settings.player.timeplay color = settings.color - texttime = font.render("Your time: " + str(points) + "ms", 1, color) - tmp = str(points / 15.0)[:6] - texttt = font.render("You needed " + tmp + "ms per target", 1, color) + texttime = font.render("Your time: " + str(points) + "ms", True, color) + tmp = str(points / (settings.dtargets * 8.0))[:6] + texttt = font.render("You needed " + tmp + "ms per target", True, color) textrect = texttime.get_rect() textrectpertarget = texttt.get_rect() textrect.center = settings.screen.get_rect().center diff --git a/todo¬es.txt b/todo¬es.txt deleted file mode 100644 index 18dfa03..0000000 --- a/todo¬es.txt +++ /dev/null @@ -1,2 +0,0 @@ --use … more often -(look at trello for really important info) From 81ac6a28f2ee3441875b85aabd7cf3788b927f3b Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 21 Sep 2015 17:30:21 +0200 Subject: [PATCH 13/28] Added load game option to main menu --- assets/templates/main.menu | 7 ++++--- src/menu.py | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/assets/templates/main.menu b/assets/templates/main.menu index d23ff2f..8489578 100644 --- a/assets/templates/main.menu +++ b/assets/templates/main.menu @@ -4,6 +4,7 @@ *|Project Interstellar|40 |$typeface|$color |$half + 0|%10 + 0| *|Main Menu |30 |$typeface|$color |$half + 0|$qrt + 0| @|Start |$size|$ratio|$typeface|$color|$box1|$half + 0|%40 + 0| -~@|Settings |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| -~~@|Credits |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| -~~~@|Exit |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| +~@|Load Game |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| +~~@|Settings |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| +~~~@|Credits |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| +~~~~@|Exit |$size|$ratio|$typeface|$color|$box1|BottomLeft|%0 + 0|%0 + 10| diff --git a/src/menu.py b/src/menu.py index b7962f9..430578f 100644 --- a/src/menu.py +++ b/src/menu.py @@ -192,6 +192,15 @@ def main(): settings.reset() sounds.music.play("next") run = False + if event == "Load Game": + savegame = savegames() + if savegame is not None: + settings.load(savegame) + sounds.music.play("next", 0) + settings.upd("get_saves") + run = False + else: + pygame.mouse.set_visible(True) if event == "Settings": options() main_menu.update() From 7b50c0159bafb712681dfa0cef1c4bd11e5fe364 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 21 Sep 2015 19:53:00 +0200 Subject: [PATCH 14/28] fixed game not adjusting to new screensize after loading game --- src/interface.py | 4 ++++ src/menu.py | 4 +++- src/objects.py | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/interface.py b/src/interface.py index 88b2d41..1536c66 100644 --- a/src/interface.py +++ b/src/interface.py @@ -75,6 +75,10 @@ def handle(): if key == "c": specials.fire = True if settings.debugmode: + if key == "r": + settings.world.adjust_to_screen() + if key == "q": + settings.init() if key == "p": settings.psycomode = settings.toggle(settings.psycomode, True, False) if key == "q": diff --git a/src/menu.py b/src/menu.py index 430578f..15d762a 100644 --- a/src/menu.py +++ b/src/menu.py @@ -198,6 +198,7 @@ def main(): settings.load(savegame) sounds.music.play("next", 0) settings.upd("get_saves") + settings.upd("adjust_screen") run = False else: pygame.mouse.set_visible(True) @@ -247,6 +248,7 @@ def pause(): settings.load(savegame) sounds.music.play("unpause") settings.upd("get_saves") + settings.upd("adjust_screen") run = False else: pygame.mouse.set_visible(True) @@ -261,7 +263,7 @@ def pause(): def choose_world(): - """pausing menu""" + """Selecting warp to move to.""" sounds.music.play("pause") pygame.mouse.set_visible(True) diff --git a/src/objects.py b/src/objects.py index 90165ac..d89aa0d 100644 --- a/src/objects.py +++ b/src/objects.py @@ -201,6 +201,7 @@ class warp_station(): self.update() def update(self): + """Adjusts to screen size""" self.img = pygame.image.load("./assets/sprites/station1.tif") self.img = pygame.transform.smoothscale(self.img, (int(settings.screenx_current * 0.1), From 4c186404f88d984f31df285e69436a24632a3b53 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Tue, 22 Sep 2015 17:08:19 +0200 Subject: [PATCH 15/28] changed name from NCO to Pixdigit --- assets/lang/credits.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/lang/credits.txt b/assets/lang/credits.txt index 12ca504..b8b4a39 100644 --- a/assets/lang/credits.txt +++ b/assets/lang/credits.txt @@ -40,4 +40,4 @@ check the README for further information -I am NCO +I am Pixdigit From 2b6fcc78324c80ee8a99b1082d163db2e14ef5ec Mon Sep 17 00:00:00 2001 From: Max Lange Date: Tue, 22 Sep 2015 17:08:58 +0200 Subject: [PATCH 16/28] optimized activation of fullscreen --- src/__init__.py | 10 ++++++---- src/draw.py | 23 ++--------------------- src/settings.py | 11 +++++++++-- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/__init__.py b/src/__init__.py index 2f36b23..e23e066 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -2,15 +2,19 @@ from chat import getinput from draw import init from draw import ingame from draw import debug +from draw import drawtargetsum from draw import drawsongname -from draw import adjustscreen +from draw import drawworldname from draw import status from interface import init from interface import handle from interface import getall from main import main +from menu import fade_screen +from menu import menu_template from menu import main from menu import pause +from menu import choose_world from menu import inputpopup from menu import savegames from menu import options @@ -25,11 +29,9 @@ from movement import init from movement import handle from namings import run from objects import stars -from objects import button -from objects import inputfield -from objects import sliders from objects import bullet from objects import target +from objects import warp_station from player import player from settings import init from settings import reset diff --git a/src/draw.py b/src/draw.py index d5dc6ac..5096474 100644 --- a/src/draw.py +++ b/src/draw.py @@ -40,8 +40,6 @@ def ingame(): screen = settings.screen - adjustscreen() - settings.world.blit() status() @@ -53,7 +51,8 @@ def ingame(): drawworldname() if no16to9: - screen.blit(correcture, correcture_pos) + pass + #screen.blit(correcture, correcture_pos) pygame.display.flip() @@ -184,24 +183,6 @@ def drawworldname(): settings.screen.blit(name, pos) -def adjustscreen(): - """Changes to fullscreen and back""" - # changes resolution and so on when fullscreen is toggled - global fullscreenold - - screenx = settings.screenx - screeny = settings.screeny - fullscreen = settings.fullscreen - fullscreenold = settings.fullscreenold - - if fullscreenold != fullscreen: - if fullscreen: - pygame.display.set_mode((screenx, screeny), pygame.FULLSCREEN) - if not fullscreen: - pygame.display.set_mode((screenx / 2, screeny / 2)) - settings.fullscreenold = fullscreen - - def status(): xsize = int(settings.screenx_current * 0.05) ysize = int(settings.screeny_current * 0.3) + 10 diff --git a/src/settings.py b/src/settings.py index 5293881..5814ab5 100644 --- a/src/settings.py +++ b/src/settings.py @@ -234,13 +234,20 @@ def upd(level): saves.append(filename) return if level == "adjust_screen": - from . import draw global background global background_pos global konstspeed global no16to9 + global fullscreenold + global fullscreen + + if fullscreenold != fullscreen: + if fullscreen: + pygame.display.set_mode((screenx, screeny), pygame.FULLSCREEN) + if not fullscreen: + pygame.display.set_mode((screenx / 2, screeny / 2)) + fullscreenold = fullscreen - draw.adjustscreen() upd("screenvalues") konstspeed = 0.0025 From 7392f383d544e52af272b8f3df24170553dad650 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Tue, 22 Sep 2015 17:24:02 +0200 Subject: [PATCH 17/28] fixed documentation in tygamusic --- libs/tygamusic/tygamusic.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/libs/tygamusic/tygamusic.py b/libs/tygamusic/tygamusic.py index c726d66..c60cdd8 100644 --- a/libs/tygamusic/tygamusic.py +++ b/libs/tygamusic/tygamusic.py @@ -19,7 +19,7 @@ class CreateQueue(): """Initizalize a new Playlist-like object. usage: -object = CreateQueue(self, path, exceptbegin, endevent=USEREVENT+100) +object = CreateQueue(path, exceptbegin, endevent=USEREVENT+100) path (string) is the path tygamusic should search for availible music. @@ -44,27 +44,23 @@ self.files (list) A list of all files for possible playback. self.playlist (list) A list containing the filenames of the songs. - If self.update() is called without its shouldplaynextsong option - explicitly set to False the next song of this list will be played - if music has ended. self.volume (float) A value from 0 to 1 for playback volume. Volume gets updated if self.update is called. -These are +These are internal values that should not be modified unless + you are 100% sure what you do. self._endeventnum (int) An int used for defining the event when music playback has stopped. Changing this after creating the object has no effect. self._path (str) - This contains the path to from where music should be loaded - Changing this in an created object may cause errors - except you know what you're doing exactly. + This contains the path to from where music should be loaded. self._pauselevel (int) - An int representing how many songs have ben paused + An int representing how many songs have been paused while an other song was already paused. self._playing (bool) - Determines wether a song currently loaded (aka "playing") + Determines wether a song is currently loaded (aka "playing") self._timeplayed (dict) A dictionary with entrys looking like this: self._timeplayed[filename] = current_playing_pos @@ -137,7 +133,7 @@ shouldplaynextsong (bool) events = pygame.event.get() else: return - # Playes next song if the last one has ended. + # Playes next song if the previous one has ended. if self.__endevent in events and shouldplaynextsong: self.playlist.pop(0) self._playing = False @@ -149,8 +145,8 @@ shouldplaynextsong (bool) Usage: self.play(operation, *options) Operations: -"play" (needs amount of replays additionally) -"next" (needs amount of replays additionally) +"play" (amount of replays can be defined optionally) +"next" (amount of replays can be defined optionally) "loop" "pause" "unpause" From f4bac610cd5fa719a7fa61c7a9a7e920230b3b3c Mon Sep 17 00:00:00 2001 From: Max Lange Date: Tue, 22 Sep 2015 18:43:47 +0200 Subject: [PATCH 18/28] removed redunant addition of background image in menus --- assets/templates/pause.menu | 1 + libs/__init__.py | 1 + src/menu.py | 5 +---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/templates/pause.menu b/assets/templates/pause.menu index a54a28b..23fd150 100644 --- a/assets/templates/pause.menu +++ b/assets/templates/pause.menu @@ -1,4 +1,5 @@ &./assets/templates/default.vars +<#background = (./assets/sprites/Background1.tif) *|Pause |35 |$typeface|$color |$half + 0|%12 + 0| @|Continue |$size|$ratio|$typeface|$color|$box1|$half + 0|%40 + 0| diff --git a/libs/__init__.py b/libs/__init__.py index e69de29..40a96af 100644 --- a/libs/__init__.py +++ b/libs/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/src/menu.py b/src/menu.py index 15d762a..79d2439 100644 --- a/src/menu.py +++ b/src/menu.py @@ -39,7 +39,7 @@ class menu_template(): def __init__(self, menu_name, fade_step, fade_step2, fade_max, variables, externals): - """main menu""" + """Initialize menu""" # import variables self.screenx = settings.screenx_current @@ -220,10 +220,7 @@ def pause(): sounds.music.play("pause") pygame.mouse.set_visible(True) - background = settings.screen.copy() pause_menu = menu_template("pause", 5, 5, 150, {}, []) - pause_menu.menu.elems["surfs"]["background"] = [background, - pygame.Rect(0, 0, 0, 0)] run = True From f9f9f739b4df02d26d56863c789586df6d4a2e01 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 28 Sep 2015 15:13:19 +0200 Subject: [PATCH 19/28] removed unused functions out of src/settings.py --- src/namings.py | 24 ++++++++++++++++++++++-- src/settings.py | 28 ---------------------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/namings.py b/src/namings.py index 7fa4707..1cffaa1 100644 --- a/src/namings.py +++ b/src/namings.py @@ -3,6 +3,26 @@ import pygame from pygame.locals import * +def modrender(typeface, size, text, antialias, color, maxsize, borderoff): + size = getmaxsize(typeface, size, text, maxsize, borderoff) + tmpfont = pygame.font.SysFont(typeface, size) + return tmpfont.render(text, antialias, color) + + +def getmaxsize(typeface, size, text, maxsize, borderoff): + # local typeface! + nofit = True + while nofit: + tmpfont = pygame.font.SysFont(typeface, size) + bool1 = tmpfont.size(text)[0] < maxsize[0] - (2 * borderoff) + nofit = not (bool1 and tmpfont.size(text)[1] < maxsize[1] - (2 * borderoff)) + if size <= 5: + nofit = False + else: + size -= 1 + return size + + def run(): """Displayes the credits""" from . import settings @@ -34,7 +54,7 @@ def run(): biggest = 1000 for line in credits_file: line = line[:-1] - size = settings.getmaxsize(settings.typeface, 50, + size = getmaxsize(settings.typeface, 50, line, True, color, screen.get_rect().size, 0) if biggest > size: @@ -43,7 +63,7 @@ def run(): for line in credits_file: itera += 1 line = line[:-1] - line = settings.modrender(settings.typeface, biggest, + line = modrender(settings.typeface, biggest, line, True, color, screen.get_rect().size, 0) line_pos = line.get_rect() diff --git a/src/settings.py b/src/settings.py index 5814ab5..785fce2 100644 --- a/src/settings.py +++ b/src/settings.py @@ -270,34 +270,6 @@ def toggle(var, option1, option2): return var -def modrender(typeface, size, text, antialias, color, maxsize, borderoff): - # local typeface! - nofit = True - while nofit: - tmpfont = pygame.font.SysFont(typeface, size) - bool1 = tmpfont.size(text)[0] < maxsize[0] - (2 * borderoff) - nofit = not (bool1 and tmpfont.size(text)[1] < maxsize[1] - (2 * borderoff)) - if size <= 5: - nofit = False - else: - size -= 1 - return tmpfont.render(text, antialias, color) - - -def getmaxsize(typeface, size, text, antialias, color, maxsize, borderoff): - # local typeface! - nofit = True - while nofit: - tmpfont = pygame.font.SysFont(typeface, size) - bool1 = tmpfont.size(text)[0] < maxsize[0] - (2 * borderoff) - nofit = not (bool1 and tmpfont.size(text)[1] < maxsize[1] - (2 * borderoff)) - if size <= 5: - nofit = False - else: - size -= 1 - return size - - class save(): def __init__(self, name): From e167ff4360b35357634360a91bc2bf26da364dcd Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 28 Sep 2015 15:15:38 +0200 Subject: [PATCH 20/28] changed some patterns to only locally ignored --- .gitignore | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cf3bac5..5e67d61 100644 --- a/.gitignore +++ b/.gitignore @@ -5,14 +5,8 @@ **.pyo **.pyc -#custom pattern to make ignored files without addig new rule -**IGNORE*.* - -#the Ninja project file -**.nja - -#The Flake8 config file -**tox.ini +#Custom ignored files +**~.* #empty folders screenshots/* From 60013715f61ee171df4b6ddf5b437b8ad5952c61 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 28 Sep 2015 16:26:18 +0200 Subject: [PATCH 21/28] fixed non-16to9 formats --- assets/templates/settings.menu | 1 + src/draw.py | 21 +++++++++++---------- src/settings.py | 29 ++++++++++++++++++++++++++--- src/worlds.py | 9 ++++++--- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/assets/templates/settings.menu b/assets/templates/settings.menu index c500e36..032f9f1 100644 --- a/assets/templates/settings.menu +++ b/assets/templates/settings.menu @@ -2,6 +2,7 @@ <[sizes = (Very Small, Small, Medium, Big, Very Big) <#background = (./assets/sprites/Background1.tif) +*|Settings |30 |$typeface|$color |$half + 0|$qrt + 0| -|Volume |$volume |$size|$ratio|$typeface|$color|$box2 |$half + 0|%40 + 10| ~-|Button Size|$sizes|$button size|$size|$ratio|$typeface|$color|$box2|BottomLeft|%0 + 0|%0 + 10| ~~-|Fullscreen |$offon|$fullscreen |$size|$ratio|$typeface|$color|$box2|BottomLeft|%0 + 0|%0 + 10| diff --git a/src/draw.py b/src/draw.py index 5096474..bdf5a54 100644 --- a/src/draw.py +++ b/src/draw.py @@ -27,32 +27,31 @@ def init(): if settings.aspect_ratio != 16.0 / 9: # makes a black stripe if not 16 to 9 no16to9 = True - delta_screeny = settings.screeny - settings.screeny_current - correcture = pygame.Surface((settings.screenx, delta_screeny)) + delta_screeny = (settings.screeny_current + - (settings.screenx_current * 9.0 / 16)) + correcture = pygame.Surface((settings.screenx_current, delta_screeny) + ).convert_alpha() correcture_pos = correcture.fill((0, 0, 0)) correcture.set_alpha(255) - correcture_pos.bottomleft = (0, settings.screeny) + correcture_pos.topleft = (0, (settings.screenx_current * 9.0 / 16)) def ingame(): """Draws everything while game runs""" # nothing to explain here i guess - screen = settings.screen - settings.world.blit() status() - settings.player.blit(screen) + settings.player.blit(settings.screen) debug() drawsongname() drawtargetsum() drawworldname() if no16to9: - pass - #screen.blit(correcture, correcture_pos) + settings.screen.blit(correcture, correcture_pos) pygame.display.flip() @@ -192,9 +191,11 @@ def status(): border.set_alpha(0) borderpos = border.get_rect() borderpos.bottomright = (settings.screenx_current, - settings.screeny_current) + settings.screeny_current - correcture_pos.h) pos = bar.fill((62, 186, 23, 40)) pos.right = settings.screenx_current - pos.top = settings.screeny_current - (pos.h / 100.0) * specials.energy + pos.top = (settings.screeny_current + - (pos.h / 100.0) * specials.energy + - correcture_pos.h) settings.screen.blit(bar, pos) settings.screen.blit(border, borderpos) diff --git a/src/settings.py b/src/settings.py index 785fce2..fb8743c 100644 --- a/src/settings.py +++ b/src/settings.py @@ -34,6 +34,7 @@ def init(): global debugscreen # determines wether to show debug info global debugmode # Enables debugmode global isnear # easteregg + global background # background image global field # image for the inputfield global bullet_img # image for the bullet global targeton_img # surf for target whenlight turned on @@ -77,7 +78,7 @@ def init(): pygame.display.set_mode((1, 1)) aspect_ratio = screenx / float(screeny) screenx_current = screenx - screeny_current = int(screenx_current * 9.0 / 16.0) + screeny_current = screeny # create empty folders if needed if not os.path.exists("./assets/sprites/player/"): @@ -187,6 +188,16 @@ def init(): world = localmap["1"] upd("adjust_screen") + #scales images so they fill screen especially when not 16/9 ar + if aspect_ratio > 16.0 / 9: + ratio = screenx_current / float(background.get_size()[1]) + pygame.transform.smoothscale(background, + (screenx_current, screeny_current * ratio)) + elif aspect_ratio < 16.0 / 9: + ratio = screeny_current / float(background.get_size()[0]) + pygame.transform.smoothscale(background, + (screenx_current * ratio, screeny_current)) + def reset(): @@ -221,8 +232,10 @@ def upd(level): if level == "screenvalues": global screenx_current global screeny_current + global aspect_ratio screenx_current = pygame.display.Info().current_w - screeny_current = int(screenx_current * 9.0 / 16.0) + screeny_current = pygame.display.Info().current_h + aspect_ratio = screenx_current / float(screeny_current) return if level == "get_saves": global saves @@ -237,7 +250,6 @@ def upd(level): global background global background_pos global konstspeed - global no16to9 global fullscreenold global fullscreen @@ -254,6 +266,17 @@ def upd(level): konstspeed = konstspeed * (screenx_current / 1920.0) world.adjust_to_screen() + + #scales images so they fill screen especially when not 16/9 ar + if aspect_ratio > 16.0 / 9: + ratio = screenx_current / float(background.get_size()[1]) + pygame.transform.smoothscale(background, + (screenx_current, int(screeny_current * ratio))) + elif aspect_ratio < 16.0 / 9: + ratio = screeny_current / float(background.get_size()[0]) + pygame.transform.smoothscale(background, + (int(screenx_current * ratio), screeny_current)) + return print("Something went wrong here") raise Exception diff --git a/src/worlds.py b/src/worlds.py index dba43a3..3c4faf1 100644 --- a/src/worlds.py +++ b/src/worlds.py @@ -115,10 +115,13 @@ class world(): draw.no16to9 = False if settings.aspect_ratio != 16.0 / 9: draw.no16to9 = True - delta_screeny = settings.screeny - settings.screeny_current - draw.correcture = pygame.Surface((settings.screenx, delta_screeny)) + delta_screeny = (settings.screeny_current + - (settings.screenx_current * 9.0 / 16)) + draw.correcture = pygame.Surface((settings.screenx_current, delta_screeny) + ).convert_alpha() draw.correcture_pos = draw.correcture.fill((0, 0, 0)) - draw.correcture_pos.bottomleft = (0, settings.screeny) + draw.correcture.set_alpha(255) + draw.correcture_pos.topleft = (0, (settings.screenx_current * 9.0 / 16)) for star in self.stars: star.update(settings.screenx_current / 1920.0) From 1bee8a5f159a76ca07779638903025b7f8ca19ae Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 28 Sep 2015 17:17:09 +0200 Subject: [PATCH 22/28] Adjusted README.md to 0.3.3 --- README.md | 63 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 5d3ff7b..aa9b6a0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Project Interstellar is a 2d space-adventure game

developed in and with : Python, Pygame, Git/Github and Ninja-IDE. Currently pre-alpha status.

-Version 0.3.x +Version 0.3.3 How to Run the Game ------------------- @@ -47,42 +47,47 @@ Simply paste your music into the ./assets/music folder to be included in the gam File / Code information ----------------------- -(Codelines ver:0.3.2.7) +(Codelines ver:0.3.3) -| File | Code | Non-code | Total | -| ---: | :--: | :---------------------: | :---: | -| Run.py | 39 | 14 | 53 | -| tygamusic.py | 218 | 80 | 298 | -| chat.py | 4 | 5 | 9 | -| draw.py | 222 | 55 | 277 | -| interface.py | 93 | 17 | 110 | -| main.py | 44 | 34 | 78 | -| menu.py | 287 | 68 | 355 | -| midi_in.py | 57 | 13 | 70 | -| missions.py | 52 | 19 | 71 | -| movement.py | 139 | 29 | 168 | -| namings.py | 57 | 16 | 73 | -| objects.py | 287 | 54 | 341 | -| settings.py | 381 | 78 | 459 | -| sounds.py | 7 | 4 | 11 | -| specials.py | 70 | 15 | 85 | +| File | Code | Non-code | Total | +| --------------------------: | :-: | :-: | :-: | +| Run.py | 39 | 14 | 53 | +| libs/menu/creator.py | 351 | 84 | 435 | +| libs/menu/disp_elem.py | 324 | 88 | 412 | +| libs/menu/IO.py | 30 | 6 | 36 | +| libs/tygamusic/tygamusic.py | 218 | 80 | 298 | +| src/chat.py | 4 | 5 | 9 | +| src/draw.py | 160 | 42 | 202 | +| src/interface.py | 108 | 17 | 125 | +| src/main.py | 46 | 30 | 76 | +| src/menu.py | 317 | 116 | 487 | +| src/midi_in.py | 71 | 19 | 90 | +| src/missions.py | 55 | 19 | 74 | +| src/movement.py | 14 | 9 | 23 | +| src/namings.py | 74 | 24 | 98 | +| src/objects.py | 214 | 51 | 265 | +| src/player.py | 153 | 45 | 198 | +| src/settings.py | 317 | 17 | 394 | +| src/sounds.py | 7 | 5 | 12 | +| src/specials.py | 67 | 14 | 81 | +| src/worlds.py | 101 | 32 | 133 | | | | | -| Total | 2220 | 501 | 2721 | +| Total | 2723 | 730 | 3462 | Top3 code only:
    -
  • settings.py 381
    • -
  • menu.py 287, 68
    • -
  • objects.py 287, 54
+
  • libs/menu/creator.py 351
    • +
  • libs/menu/disp_elem.py 324
    • +
  • src/menu.py & src/settings.py 317
    • Top3 Commented or empty lines:
      -
    • tygamusic 80
      • -
    • settings.py 78
      • -
    • menu.py 68
    +
  • menu.py 116
    • +
  • libs/menu/disp_elem.py 88
    • +
  • libs/menu/creator.py 84
    • Top3 Total:
      -
    • settings.py 459
      • -
    • menu.py 355
      • -
    • objects.py 341
    +
  • src/menu.py 487
    • +
  • libs/menu/creator.py 435
    • +
  • libs/menu/disp_elem.py 412
    • Contact Information ------------------- From f2ddf54126b4ab3dc23fc8225e688e5851397511 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Mon, 28 Sep 2015 17:17:53 +0200 Subject: [PATCH 23/28] Deactivated debugmode --- src/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.py b/src/settings.py index fb8743c..3cddb9b 100644 --- a/src/settings.py +++ b/src/settings.py @@ -109,7 +109,7 @@ def init(): konstspeed = 0.0025 fullscreen = False debugscreen = False - debugmode = True + debugmode = False dstars = 500 isnear = "False" code = "" From 8fe8df2599aa19fe43737fa11b77be7f7c50838d Mon Sep 17 00:00:00 2001 From: Max Lange Date: Tue, 29 Sep 2015 16:13:00 +0200 Subject: [PATCH 24/28] adopted changes in README.md into README.html --- README.html | 152 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 61 deletions(-) diff --git a/README.html b/README.html index 83bf2bb..8329f7e 100644 --- a/README.html +++ b/README.html @@ -11,7 +11,7 @@

    developed in and with : Python, Pygame, Git/Github and Ninja-IDE. Currently pre-alpha status.

    -

    Version 0.3.x

    +

    Version 0.3.3

    How to Run the Game


    This is just a developement version so you need the programming language Python version 2.x .
    @@ -45,7 +45,7 @@ Google for: "how to run python files in" and add you OS

    Simply paste your music into the ./assets/music folder to be included in the game. "_" will be replaced with spaces " ". For best support use .ogg but .mp3 will work too.

    File / Code information

    -

    (Codelines ver:0.3.2.7)

    +

    (Codelines ver:0.3.3)

    @@ -63,88 +63,118 @@ Google for: "how to run python files in" and add you OS - + + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + - + - - + + + + + + + + - - - - + + + + @@ -154,24 +184,24 @@ Google for: "how to run python files in" and add you OS - - - + + +
    53
    tygamusic.pylibs/menu/creator.py35184435
    libs/menu/disp_elem.py32488412
    libs/menu/IO.py30636
    libs/tygamusic/tygamusic.py 218 80 298
    chat.pysrc/chat.py 4 5 9
    draw.py22255277src/draw.py16042202
    interface.py93src/interface.py108 17110125
    main.py443478src/main.py463076
    menu.py28768355src/menu.py317116487
    midi_in.py571370src/midi_in.py711990
    missions.py52src/missions.py55 197174
    movement.py13929168src/movement.py14923
    namings.py571673src/namings.py742498
    objects.py28754341src/objects.py21451265
    settings.py38178459src/player.py15345198
    src/settings.py31717394
    sounds.pysrc/sounds.py 7411512
    src/specials.py671481
    specials.py701585src/worlds.py10132133
    Total2220501272127237303462

    Top3 code only:

      -
    • settings.py 381
      • -
    • menu.py 287, 68
      • -
    • objects.py 287, 54

    +
  • libs/menu/creator.py 351
    • +
  • libs/menu/disp_elem.py 324
    • +
  • src/menu.py & src/settings.py 317

    • Top3 Commented or empty lines:

      -
    • tygamusic 80
      • -
    • settings.py 78
      • -
    • menu.py 68

    +
  • menu.py 116
    • +
  • libs/menu/disp_elem.py 88
    • +
  • libs/menu/creator.py 84

    • Top3 Total:

      -
    • settings.py 459
      • -
    • menu.py 355
      • -
    • objects.py 341

    +
  • src/menu.py 487
    • +
  • libs/menu/creator.py 435
    • +
  • libs/menu/disp_elem.py 412

    • Contact Information

    You can contact me on the homepage or via email: max12354678910@gmail.com From 34ec9c4184e0ba4480348a403c9040a38b26cb77 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Wed, 30 Sep 2015 18:48:16 +0200 Subject: [PATCH 25/28] fixed key input raising error when smaller than one in warp menu --- src/draw.py | 1 + src/menu.py | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/draw.py b/src/draw.py index bdf5a54..fb5a256 100644 --- a/src/draw.py +++ b/src/draw.py @@ -183,6 +183,7 @@ def drawworldname(): def status(): + correcture_pos = pygame.Rect(0, 0, 0, 0) xsize = int(settings.screenx_current * 0.05) ysize = int(settings.screeny_current * 0.3) + 10 bar = pygame.Surface((xsize, ysize)).convert_alpha() diff --git a/src/menu.py b/src/menu.py index 79d2439..ca08fe9 100644 --- a/src/menu.py +++ b/src/menu.py @@ -307,24 +307,25 @@ def choose_world(): settings.quit() if event[0:5] == "world": selected = event[5] - if event[1] in ["1", "2", "3", "4", "6", "7", "8", "9"]: - #maps keys to worlds - selected = int(event[1]) - if selected == 1: - selected = 6 - elif selected == 2: - selected = 7 - elif selected == 3: - selected = 8 - elif selected == 6: - selected = 5 - elif selected == 7: - selected = 1 - elif selected == 8: - selected = 2 - elif selected == 9: - selected = 3 - selected = str(selected) + if len(event) > 1: + if event[1] in ["1", "2", "3", "4", "6", "7", "8", "9"]: + #maps keys to worlds + selected = int(event[1]) + if selected == 1: + selected = 6 + elif selected == 2: + selected = 7 + elif selected == 3: + selected = 8 + elif selected == 6: + selected = 5 + elif selected == 7: + selected = 1 + elif selected == 8: + selected = 2 + elif selected == 9: + selected = 3 + selected = str(selected) for elem in world_menu.menu.elems["buttons"]: if elem.name == "world" + str(selected): elem.state = 2 From a337282d6b2bffa01d14fd7fb8dbb79cb9820eb8 Mon Sep 17 00:00:00 2001 From: Max Lange Date: Wed, 30 Sep 2015 19:12:17 +0200 Subject: [PATCH 26/28] fixed issue #9 --- src/draw.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/draw.py b/src/draw.py index fb5a256..5c9c9a5 100644 --- a/src/draw.py +++ b/src/draw.py @@ -34,6 +34,8 @@ def init(): correcture_pos = correcture.fill((0, 0, 0)) correcture.set_alpha(255) correcture_pos.topleft = (0, (settings.screenx_current * 9.0 / 16)) + else: + correcture_pos = pygame.Rect(0, settings.screeny_current, 0, 0) def ingame(): @@ -183,7 +185,7 @@ def drawworldname(): def status(): - correcture_pos = pygame.Rect(0, 0, 0, 0) + """Draws the ships energy in the lower right corner.""" xsize = int(settings.screenx_current * 0.05) ysize = int(settings.screeny_current * 0.3) + 10 bar = pygame.Surface((xsize, ysize)).convert_alpha() From 60dbb33241a4b19886433d5efd39caab2a03ccfe Mon Sep 17 00:00:00 2001 From: Max Lange Date: Thu, 1 Oct 2015 21:46:40 +0200 Subject: [PATCH 27/28] fixed issue #10 --- src/namings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/namings.py b/src/namings.py index 1cffaa1..bf291df 100644 --- a/src/namings.py +++ b/src/namings.py @@ -55,8 +55,7 @@ def run(): for line in credits_file: line = line[:-1] size = getmaxsize(settings.typeface, 50, - line, True, color, - screen.get_rect().size, 0) + line, screen.get_rect().size, 0) if biggest > size: biggest = size with open("./assets/lang/credits.txt") as credits_file: From c0d65a410360324e155fa68aae92096e03ba007b Mon Sep 17 00:00:00 2001 From: Max Lange Date: Sun, 4 Oct 2015 19:10:02 +0200 Subject: [PATCH 28/28] fixed not diplaying newly saved games --- assets/sprites/star1.tif | Bin 3284 -> 773 bytes src/menu.py | 1 + 2 files changed, 1 insertion(+) diff --git a/assets/sprites/star1.tif b/assets/sprites/star1.tif index a4bebfe45fc379d19fefd7717df718e3bb68b0f1..f25b7b469fdca122ca36b4aa18c1a2d1c1936547 100644 GIT binary patch literal 773 zcmebD)M8k}$iUFRpb%i8BErz@wEuttg9ryJcN@d}2h1mLsj~GrT1np{Gq~zL4v>i0JBX8Lxa$^_PFwP;g#1I60PPsuoa(t!cdag zz&|C)N`#&HQq#i(h6*P|27VVN21afJ2Hw2|eCEm%7elNYepxE*N&-dy*46m!><)v-}=x<)kf2*oGA9yxJ zS*1~U$fdlHZ>gJg~dlnt`i7Kt5%#0E++cmOfTUKq{60D<}$`MIh3#U-UF znfbb4wo86?X>Mv>NveK8QGQlxc8P)~kW*A#lA4o~SOgJFE{V@X5{ysJEYVLaE>0~e W)-Nt7$}C9*(j|#ShI%ELX$$~`{lQZJ literal 3284 zcmebD)MDUZU|-n#0L9J$F*8)07070TvYCKvE+`wMUyzXn zY|aNR1_mJ{aZxB6WR@6|4YErds{RR3vka1YLq;Z$s~D~UaS&7-WY-=hMus<>3=GeJ z?96tEU6+7%fdB^-2501#l&9w8C>ZD&TId-t*w|MTBqnF4mMA2prf25aD!t#mUr8Y| z#a1cY)Yrhbz&SM|)1#^=HMq(zB)KX(*)m1R-j2(r!m1*-AUCxnQK2F?C$HG5!d59U zB|jnkaMm6T-LDnjVC87bLuDcBUHq*(>IxIv8o z@@$ndN=gc>^!3Zj%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUl|e>8%y3C9 zPAqW5A0aIZ0m%C=bj89vD` zOtk+nH9Mc3u%dI5tjIrxGfPjn82@4EblrcT<4ExzzFznJ2RTl4$gTL#v^YrrfoSG$ z$AumO8di^VCH=gX-hXKFsP>;yz)JZ?v$Owr%<$cRXl2P&Ppuh?BT_g_lz*`GE^7%{ zRsQ2>!Or?=GkVg0?yNajKmD3__>Zf8tM;mgh_)C=Qt`8JG47cY9`U3z9;%<5p84S3 z>-=Xqqs{T3 z&a~9sQUOy|N55Jl*nh{8Z{d@uSqzg>Hf^{l|DeWg`_!Wo|4EAJJje-iP&9Pd$y9hl zV6ELJCIgR2T~C~tCcC_T<}YI8v#!30<<=e6;|ZEFo-2+xO3n5@@lwG{?ZTy=OYg;Q9nRJEGulUGk*NanfW!*1{^s0JZnzB~c`?AQXxP}G*ksg*s diff --git a/src/menu.py b/src/menu.py index ca08fe9..ef05223 100644 --- a/src/menu.py +++ b/src/menu.py @@ -239,6 +239,7 @@ def pause(): "Save Game") if savename != "Exit": settings.save(savename) + settings.upd("get_saves") if event == "Load Game": savegame = savegames() if savegame is not None: