diff --git a/assets/fonts/Rubik_Mono_One/OFL.txt b/assets/fonts/Rubik_Mono_One/OFL.txt new file mode 100644 index 0000000..cb5ac7d --- /dev/null +++ b/assets/fonts/Rubik_Mono_One/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2013, 2014, Hubert and Fischer, Philipp Hubert (philipp@hubertfischer.com), Sebastian Fischer (sebastian@hubertfischer.com) + +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: +https://openfontlicense.org + + +----------------------------------------------------------- +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/assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf b/assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf new file mode 100644 index 0000000..a91fa56 Binary files /dev/null and b/assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf differ diff --git a/assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf.import b/assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf.import new file mode 100644 index 0000000..ed7da24 --- /dev/null +++ b/assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf.import @@ -0,0 +1,33 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dv01hh045k5n2" +path="res://.godot/imported/RubikMonoOne-Regular.ttf-e0dfb02f9f37dfb799d755a9158977e9.fontdata" + +[deps] + +source_file="res://assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf" +dest_files=["res://.godot/imported/RubikMonoOne-Regular.ttf-e0dfb02f9f37dfb799d755a9158977e9.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=1 +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/scenes/Game.tscn b/scenes/Game.tscn index 7998a0e..970c703 100644 --- a/scenes/Game.tscn +++ b/scenes/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://rd48gl8k5x34"] +[gd_scene load_steps=13 format=3 uid="uid://rd48gl8k5x34"] [ext_resource type="Theme" uid="uid://bb8mjy6l7umui" path="res://themes/GameUI.tres" id="2_eun58"] [ext_resource type="PackedScene" uid="uid://b1nm5h3yccr16" path="res://scenes/World.tscn" id="2_voimb"] @@ -6,6 +6,7 @@ [ext_resource type="Texture2D" uid="uid://b5ah0ej10awd5" path="res://levels/Platforms.png" id="4_0en0p"] [ext_resource type="Script" path="res://scenes/GameUI.gd" id="4_2tdl1"] [ext_resource type="Texture2D" uid="uid://dam8r48qo0qqh" path="res://levels/BasicLevel.png" id="4_l63m5"] +[ext_resource type="FontFile" uid="uid://dv01hh045k5n2" path="res://assets/fonts/Rubik_Mono_One/RubikMonoOne-Regular.ttf" id="4_pbhfl"] [ext_resource type="Texture2D" uid="uid://b3bftdoqgqopj" path="res://levels/LotsaHoles.png" id="7_8su71"] [sub_resource type="World3D" id="World3D_5g233"] @@ -165,8 +166,19 @@ theme_override_constants/outline_size = 40 theme_override_font_sizes/font_size = 160 text = "CLASH" +[node name="Label2" type="Label" parent="GameUI/GameStartupWidgets"] +layout_mode = 1 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_left = 17.0 +offset_top = -50.0 +offset_right = 705.0 +offset_bottom = -17.0 +grow_vertical = 0 +text = "Music: Run Amok by Kevin MacLeod | https://incompetech.com/" + [node name="GameFinishedWidgets" type="Panel" parent="GameUI"] -visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -245,8 +257,10 @@ grow_horizontal = 2 [node name="Player1Widgets" type="VBoxContainer" parent="GameUI/GameRunningWidgets"] layout_mode = 1 -offset_right = 49.0 -offset_bottom = 77.0 +offset_left = 14.0 +offset_top = 13.0 +offset_right = 414.0 +offset_bottom = 124.0 alignment = 1 [node name="NameLabel" type="Label" parent="GameUI/GameRunningWidgets/Player1Widgets"] @@ -269,8 +283,10 @@ value = 33.0 [node name="Player2Widgets" type="VBoxContainer" parent="GameUI/GameRunningWidgets"] layout_direction = 3 layout_mode = 1 -offset_right = 49.0 -offset_bottom = 77.0 +offset_left = 21.0 +offset_top = 14.0 +offset_right = 421.0 +offset_bottom = 125.0 size_flags_horizontal = 8 alignment = 1 @@ -308,10 +324,13 @@ horizontal_alignment = 1 [node name="TimeLeftLabel" type="Label" parent="GameUI/GameRunningWidgets/TimeWidgets"] layout_mode = 2 +theme_override_fonts/font = ExtResource("4_pbhfl") +theme_override_font_sizes/font_size = 40 text = "00:30:00" horizontal_alignment = 1 [node name="GameLevelSelectWidgets" type="Panel" parent="GameUI"] +visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 diff --git a/scenes/GameUI.gd b/scenes/GameUI.gd index 4b97e40..5554eef 100644 --- a/scenes/GameUI.gd +++ b/scenes/GameUI.gd @@ -53,9 +53,9 @@ func _process(_delta): var minutes = floor(world.time_left / 60.) var seconds = fmod(floor(world.time_left), 60) - var milliseconds = floor((world.time_left - floor(world.time_left)) * 10) + var milliseconds = floor((world.time_left - floor(world.time_left)) * 100) - time_left_label.text = str(minutes) + ":" + str(seconds) + ":" + str(milliseconds) + time_left_label.text = "%02d:%02d:%02d" % [minutes, seconds, milliseconds] player1_score_label.add_theme_color_override("font-color", world.players[0].color) if player2_widgets.visible: