Return to repo list

gatemender

Arcade game about fixing warp gates. LibreJam Dec 2020 Entry.
Return to HMagellan.com

commit 042bcc6649743727b0d9e7a16fb13eb5d199083f
parent da25bce7fe4a4cfb95cd94e4193ae04145142b08
Author: Erik Letson <hmagellan@hmagellan.com>
Date:   Mon,  7 Dec 2020 08:23:05 -0600

added fonts

Diffstat:
Adata/OFL.txt | 94+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adata/Segment7Standard.otf | 0
Msrc/constants.py | 1+
Msrc/game.py | 3++-
Msrc/sprites.py | 26+++++++++++++++++++++++---
5 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/data/OFL.txt b/data/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2014, Cedric Knight <fonts@cedders.com>, +with Reserved Font Name "Segment7". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/data/Segment7Standard.otf b/data/Segment7Standard.otf Binary files differ. diff --git a/src/constants.py b/src/constants.py @@ -32,6 +32,7 @@ IMAGE_FILES = { "UI_Tray" : os.path.join("data", "hud_tray.png"), "Fix_Aura" : os.path.join("data", "fix_aura.png") } +FONTPATH = os.path.join("data", "Segment7Standard.otf") TURN_LEFT_KEY = pygame.K_a TURN_RIGHT_KEY = pygame.K_d BRAKE_KEY = pygame.K_s diff --git a/src/game.py b/src/game.py @@ -12,6 +12,7 @@ class Game(object): self.camera_surface_rect = self.camera_surface.get_rect() self.camera_surface_rect.topleft = (0, 0) self.frameclock = pygame.time.Clock() + self.font = pygame.font.Font(FONTPATH, 24) # Loading self.images = { i : pygame.image.load(IMAGE_FILES[i]).convert() for i in IMAGE_FILES } @@ -62,7 +63,7 @@ class Game(object): rqstr = "Beta" else: rqstr = "Gamma" - if n[0]: + if not n[0]: bstr = "Fixed" else: bstr = "Broken" diff --git a/src/sprites.py b/src/sprites.py @@ -61,6 +61,7 @@ class Ship(CustomSprite): # Other self.hp = 3 + self.hitbox = pygame.Rect((0, 0), (self.rect.width // 4, self.rect.height // 4)) self.blinking = False self.blinking_timer_max = 120 self.blinking_timer = self.blinking_timer_max @@ -86,6 +87,9 @@ class Ship(CustomSprite): def act(self): + # Syncing + self.hitbox.center = self.rect.center + # Turning if self.turning_left: self.turn(3) @@ -144,7 +148,7 @@ class Ship(CustomSprite): self.blinking_timer = self.blinking_timer_max else: for s in self.manager.asteroids.sprites(): - if self.rect.colliderect(s.rect): + if self.hitbox.colliderect(s.rect): s.destroy() self.hp -= 1 if self.hp > 0: @@ -175,19 +179,35 @@ class GatePiece(CustomSprite): self.broken = broken self.requirement = req self.needed = 0 + self.needed_text = None + self.needed_text_rect = None self.halo_image = None self.halo_rect = None - if not self.broken: + if self.broken: self.halo_image = pygame.transform.rotate(self.manager.images[self.requirement + "_Halo_" + or_name], self.angle) self.halo_image.set_colorkey(COLORKEY) self.halo_rect = self.halo_image.get_rect() self.halo_rect.center = self.rect.center - #self.halo_image = pygame.transform.rotate(self.manager.images["White_Halo_" + or_name], self.angle) + self.needed = random.randint(1, self.manager.level_factor) + self.needed_text = self.manager.font.render(str(self.needed), False, (255, 255, 255)) + self.needed_text_rect = self.needed_text.get_rect() + self.needed_text_rect.center = self.rect.center + if or_name == "Straight": + if angle == 0: + self.needed_text_rect.center = (self.needed_text_rect.centerx, self.needed_text_rect.centery - 28) + elif angle == 90: + self.needed_text_rect.center = (self.needed_text_rect.centerx - 28, self.needed_text_rect.centery) + elif angle == 180: + self.needed_text_rect.center = (self.needed_text_rect.centerx, self.needed_text_rect.centery + 28) + elif angle == 270: + self.needed_text_rect.center = (self.needed_text_rect.centerx + 28, self.needed_text_rect.centery) def update(self, surface = None): if self.halo_image != None: surface.blit(self.halo_image, self.halo_rect) super().update(surface) + if self.broken: + surface.blit(self.needed_text, self.needed_text_rect) # Asteroids class Asteroid(CustomSprite):