Merge branch 'main' of http://git.nanoyagi.com/NanoYagi/JumpRopeOldTech

Dialogue.tscn

@@ -1,8 +1,9 @@
 [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="Script" uid="uid://byj4ibepgm6oa" path="res://dialogue.gd" id="1_tgtc2"]
 
-[node name="Dialogue" type="Control" unique_id=1025022375]
+[node name="Dialogue" type="TextureRect" unique_id=733911232]
 visible = false
 layout_mode = 3
 anchors_preset = 15
@@ -10,21 +11,17 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+texture = ExtResource("1_4xg4g")
 script = ExtResource("1_tgtc2")
 
 [node name="Panel" type="Panel" parent="." unique_id=1878574619]
+self_modulate = Color(1, 1, 1, 0)
 layout_mode = 1
-anchors_preset = -1
-anchor_left = 0.179
-anchor_top = 0.683
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = -230.12001
-offset_top = -493.76
-offset_right = -230.0
-offset_bottom = -494.0
-grow_horizontal = 0
-grow_vertical = 0
+grow_horizontal = 2
+grow_vertical = 2
 
 [node name="Text" type="RichTextLabel" parent="Panel" unique_id=1494828842]
 layout_mode = 1
@@ -32,9 +29,10 @@ anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 8.0
-offset_top = 11.0
+offset_top = 265.0
 offset_right = -11.0
-offset_bottom = 4.0
+offset_bottom = -263.0
 grow_horizontal = 2
 grow_vertical = 2
 bbcode_enabled = true
+fit_content = true

