diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41b3cc0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,163 @@ + +# ---> Python +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + diff --git a/starmap.py b/starmap.py index 1495c57..7a768ba 100644 --- a/starmap.py +++ b/starmap.py @@ -75,10 +75,10 @@ class StarSys(object): self.draw_dirty = False def update(self): #if self.startype.size == "Dwarf" and self.startype.color == "White": - #print gametimer.elapsed() - #print self.frame_timer - #print self.frame_timer - gametimer.elapsed() - #print self.delays + #print(gametimer.elapsed()) + #print(self.frame_timer) + #print(self.frame_timer - gametimer.elapsed()) + #print(self.delays) #sys.exit(0) self.frame_timer -= gametimer.elapsed() oldframe = self.frame diff --git a/starmap_gen.py b/starmap_gen.py index ab547b5..1b97e97 100644 --- a/starmap_gen.py +++ b/starmap_gen.py @@ -117,7 +117,7 @@ def starmap_generate(): mapy = params.size[1] - 2 map = Galaxy(params.size[0], params.size[1]) i = 0 - print numstars + print(numstars) while True: if i >= numstars: break @@ -134,7 +134,7 @@ def starmap_generate(): star = map.get_nearest_star(x, y) dist = map.get_distance(x, y, star.x, star.y) if dist < mindist: - print "Dist (%s, %s): %s, Mindist (%s, %s): %s" % (star.x, star.y, dist, int(x), int(y), mindist) + print("Dist (%s, %s): %s, Mindist (%s, %s): %s" % (star.x, star.y, dist, int(x), int(y), mindist)) mindist -= 2 continue @@ -164,7 +164,7 @@ def starmap_generate(): hab = hab.random() min = min.random() - print "Generated star %s %s %s at (%s, %s)" % (startype.name, hab, min, int(x), int(y)) + print("Generated star %s %s %s at (%s, %s)" % (startype.name, hab, min, int(x), int(y))) star = StarSys(int(x), int(y), startype, hab, min) star.set_frame_timers([0.6 + (random.random() * 1.5), 0.2 + (random.random() * 0.5)]) diff --git a/video.py b/video.py index 7473ca1..6c09e63 100644 --- a/video.py +++ b/video.py @@ -45,7 +45,7 @@ def next_frame(): global updatelist, force_full if force_full: - print "Doing FULL redraw!" + print("Doing FULL redraw!") pygame.display.flip() else: pygame.display.update(updatelist)