diff --git a/Levels/Interactives/coin.gd b/Levels/Interactives/coin.gd index c331865..6bf641c 100644 --- a/Levels/Interactives/coin.gd +++ b/Levels/Interactives/coin.gd @@ -1,9 +1,10 @@ extends Area2D -signal coin_collected +signal coin_grabbed func _on_Node2D_body_entered(body: Node) -> void: - if body.get_name() == 'Player': - emit_signal('coin_collected') - queue_free() + if body.get_name() == 'Player': + emit_signal("coin_grabbed") + print("coin!") + queue_free() diff --git a/Levels/Level 3.gd b/Levels/Level 3.gd index e7c6aee..b769949 100644 --- a/Levels/Level 3.gd +++ b/Levels/Level 3.gd @@ -1,7 +1,7 @@ extends Node2D onready var coin = preload("res://Levels/Interactives/Coin.tscn") -#onready var coin_container = get_node("YSort/coin_container") +onready var coin_container = get_node("/coin_container") #have event for timer to run out @@ -10,15 +10,20 @@ var screensize var score = 0 func _ready() -> void: - $YSort/Player.load_hud($HUD) - screensize = get_viewport_rect().size - spawn_coins(5) - return + $YSort/Player.load_hud($HUD) + screensize = get_viewport_rect().size + spawn_coins(5) + return func spawn_coins(num): - for i in range(num): - var g = coin.instance() - $'coin_container'.add_child(g) - #g.set_pos(Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40))) - g.position = Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40)) + for i in range(num): + var g = coin.instance() + $'coin_container'.add_child(g) + g.connect("coin_grabbed", self, "_on_coin_grabbed") + #g.set_pos(Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40))) + g.position = Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40)) + +func _on_coin_grabbed(): + score+=1 + print(score) diff --git a/Levels/Level 3.tscn b/Levels/Level 3.tscn index 59f3264..c0521e4 100644 --- a/Levels/Level 3.tscn +++ b/Levels/Level 3.tscn @@ -12,15 +12,15 @@ [ext_resource path="res://Music/Level_3.mp3" type="AudioStream" id=11] [ext_resource path="res://GUI/Countdown Timer.tscn" type="PackedScene" id=12] -[sub_resource type="SegmentShape2D" id=2] +[sub_resource type="SegmentShape2D" id=1] a = Vector2( 3.84175, -99.0063 ) b = Vector2( 3.44492, 75.211 ) -[sub_resource type="SegmentShape2D" id=3] +[sub_resource type="SegmentShape2D" id=2] a = Vector2( -12.0323, 29.5732 ) b = Vector2( 309.792, 29.724 ) -[sub_resource type="SegmentShape2D" id=4] +[sub_resource type="SegmentShape2D" id=3] a = Vector2( 369.611, 141.974 ) b = Vector2( 49.76, 142.724 ) @@ -68,17 +68,25 @@ position = Vector2( 231.224, 137.179 ) [node name="Enemies" type="YSort" parent="YSort"] -[node name="Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )] +[node name="Snowman 1" parent="YSort/Enemies" groups=[ +"enemies", +] instance=ExtResource( 4 )] position = Vector2( 190.316, 146.569 ) -[node name="Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )] +[node name="Snowman 2" parent="YSort/Enemies" groups=[ +"enemies", +] instance=ExtResource( 4 )] position = Vector2( 67.4812, 153.194 ) -[node name="Blue Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )] +[node name="Blue Snowman 1" parent="YSort/Enemies" groups=[ +"enemies", +] instance=ExtResource( 6 )] position = Vector2( 259.084, 49.7897 ) script = ExtResource( 7 ) -[node name="Blue Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )] +[node name="Blue Snowman 2" parent="YSort/Enemies" groups=[ +"enemies", +] instance=ExtResource( 6 )] position = Vector2( 261.1, 142.19 ) script = ExtResource( 7 ) @@ -87,28 +95,28 @@ position = Vector2( -17.4614, 141.279 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="wall"] position = Vector2( 329.803, -41.5425 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="wall1" type="StaticBody2D" parent="."] position = Vector2( 15.874, -26.1921 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="wall1"] position = Vector2( -3.71627, -0.261772 ) -shape = SubResource( 3 ) +shape = SubResource( 2 ) [node name="wall2" type="StaticBody2D" parent="."] position = Vector2( -7.93701, 71.8299 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="wall2"] position = Vector2( 8.36367, 26.9858 ) -shape = SubResource( 2 ) +shape = SubResource( 1 ) [node name="wall3" type="StaticBody2D" parent="."] position = Vector2( -49.6063, 34.526 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="wall3"] position = Vector2( 0, -4.25 ) -shape = SubResource( 4 ) +shape = SubResource( 3 ) [node name="coin_container" type="Control" parent="."] margin_right = 40.0 diff --git a/project.godot b/project.godot index 3f96c72..951352d 100644 --- a/project.godot +++ b/project.godot @@ -12,11 +12,11 @@ config_version=4 config/name="Embodiment" run/main_scene="res://Main.tscn" -run/delta_sync_after_draw=true boot_splash/image="res://Sprites/Assets/Black_Background.png" boot_splash/use_filter=false boot_splash/bg_color=Color( 0, 0, 0, 1 ) config/icon="res://Sprites/Assets/icon.png" +run/delta_sync_after_draw=true [display] @@ -31,27 +31,27 @@ window/stretch/aspect="keep" player_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) ] } player_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) ] } player_up={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) ] } player_down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) ] } screenshot={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"unicode":0,"echo":false,"script":null) ] }