commit c14883393203c6a375beaa23a0c5af558dc3046c
parent 63097b9279e965c46c5df04d2e4c13333b8a370a
Author: Erik Letson <hmagellan@hmagellan.com>
Date: Mon, 7 Dec 2020 09:32:57 -0600
Changed font
Diffstat:
6 files changed, 15 insertions(+), 96 deletions(-)
diff --git a/data/OFL.txt b/data/OFL.txt
@@ -1,94 +0,0 @@
-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/data/computerspeak03.ttf b/data/computerspeak03.ttf
Binary files differ.
diff --git a/data/font-license.txt b/data/font-license.txt
@@ -0,0 +1,12 @@
+The FontStruction “Computer Speak v0.3”
+(https://fontstruct.com/fontstructions/show/1436469) by “Mcguy215” is
+licensed under a Creative Commons Attribution license
+(http://creativecommons.org/licenses/by/3.0/).
+“Computer Speak v0.3” was originally cloned (copied) from the FontStruction
+“Computer Speak v0.2” (https://fontstruct.com/fontstructions/show/1432943)
+by “Mcguy215”, which is licensed under a Creative Commons Attribution
+license (http://creativecommons.org/licenses/by/3.0/).
+“Computer Speak v0.2” was in turn cloned (copied) from the FontStruction
+“Computer Speak” (https://fontstruct.com/fontstructions/show/1431517) by
+“Mcguy215”, which is licensed under a Creative Commons Attribution license
+(http://creativecommons.org/licenses/by/3.0/).+
\ No newline at end of file
diff --git a/src/constants.py b/src/constants.py
@@ -33,7 +33,7 @@ IMAGE_FILES = {
"Fix_Aura" : os.path.join("data", "fix_aura.png"),
"Vortex" : os.path.join("data", "vortex.png")
}
-FONTPATH = os.path.join("data", "Segment7Standard.otf")
+FONTPATH = os.path.join("data", "computerspeak03.ttf")
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
@@ -32,7 +32,7 @@ class Game(object):
self.transition_timer = self.transition_timer_max
self.asteroid_spawn_timer = 100
self.gate_defs = []
- self.game_over_text = self.font.render("GAE OVER", False, (255, 255, 255))
+ self.game_over_text = self.font.render("GAME OVER", False, (255, 255, 255))
self.lives_text = self.font.render(str(self.lives), False, (255, 255, 255))
self.level_text = self.font.render("GATE " + str(self.level_factor), False, (255, 255, 255))
