diff --git a/hidden_coin.gd b/hidden_coin.gd new file mode 100644 index 0000000..022ac28 --- /dev/null +++ b/hidden_coin.gd @@ -0,0 +1,17 @@ +extends Node2D + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + add_to_group("Hidden") + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass + +func on_contact(body: Node2D) -> void: + print(body) + $AudioStreamPlayer2D.play() + visible = false + %Player2D.coins += 1 + await get_tree().create_timer(0.2).timeout + queue_free() diff --git a/hidden_coin.gd.uid b/hidden_coin.gd.uid new file mode 100644 index 0000000..f228475 --- /dev/null +++ b/hidden_coin.gd.uid @@ -0,0 +1 @@ +uid://7qhq76giye1v diff --git a/hidden_coin.tscn b/hidden_coin.tscn new file mode 100644 index 0000000..3ea0a11 --- /dev/null +++ b/hidden_coin.tscn @@ -0,0 +1,33 @@ +[gd_scene format=3 uid="uid://be757jqlv785s"] + +[ext_resource type="Script" uid="uid://7qhq76giye1v" path="res://hidden_coin.gd" id="1_4tl78"] +[ext_resource type="Texture2D" uid="uid://cr2wdd0yn1syy" path="res://art/coin_glow.png" id="2_17b6t"] +[ext_resource type="Texture2D" uid="uid://dftfxivu3peog" path="res://art/coin.png" id="3_n84lr"] +[ext_resource type="AudioStream" uid="uid://f2xmq6cgiiwj" path="res://sound/coin.wav" id="4_rxg23"] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_6qpsl"] +height = 26.0 + +[node name="HiddenCoin" type="Node2D" unique_id=1739014101] +visible = false +script = ExtResource("1_4tl78") + +[node name="PointLight2D" type="PointLight2D" parent="." unique_id=2052227436] +color = Color(0, 0.5492828, 0.05646421, 1) +energy = 4.0 +texture = ExtResource("2_17b6t") +texture_scale = 1.3 + +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=813041394] +texture = ExtResource("3_n84lr") + +[node name="Area2D" type="Area2D" parent="." unique_id=170499029] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=1865546056] +shape = SubResource("CapsuleShape2D_6qpsl") + +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="." unique_id=1778061188] +stream = ExtResource("4_rxg23") +volume_db = 1.0 + +[connection signal="body_entered" from="Area2D" to="." method="on_contact"] diff --git a/hidden_horizontal_long_block.tscn b/hidden_horizontal_long_block.tscn new file mode 100644 index 0000000..9dadd8e --- /dev/null +++ b/hidden_horizontal_long_block.tscn @@ -0,0 +1,30 @@ +[gd_scene format=3 uid="uid://ch0417iiviaxb"] + +[ext_resource type="Script" uid="uid://dcesonmhay5vo" path="res://hidden_vertical_long_block.gd" id="1_llak8"] +[ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="2_se82m"] + +[node name="HiddenHorizontalLongBlock" type="RigidBody2D" unique_id=925152188] +rotation = 3.1415927 +gravity_scale = 0.0 +freeze = true +script = ExtResource("1_llak8") + +[node name="Block" parent="." unique_id=1409784601 instance=ExtResource("2_se82m")] + +[node name="Block2" parent="." unique_id=54235726 instance=ExtResource("2_se82m")] +position = Vector2(15.999999, -9.536743e-07) + +[node name="Block3" parent="." unique_id=474997430 instance=ExtResource("2_se82m")] +position = Vector2(-15, 0) + +[node name="Block4" parent="." unique_id=1125897933 instance=ExtResource("2_se82m")] +position = Vector2(32, -1.9073486e-06) + +[node name="Block5" parent="." unique_id=1104682129 instance=ExtResource("2_se82m")] +position = Vector2(-31, 0) + +[node name="Block6" parent="." unique_id=200247655 instance=ExtResource("2_se82m")] +position = Vector2(48, -1.9073486e-06) + +[node name="Block7" parent="." unique_id=519163182 instance=ExtResource("2_se82m")] +position = Vector2(-47, 3.8146973e-06) diff --git a/hidden_vertical_long_block.gd b/hidden_vertical_long_block.gd index 08f97a3..e07aba7 100644 --- a/hidden_vertical_long_block.gd +++ b/hidden_vertical_long_block.gd @@ -3,6 +3,7 @@ extends RigidBody2D # Called when the node enters the scene tree for the first time. func _ready() -> void: add_to_group("Hidden") + modulate = Color.DARK_CYAN # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: diff --git a/pharaoh.gd b/pharaoh.gd index 0c3b3f9..7e3cb08 100644 --- a/pharaoh.gd +++ b/pharaoh.gd @@ -10,6 +10,8 @@ func _on_interacted() -> void: #Accomodate some collision antics. %Player2D.spawn_point = global_position + Vector2(0,-10) + var wanted_disk = %OldComputer.get_next_disk_num() + if not %Player2D.take_disk(wanted_disk): if wanted_disk == 1 and not %Player2D.has_objective("disk%d" % wanted_disk): %OldComputer.open() @@ -18,7 +20,7 @@ func _on_interacted() -> void: wanted_disk, "Locate data disk %d" % wanted_disk ) return - var wanted_disk = %OldComputer.get_next_disk_num() + if %Player2D.complete_objective("sarc"): %OldComputer.open() %Player2D.give_objective( diff --git a/player_2d.tscn b/player_2d.tscn index 054e43d..a1ca4c2 100644 --- a/player_2d.tscn +++ b/player_2d.tscn @@ -11,10 +11,10 @@ [ext_resource type="Texture2D" uid="uid://dyxbitw8hbd3s" path="res://art/player/crouch/frame2.png" id="7_lu0ka"] [ext_resource type="Texture2D" uid="uid://bfyd1tro3s0gl" path="res://art/player/crystal2.png" id="7_oy4pt"] [ext_resource type="Texture2D" uid="uid://dh7a1knyqn5nd" path="res://art/player/running/frame3.png" id="7_pmt5n"] -[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/idle/frame1.png" id="8_3prq1"] +[ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/running/frame1.png" id="8_3prq1"] [ext_resource type="Texture2D" uid="uid://yf13nw31k8ua" path="res://art/player/running/frame4.png" id="8_nj6as"] [ext_resource type="Texture2D" uid="uid://du5i0tg6u1lal" path="res://art/player/crystal3.png" id="8_ukfft"] -[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/idle/frame2.png" id="9_lu0ka"] +[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/running/frame2.png" id="9_lu0ka"] [ext_resource type="Texture2D" uid="uid://bko8dvawpul3c" path="res://art/player/crystal4.png" id="9_ur4nw"] [ext_resource type="Texture2D" uid="uid://m5djssna67e1" path="res://art/player/crouch/frame3.png" id="9_w0gjo"] [ext_resource type="Texture2D" uid="uid://ba4kjeulthw1g" path="res://art/hats/dunce1.png" id="10_5s8kx"] diff --git a/world.tscn b/world.tscn index 8f817b0..5354a17 100644 --- a/world.tscn +++ b/world.tscn @@ -19,6 +19,9 @@ [ext_resource type="Script" uid="uid://oyyhhy1gemg0" path="res://objectives_label.gd" id="14_ikiii"] [ext_resource type="PackedScene" uid="uid://dr8h8xij3qw2h" path="res://pharaoh.tscn" id="15_hiqwa"] [ext_resource type="PackedScene" uid="uid://bcu7ftukipiyy" path="res://OldComputer.tscn" id="19_cbp6q"] +[ext_resource type="PackedScene" uid="uid://b5ssjxl1l3fx0" path="res://hidden_vertical_long_block.tscn" id="20_26xuy"] +[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"] [node name="World" type="Node2D" unique_id=1327991900] process_mode = 1 @@ -42,7 +45,16 @@ position = Vector2(650, -17.72377) position = Vector2(1657, -18.708487) [node name="LongerBlock7" parent="StartingArea" unique_id=2057011049 instance=ExtResource("6_dwbse")] -position = Vector2(2901, -19.693142) +position = Vector2(2861, -19.693142) + +[node name="LongerBlock8" parent="StartingArea" unique_id=74356311 instance=ExtResource("6_dwbse")] +position = Vector2(3174, -424.38696) + +[node name="LongerBlock11" parent="StartingArea" unique_id=624436532 instance=ExtResource("6_dwbse")] +position = Vector2(3539, -1049.644) + +[node name="LongerBlock9" parent="StartingArea" unique_id=1224082804 instance=ExtResource("6_dwbse")] +position = Vector2(3872, -1049.644) [node name="Pharaoh" parent="StartingArea" unique_id=1201409437 instance=ExtResource("15_hiqwa")] position = Vector2(-62, -24.616333) @@ -56,6 +68,9 @@ position = Vector2(1609, -26.585724) [node name="Pharaoh4" parent="StartingArea" unique_id=764966940 instance=ExtResource("15_hiqwa")] position = Vector2(2808, -27.570404) +[node name="Pharaoh5" parent="StartingArea" unique_id=2064737854 instance=ExtResource("15_hiqwa")] +position = Vector2(3089, -430.29498) + [node name="Tutorial" type="Node2D" parent="." unique_id=1391494772] [node name="Block2" parent="Tutorial" unique_id=878186522 instance=ExtResource("2_036b0")] @@ -512,4 +527,56 @@ position = Vector2(7865, -18.128824) [node name="Pharaoh4" parent="." unique_id=439750165 instance=ExtResource("15_hiqwa")] position = Vector2(4097, 175.26888) +[node name="Pharaoh3" parent="." unique_id=998592579 instance=ExtResource("15_hiqwa")] +position = Vector2(-734, -663.65857) + +[node name="HiddenVerticalLongBlock" parent="." unique_id=550983536 instance=ExtResource("20_26xuy")] +visible = true +position = Vector2(-1553, -449.00342) +rotation = 0.0 + +[node name="HiddenVerticalLongBlock11" parent="." unique_id=1548779318 instance=ExtResource("20_26xuy")] +visible = true +position = Vector2(-1806, -161.48367) +rotation = 0.0 + +[node name="HiddenVerticalLongBlock12" parent="." unique_id=225495194 instance=ExtResource("20_26xuy")] +visible = true +position = Vector2(-2003, -321.98273) +rotation = 0.0 + +[node name="HiddenVerticalLongBlock2" parent="." unique_id=671573231 instance=ExtResource("20_26xuy")] +visible = true +position = Vector2(-4696, 435.21823) + +[node name="HiddenHorizontalLongBlock" parent="." unique_id=252771458 instance=ExtResource("21_bc84e")] +position = Vector2(-4647, 485.43573) + +[node name="Coin" parent="." unique_id=1292877109 instance=ExtResource("22_wukud")] +position = Vector2(-4646, 447.03412) + +[node name="HiddenVerticalLongBlock3" parent="." unique_id=9509488 instance=ExtResource("20_26xuy")] +position = Vector2(249, -709.93744) + +[node name="HiddenVerticalLongBlock4" parent="." unique_id=1392186992 instance=ExtResource("20_26xuy")] +position = Vector2(249, -600.64056) + +[node name="HiddenVerticalLongBlock5" parent="." unique_id=1233145931 instance=ExtResource("20_26xuy")] +position = Vector2(248, -822.1883) + +[node name="HiddenVerticalLongBlock6" parent="." unique_id=1910226562 instance=ExtResource("20_26xuy")] +position = Vector2(248, -932.46985) + +[node name="HiddenVerticalLongBlock7" parent="." unique_id=808086224 instance=ExtResource("20_26xuy")] +position = Vector2(248, -1149.0942) + +[node name="HiddenVerticalLongBlock8" parent="." unique_id=1783201320 instance=ExtResource("20_26xuy")] +position = Vector2(248, -1039.7974) + +[node name="HiddenVerticalLongBlock9" parent="." unique_id=1967440515 instance=ExtResource("20_26xuy")] +position = Vector2(247, -1261.3452) + +[node name="HiddenVerticalLongBlock10" parent="." unique_id=170869907 instance=ExtResource("20_26xuy")] +position = Vector2(247, -1371.6267) + [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]