diff --git a/Dialogue.tscn b/Dialogue.tscn index 3e36c21..ecbb515 100644 --- a/Dialogue.tscn +++ b/Dialogue.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" uid="uid://byj4ibepgm6oa" path="res://dialogue.gd" id="1_tgtc2"] [node name="Dialogue" type="TextureRect" unique_id=733911232] -visible = false +clip_contents = true anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -18,10 +18,13 @@ 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) +clip_contents = true layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = 185.0 +offset_right = -163.0 grow_horizontal = 2 grow_vertical = 2 @@ -30,9 +33,9 @@ layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 8.0 +offset_left = 83.0 offset_top = 301.0 -offset_right = -11.0 +offset_right = -77.0 offset_bottom = -227.0 grow_horizontal = 2 grow_vertical = 2 diff --git a/OldComputer.tscn b/OldComputer.tscn index 1504567..c62ba84 100644 --- a/OldComputer.tscn +++ b/OldComputer.tscn @@ -2,21 +2,39 @@ [ext_resource type="Script" uid="uid://d0lvnnd3mqfxh" path="res://old_computer.gd" id="1_6jyhx"] [ext_resource type="Texture2D" uid="uid://brppyauh1xyif" path="res://art/computer/background.png" id="2_2wyuv"] +[ext_resource type="Texture2D" uid="uid://b2slrh32njho4" path="res://art/computer/backlight.png" id="2_eta3k"] +[ext_resource type="Shader" uid="uid://mmf86jusrkrr" path="res://shaders/warp_shader.gdshader" id="3_jwgiw"] +[ext_resource type="Script" uid="uid://3bqq3mfbby2c" path="res://warp_shader.gd" id="4_eta3k"] +[ext_resource type="Texture2D" uid="uid://biv3f67rqumak" path="res://art/level_start.png" id="5_vc1vx"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2wyuv"] bg_color = Color(0.28627452, 0.25490198, 0.22745098, 1) +[sub_resource type="ShaderMaterial" id="ShaderMaterial_c8ncy"] +shader = ExtResource("3_jwgiw") + +[sub_resource type="QuadMesh" id="QuadMesh_8ycgp"] +size = Vector2(1280, 720) + [node name="OldComputer" type="CanvasLayer" unique_id=1944134941] +visible = false script = ExtResource("1_6jyhx") [node name="BackgroundPanel" type="Panel" parent="." unique_id=1876350245] +self_modulate = Color(1, 1, 1, 0) anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = -60.0 +offset_top = -2.0 +offset_right = -60.0 +offset_bottom = -2.0 grow_horizontal = 2 grow_vertical = 2 +scale = Vector2(1.0710422, 1.0710422) [node name="ForegroundPanel" type="Panel" parent="BackgroundPanel" unique_id=1797726425] +self_modulate = Color(0, 0, 0, 0.48235294) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -25,16 +43,40 @@ grow_horizontal = 2 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_2wyuv") +[node name="PointLight2D" type="PointLight2D" parent="BackgroundPanel/ForegroundPanel" unique_id=256109389] +z_index = 1 +position = Vector2(640, 359) +scale = Vector2(27.099607, 14.530945) +color = Color(0.18106043, 0.0350378, 0.10814872, 1) +energy = 16.0 +texture = ExtResource("2_eta3k") + [node name="ScreenPanel" type="Panel" parent="BackgroundPanel/ForegroundPanel" unique_id=528166777] +self_modulate = Color(0.8490501, 0.00019233048, 0.74149054, 1) layout_mode = 0 offset_left = 82.0 -offset_top = 42.0 +offset_top = 114.00001 offset_right = 122.81183 -offset_bottom = 85.64739 +offset_bottom = 152.69244 scale = Vector2(27.099607, 14.530945) +[node name="OldComputerShader" type="CanvasLayer" parent="BackgroundPanel/ForegroundPanel/ScreenPanel" unique_id=1485637757] +layer = 2 +visible = false + +[node name="WarpShader" type="MeshInstance2D" parent="BackgroundPanel/ForegroundPanel/ScreenPanel/OldComputerShader" unique_id=1387834412] +material = SubResource("ShaderMaterial_c8ncy") +position = Vector2(624, 351) +mesh = SubResource("QuadMesh_8ycgp") +script = ExtResource("4_eta3k") + +[node name="Sprite2D" type="Sprite2D" parent="BackgroundPanel/ForegroundPanel/ScreenPanel/OldComputerShader/WarpShader" unique_id=1356334288] +visible = false +texture = ExtResource("5_vc1vx") + [node name="Sprite2D" type="Sprite2D" parent="BackgroundPanel" unique_id=856709145] -position = Vector2(618, 349) +position = Vector2(639.5, 360.50003) +scale = Vector2(0.99765617, 0.99305564) texture = ExtResource("2_2wyuv") [node name="ConsoleText" type="RichTextLabel" parent="." unique_id=715961645] @@ -43,12 +85,14 @@ 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 +offset_left = -542.0 +offset_top = -306.0 +offset_right = 410.0 +offset_bottom = 241.0 grow_horizontal = 2 grow_vertical = 2 +rotation = -0.008004447 +scale = Vector2(1.0710422, 1.0710422) bbcode_enabled = true text = "[center]>> Pharaoh OS 2000 Boot Sequence >> WARN: Detected anomalies! diff --git a/art/computer/backlight.png b/art/computer/backlight.png new file mode 100644 index 0000000..6224bed Binary files /dev/null and b/art/computer/backlight.png differ diff --git a/art/computer/backlight.png.import b/art/computer/backlight.png.import new file mode 100644 index 0000000..65a70ad --- /dev/null +++ b/art/computer/backlight.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b2slrh32njho4" +path="res://.godot/imported/backlight.png-3ae98dbe8b342fc3c6f850ffaa0b9746.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/computer/backlight.png" +dest_files=["res://.godot/imported/backlight.png-3ae98dbe8b342fc3c6f850ffaa0b9746.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/high_quality_mode=0 +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +mipmaps/preserve_alpha_test_coverage=false +mipmaps/alpha_test_threshold=0.5 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/dialogue.gd b/dialogue.gd index f28c3fc..4d8fe5c 100644 --- a/dialogue.gd +++ b/dialogue.gd @@ -7,7 +7,7 @@ extends Control func show_text(text: String) -> Dialogue: visible = true - $Panel/Text.text = "[center]%s" % text + $Panel/Text.text = "[center][color=BLACK]%s" % text return self func dismiss_after(secs: float) -> Dialogue: diff --git a/fonts/FingerPaint-Regular.ttf b/fonts/FingerPaint-Regular.ttf new file mode 100644 index 0000000..307c76f Binary files /dev/null and b/fonts/FingerPaint-Regular.ttf differ diff --git a/fonts/FingerPaint-Regular.ttf.import b/fonts/FingerPaint-Regular.ttf.import new file mode 100644 index 0000000..d808c60 --- /dev/null +++ b/fonts/FingerPaint-Regular.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bj1s6gf1eckfn" +path="res://.godot/imported/FingerPaint-Regular.ttf-f284ebe5db8c3be027811309a29fe50f.fontdata" + +[deps] + +source_file="res://fonts/FingerPaint-Regular.ttf" +dest_files=["res://.godot/imported/FingerPaint-Regular.ttf-f284ebe5db8c3be027811309a29fe50f.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 index c81eccd..a53ffcf 100644 --- a/fonts/OFL.txt +++ b/fonts/OFL.txt @@ -1,4 +1,4 @@ -Copyright (c) 2010, Kimberly Geswein (kimberlygeswein.com) +Copyright (c) 2011 by Ralph du Carrois, with Reserved Font Name 'Finger Paint' 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: diff --git a/old_computer.gd b/old_computer.gd index 436a066..1ab87e4 100644 --- a/old_computer.gd +++ b/old_computer.gd @@ -45,6 +45,8 @@ func has_finished_initialization() -> bool: func open() -> void: visible = true + $BackgroundPanel/ForegroundPanel/ScreenPanel/OldComputerShader.show() + %Player2D/Parallax2D.hide() func printline(line: String) -> void: open() @@ -55,3 +57,5 @@ func close() -> void: get_tree().quit() visible = false + $BackgroundPanel/ForegroundPanel/ScreenPanel/OldComputerShader.hide() + %Player2D/Parallax2D.show() diff --git a/sign.tscn b/sign.tscn index bfa3a2f..526ada2 100644 --- a/sign.tscn +++ b/sign.tscn @@ -9,6 +9,7 @@ size = Vector2(26, 32) [node name="Sign" type="Node2D" unique_id=1201409437] script = ExtResource("1_q3tny") +text_dismiss_timer = 3 [node name="Sprite2D" type="Sprite2D" parent="." unique_id=1680278216] position = Vector2(0, -16) diff --git a/themes/jump_rope_ui.tres b/themes/jump_rope_ui.tres index f777e13..f169e2e 100644 --- a/themes/jump_rope_ui.tres +++ b/themes/jump_rope_ui.tres @@ -1,10 +1,10 @@ [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"] +[ext_resource type="FontFile" uid="uid://bj1s6gf1eckfn" path="res://fonts/FingerPaint-Regular.ttf" id="1_wnb1w"] [resource] default_font = ExtResource("1_wnb1w") -default_font_size = 80 +default_font_size = 40 Button/fonts/font = ExtResource("1_wnb1w") FoldableContainer/fonts/font = ExtResource("1_wnb1w") Font/colors/FontColor = Color(0.14586785, 0.14586785, 0.14586785, 1) diff --git a/world.tscn b/world.tscn index 1d8383e..3f77fe2 100644 --- a/world.tscn +++ b/world.tscn @@ -621,11 +621,11 @@ position = Vector2(247, -1261.3452) position = Vector2(247, -1371.6267) [node name="Sign" parent="." unique_id=916197061 instance=ExtResource("24_wjb0r")] -position = Vector2(-4799, 365.30762) +position = Vector2(-4799, 365.30765) sign_text = "JUMP WITH A" [node name="Sign2" parent="." unique_id=1141422640 instance=ExtResource("24_wjb0r")] -position = Vector2(-3949, 364.32294) +position = Vector2(-3949, 366.2922) sign_text = "YOU CAN JUMP AGAIN IN THE AIR" [node name="Sign3" parent="." unique_id=692258908 instance=ExtResource("24_wjb0r")] @@ -642,14 +642,13 @@ sign_text = "DASH CAN BE USED EVEN AFTER JUMPING" text_dismiss_timer = 4 [node name="Sign6" parent="." unique_id=1820216223 instance=ExtResource("24_wjb0r")] -position = Vector2(-3918, 364.32297) -sign_text = "THE CRYSTAL FADES WHEN YOU HAVE NO JUMPS REMAINING" +position = Vector2(-3918, 366.2923) +sign_text = "THE RIGHT CRYSTAL FADES WHEN YOU HAVE NO JUMPS REMAINING" text_dismiss_timer = 4 [node name="Sign7" parent="." unique_id=381974434 instance=ExtResource("24_wjb0r")] position = Vector2(-4771, 365.30762) sign_text = "HOLD A TO JUMP FURTHER" -text_dismiss_timer = 3 [node name="Block12" parent="." unique_id=888208031 instance=ExtResource("25_mc2jv")] position = Vector2(-1660, 5.9079437) @@ -658,8 +657,8 @@ position = Vector2(-1660, 5.9079437) position = Vector2(-1660, 20.677792) [node name="Sign8" parent="." unique_id=460763419 instance=ExtResource("24_wjb0r")] -position = Vector2(-2876, 364.32297) -sign_text = "THE OTHER CRYSTAL WILL GO OUT WHEN NO DASHES REMAIN" +position = Vector2(-2876, 365.30762) +sign_text = "THE LEFT CRYSTAL WILL GO OUT WHEN NO DASHES REMAIN" text_dismiss_timer = 4 [node name="HiddenSign" parent="." unique_id=1914486910 instance=ExtResource("26_bo7i5")]