diff --git a/Dialogue.tscn b/Dialogue.tscn index f341bf7..3e36c21 100644 --- a/Dialogue.tscn +++ b/Dialogue.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://bla1cfndgad0"] [ext_resource type="Texture2D" uid="uid://m5dwatby4pfc" path="res://art/text_box.png" id="1_4xg4g"] +[ext_resource type="Theme" uid="uid://bmerl7q2g67v4" path="res://themes/jump_rope_ui.tres" id="1_qtnsr"] [ext_resource type="Script" uid="uid://byj4ibepgm6oa" path="res://dialogue.gd" id="1_tgtc2"] [node name="Dialogue" type="TextureRect" unique_id=733911232] @@ -10,8 +11,10 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +theme = ExtResource("1_qtnsr") texture = ExtResource("1_4xg4g") script = ExtResource("1_tgtc2") +font_color = Color(0.14406255, 0.14406255, 0.14406255, 1) [node name="Panel" type="Panel" parent="." unique_id=1878574619] self_modulate = Color(1, 1, 1, 0) @@ -28,9 +31,9 @@ anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = 8.0 -offset_top = 265.0 +offset_top = 301.0 offset_right = -11.0 -offset_bottom = -263.0 +offset_bottom = -227.0 grow_horizontal = 2 grow_vertical = 2 bbcode_enabled = true diff --git a/OldComputer.tscn b/OldComputer.tscn index 719c285..1504567 100644 --- a/OldComputer.tscn +++ b/OldComputer.tscn @@ -7,7 +7,6 @@ bg_color = Color(0.28627452, 0.25490198, 0.22745098, 1) [node name="OldComputer" type="CanvasLayer" unique_id=1944134941] -visible = false script = ExtResource("1_6jyhx") [node name="BackgroundPanel" type="Panel" parent="." unique_id=1876350245] @@ -39,13 +38,22 @@ position = Vector2(618, 349) texture = ExtResource("2_2wyuv") [node name="ConsoleText" type="RichTextLabel" parent="." unique_id=715961645] -offset_left = 150.0 -offset_top = 105.0 -offset_right = 1102.0 -offset_bottom = 652.0 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -476.0 +offset_top = -273.5 +offset_right = 476.0 +offset_bottom = 273.5 +grow_horizontal = 2 +grow_vertical = 2 bbcode_enabled = true -text = ">> Pharaoh OS 2000 Boot Sequence +text = "[center]>> Pharaoh OS 2000 Boot Sequence >> WARN: Detected anomalies! >> WARN: Memory integrity at %d%%! >> User: Please load backup data disk (1 of 4) >> Player: Press interact [E] or jump [Space] to exit." +fit_content = true +vertical_alignment = 1 diff --git a/art/text_box.png b/art/text_box.png index ac2b0bf..d00cee1 100644 Binary files a/art/text_box.png and b/art/text_box.png differ diff --git a/dialogue.gd b/dialogue.gd index 0361fed..f28c3fc 100644 --- a/dialogue.gd +++ b/dialogue.gd @@ -1,9 +1,13 @@ class_name Dialogue extends Control +@export var custom_font = preload("res://fonts/IndieFlower-Regular.ttf") +@export var font_color: Color + func show_text(text: String) -> Dialogue: visible = true - $Panel/Text.text = "[center][font_size=28][color=BLACK]%s" % text + + $Panel/Text.text = "[center]%s" % text return self func dismiss_after(secs: float) -> Dialogue: diff --git a/fonts/IndieFlower-Regular.ttf b/fonts/IndieFlower-Regular.ttf new file mode 100644 index 0000000..3774ef5 Binary files /dev/null and b/fonts/IndieFlower-Regular.ttf differ diff --git a/fonts/IndieFlower-Regular.ttf.import b/fonts/IndieFlower-Regular.ttf.import new file mode 100644 index 0000000..7d63d27 --- /dev/null +++ b/fonts/IndieFlower-Regular.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://crk0pyhposrb7" +path="res://.godot/imported/IndieFlower-Regular.ttf-e0486e71948a8aaa3d1ad0ab77572a93.fontdata" + +[deps] + +source_file="res://fonts/IndieFlower-Regular.ttf" +dest_files=["res://.godot/imported/IndieFlower-Regular.ttf-e0486e71948a8aaa3d1ad0ab77572a93.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +modulate_color_glyphs=false +hinting=3 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/fonts/JustMeAgainDownHere-Regular.ttf b/fonts/JustMeAgainDownHere-Regular.ttf new file mode 100644 index 0000000..bd6f48c Binary files /dev/null and b/fonts/JustMeAgainDownHere-Regular.ttf differ diff --git a/fonts/JustMeAgainDownHere-Regular.ttf.import b/fonts/JustMeAgainDownHere-Regular.ttf.import new file mode 100644 index 0000000..41487bc --- /dev/null +++ b/fonts/JustMeAgainDownHere-Regular.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bv5jfswk1or3m" +path="res://.godot/imported/JustMeAgainDownHere-Regular.ttf-0bbbce1d1304c77d7992dcf2ba905974.fontdata" + +[deps] + +source_file="res://fonts/JustMeAgainDownHere-Regular.ttf" +dest_files=["res://.godot/imported/JustMeAgainDownHere-Regular.ttf-0bbbce1d1304c77d7992dcf2ba905974.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +modulate_color_glyphs=false +hinting=3 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/fonts/OFL.txt b/fonts/OFL.txt new file mode 100644 index 0000000..c81eccd --- /dev/null +++ b/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010, Kimberly Geswein (kimberlygeswein.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/player_2d.tscn b/player_2d.tscn index 02f637f..8393191 100644 --- a/player_2d.tscn +++ b/player_2d.tscn @@ -160,7 +160,7 @@ scale = Vector2(3, 3) texture = ExtResource("3_p3026") [node name="Camera2D" type="Camera2D" parent="." unique_id=962368438] -zoom = Vector2(1.75, 1.75) +zoom = Vector2(2.2, 2.2) process_callback = 0 position_smoothing_enabled = true diff --git a/shaders/warp_shader.gdshader b/shaders/warp_shader.gdshader index 982e318..48d7408 100644 --- a/shaders/warp_shader.gdshader +++ b/shaders/warp_shader.gdshader @@ -4,8 +4,8 @@ shader_type canvas_item; render_mode unshaded, skip_vertex_transform; -const float curvature = 3.4; -const float vignette_multiplier = 0.6; +const float curvature = 3.5; +const float vignette_multiplier = 0.7; uniform sampler2D screen_texture: hint_screen_texture; @@ -14,7 +14,7 @@ void fragment() { vec2 uv_offset = centered_uv.yx / curvature; vec2 warped_uv = centered_uv + centered_uv * uv_offset * uv_offset; vec3 cutoff = vec3(step(abs(warped_uv.x), 1.0) * step(abs(warped_uv.y), 1.0)); - vec3 scanlines = vec3(sin(1.5 * warped_uv.y * 720.0) * 0.25 + 0.75); + vec3 scanlines = vec3(sin(1.5 * warped_uv.y * 720.0) * 0.35 + 0.75); vec3 vignette = vec3(length(pow(abs(centered_uv), vec2(4.0)) / 3.0)); vec3 screen_color = texture(screen_texture, (warped_uv + 1.0) / 2.0).rgb * (scanlines * 1.3); diff --git a/themes/jump_rope_ui.tres b/themes/jump_rope_ui.tres new file mode 100644 index 0000000..f777e13 --- /dev/null +++ b/themes/jump_rope_ui.tres @@ -0,0 +1,30 @@ +[gd_resource type="Theme" format=3 uid="uid://bmerl7q2g67v4"] + +[ext_resource type="FontFile" uid="uid://bv5jfswk1or3m" path="res://fonts/JustMeAgainDownHere-Regular.ttf" id="1_wnb1w"] + +[resource] +default_font = ExtResource("1_wnb1w") +default_font_size = 80 +Button/fonts/font = ExtResource("1_wnb1w") +FoldableContainer/fonts/font = ExtResource("1_wnb1w") +Font/colors/FontColor = Color(0.14586785, 0.14586785, 0.14586785, 1) +Font/font_sizes/FontSize = 80 +ItemList/fonts/font = ExtResource("1_wnb1w") +Label/fonts/font = ExtResource("1_wnb1w") +LineEdit/fonts/font = ExtResource("1_wnb1w") +LinkButton/fonts/font = ExtResource("1_wnb1w") +MenuBar/fonts/font = ExtResource("1_wnb1w") +PopupMenu/fonts/font = ExtResource("1_wnb1w") +PopupMenu/fonts/font_separator = ExtResource("1_wnb1w") +ProgressBar/fonts/font = ExtResource("1_wnb1w") +RichTextLabel/fonts/bold_font = ExtResource("1_wnb1w") +RichTextLabel/fonts/bold_italics_font = ExtResource("1_wnb1w") +RichTextLabel/fonts/italics_font = ExtResource("1_wnb1w") +RichTextLabel/fonts/mono_font = ExtResource("1_wnb1w") +RichTextLabel/fonts/normal_font = ExtResource("1_wnb1w") +TabBar/fonts/font = ExtResource("1_wnb1w") +TabContainer/fonts/font = ExtResource("1_wnb1w") +TextEdit/fonts/font = ExtResource("1_wnb1w") +Tree/fonts/font = ExtResource("1_wnb1w") +Tree/fonts/title_button_font = ExtResource("1_wnb1w") +Window/fonts/title_font = ExtResource("1_wnb1w") diff --git a/world.tscn b/world.tscn index e3aaf10..2c79231 100644 --- a/world.tscn +++ b/world.tscn @@ -33,7 +33,7 @@ scale = Vector2(1, 1.0155824) [node name="Player2D" parent="." unique_id=889851478 instance=ExtResource("1_aqk2v")] unique_name_in_owner = true -position = Vector2(-4838.9995, 356.4457) +position = Vector2(-4838, 217.6091) rotation = 0.0005533503 safe_margin = 0.08 @@ -470,10 +470,15 @@ script = ExtResource("14_70uel") [node name="Dialogue" parent="CanvasLayer" unique_id=1025022375 instance=ExtResource("19_26xuy")] unique_name_in_owner = true -offset_left = 3.9999995 -offset_top = 550.99994 -offset_right = 268.38086 -offset_bottom = -7.640442 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +offset_left = -636.75256 +offset_top = -284.2888 +offset_right = 907.46716 +offset_bottom = 12.490967 +grow_vertical = 0 rotation = 4.9367074e-05 scale = Vector2(0.8267815, 0.8267815) stretch_mode = 5