art/text_box.png.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://m5dwatby4pfc"
+path="res://.godot/imported/text_box.png-d58c3f415558f4d17ce4db7eb8cebb71.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/text_box.png"
+dest_files=["res://.godot/imported/text_box.png-d58c3f415558f4d17ce4db7eb8cebb71.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

dialogue.gd

@@ -3,7 +3,7 @@ extends Control
 
 func show_text(text: String) -> Dialogue:
 	visible = true
-	$Panel/Text.text = "[font_size=28]%s" % text
+	$Panel/Text.text = "[center][font_size=28][color=BROWN]%s" % text
 	return self
 
 func dismiss_after(secs: float) -> Dialogue:

hidden_sign.gd

@@ -0,0 +1,11 @@
+extends Interactable
+
+@export var sign_text = ""
+@export var text_dismiss_timer = 2
+
+func _ready() -> void:
+	add_to_group("Hidden")
+	modulate = Color.DARK_CYAN
+	
+func _on_interacted() -> void:
+	%Dialogue.show_text(sign_text).dismiss_after(text_dismiss_timer)

hidden_sign.gd.uid

@@ -0,0 +1 @@
+uid://b64hyvumk366h

hidden_sign.tscn

@@ -0,0 +1,30 @@
+[gd_scene format=3 uid="uid://dt43trxumfv0i"]
+
+[ext_resource type="Script" uid="uid://b64hyvumk366h" path="res://hidden_sign.gd" id="1_a20ku"]
+[ext_resource type="Texture2D" uid="uid://djlqqmqpsd0kc" path="res://art/sign.png" id="2_soj2u"]
+[ext_resource type="Texture2D" uid="uid://d0cd1alr8k706" path="res://art/interact_button.png" id="3_7o2b3"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_eumkw"]
+size = Vector2(26, 32)
+
+[node name="HiddenSign" type="Node2D" unique_id=1201409437]
+script = ExtResource("1_a20ku")
+
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1680278216]
+position = Vector2(0, -16)
+texture = ExtResource("2_soj2u")
+
+[node name="Area2D" type="Area2D" parent="Sprite2D" unique_id=2050186824]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D/Area2D" unique_id=1560168165]
+shape = SubResource("RectangleShape2D_eumkw")
+
+[node name="ButtonPrompt" type="Sprite2D" parent="Sprite2D" unique_id=1864817335]
+visible = false
+position = Vector2(0, -8.000002)
+scale = Vector2(0.8, 0.8)
+texture = ExtResource("3_7o2b3")
+
+[connection signal="interacted" from="." to="." method="_on_interacted"]
+[connection signal="body_entered" from="Sprite2D/Area2D" to="." method="_on_approach"]
+[connection signal="body_exited" from="Sprite2D/Area2D" to="." method="_on_abandon"]

player_2d.gd

@@ -26,6 +26,7 @@ func _ready() -> void:
 	spawn_point = position
 	DisplayServer.window_set_title("JUMPS EQUALS JUMPS")
 	give_objective("sarc", 0, "Open the Sarcophagus")
+	#%Dialogue.show_text("Hello world!").dismiss_after(2)
 	
 func refresh_dash(new_dashes):
 	if new_dashes:
@@ -139,6 +140,9 @@ func _process(delta: float) -> void:
 			$Jetpack/DoubleJumpSound.play()
 		if jumps == 0:
 			$Jetpack/JumpIndicator.hide()
+	
+	if Input.is_action_just_released("jump"):
+		velocity.y = -(0.001 * JUMP_VELOCITY)
 		
 	if Input.is_action_pressed("jump") and is_on_wall_only():
 			print("WALL HANGING")
@@ -155,9 +159,7 @@ func _process(delta: float) -> void:
 		$Sprite2D/HatSprite.flip_h = false
 		
 	if Input.is_action_pressed("dash_down") and is_on_floor():
-		print("Crouching")
 		$Sprite2D.play("crouch")
-		print("MODULATE: " + str($Parallax2D/Sprite2D.modulate))
 		$Parallax2D/Sprite2D.modulate = Color.CYAN
 		
 		for hidden_object in get_tree().get_nodes_in_group("Hidden"):

project.godot

@@ -123,7 +123,7 @@ move_left={
 )]
 }
 jump={
-"deadzone": 0.2,
+"deadzone": 0.0,
 "events": [Object(InputEventJoypadButton,
 "resource_local_to_scene": false,
 "resource_name": "",

sign.gd

@@ -2,6 +2,6 @@ extends Interactable
 
 @export var sign_text = ""
 @export var text_dismiss_timer = 2
-
+	
 func _on_interacted() -> void:
 	%Dialogue.show_text(sign_text).dismiss_after(text_dismiss_timer)

world.tscn

@@ -24,6 +24,8 @@
 [ext_resource type="PackedScene" uid="uid://ch0417iiviaxb" path="res://hidden_horizontal_long_block.tscn" id="21_bc84e"]
 [ext_resource type="PackedScene" uid="uid://be757jqlv785s" path="res://hidden_coin.tscn" id="22_wukud"]
 [ext_resource type="PackedScene" uid="uid://bnkbkfto83owf" path="res://sign.tscn" id="24_wjb0r"]
+[ext_resource type="PackedScene" uid="uid://byfgwmvln8ukh" path="res://vertical_block.tscn" id="25_mc2jv"]
+[ext_resource type="PackedScene" uid="uid://dt43trxumfv0i" path="res://hidden_sign.tscn" id="26_bo7i5"]
 
 [node name="World" type="Node2D" unique_id=1327991900]
 process_mode = 1
@@ -51,7 +53,7 @@ position = Vector2(1657, -18.708487)
 position = Vector2(2861, -19.693142)
 
 [node name="LongerBlock8" parent="StartingArea" unique_id=74356311 instance=ExtResource("6_dwbse")]
-position = Vector2(3174, -424.38696)
+position = Vector2(3174, -442.1108)
 
 [node name="LongerBlock11" parent="StartingArea" unique_id=624436532 instance=ExtResource("6_dwbse")]
 position = Vector2(3390, -1028.9663)
@@ -72,7 +74,7 @@ position = Vector2(1609, -26.585724)
 position = Vector2(2808, -27.570404)
 
 [node name="Pharaoh5" parent="StartingArea" unique_id=2064737854 instance=ExtResource("15_hiqwa")]
-position = Vector2(3089, -430.29498)
+position = Vector2(3089, -448.01883)
 
 [node name="Tutorial" type="Node2D" parent="." unique_id=1391494772]
 
@@ -436,9 +438,10 @@ script = ExtResource("3_wse8f")
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 586.0
-offset_right = -1097.0
-offset_bottom = 2.0
+offset_left = 11.0
+offset_top = 9.0
+offset_right = -1086.0
+offset_bottom = -575.0
 grow_horizontal = 2
 grow_vertical = 2
 bbcode_enabled = true
@@ -467,11 +470,14 @@ script = ExtResource("14_70uel")
 
 [node name="Dialogue" parent="CanvasLayer" unique_id=1025022375 instance=ExtResource("19_26xuy")]
 unique_name_in_owner = true
-offset_left = 228.0
-offset_top = 499.0
-offset_right = 231.0
-offset_bottom = 491.0
+visible = false
+offset_left = 3.9999995
+offset_top = 550.99994
+offset_right = 268.38086
+offset_bottom = -7.640442
 rotation = 4.9367074e-05
+scale = Vector2(0.8267815, 0.8267815)
+stretch_mode = 5
 
 [node name="Pharaoh" parent="." unique_id=44054531 instance=ExtResource("15_hiqwa")]
 position = Vector2(192, 177.23824)
@@ -482,6 +488,12 @@ position = Vector2(6338, -42.34024)
 [node name="OldComputer" parent="." unique_id=1951254108 instance=ExtResource("19_cbp6q")]
 unique_name_in_owner = true
 
+[node name="Sign9" parent="." unique_id=573430453 instance=ExtResource("24_wjb0r")]
+position = Vector2(-1387, -59.0794)
+scale = Vector2(1, 0.98465663)
+sign_text = "HOLDING DOWN WILL MEDITATE"
+text_dismiss_timer = 4
+
 [node name="Block" parent="." unique_id=226580978 instance=ExtResource("2_036b0")]
 position = Vector2(6637, -253.12886)
 
@@ -590,6 +602,49 @@ position = Vector2(247, -1371.6267)
 
 [node name="Sign" parent="." unique_id=916197061 instance=ExtResource("24_wjb0r")]
 position = Vector2(-4799, 365.30762)
-sign_text = "TEST SIGN 1"
+sign_text = "JUMP WITH A"
+
+[node name="Sign2" parent="." unique_id=1141422640 instance=ExtResource("24_wjb0r")]
+position = Vector2(-3949, 364.32294)
+sign_text = "YOU CAN JUMP AGAIN IN THE AIR"
+
+[node name="Sign3" parent="." unique_id=692258908 instance=ExtResource("24_wjb0r")]
+position = Vector2(-2941, 365.30762)
+sign_text = "DASH WITH SHIFT WHILE MOVING IN A DIRECTION"
+
+[node name="Sign4" parent="." unique_id=335524344 instance=ExtResource("24_wjb0r")]
+position = Vector2(-1732, 364.32297)
+sign_text = "TOUCHING A FLOOR, WALL, OR EVEN CEILING WILL REFRESH YOUR AIR JUMP"
+
+[node name="Sign5" parent="." unique_id=349011535 instance=ExtResource("24_wjb0r")]
+position = Vector2(-2908, 365.30762)
+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"
+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, -38.401608)
+
+[node name="Block13" parent="." unique_id=501875762 instance=ExtResource("25_mc2jv")]
+position = Vector2(-1660, -23.63176)
+
+[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"
+text_dismiss_timer = 4
+
+[node name="HiddenSign" parent="." unique_id=1914486910 instance=ExtResource("26_bo7i5")]
+position = Vector2(-1351, -59.0794)
+sign_text = "MEDITATING REVEALS SECRETS"
+text_dismiss_timer = 4
 
 [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]