diff --git a/scripts/generator.gd b/scripts/generator.gd index 95962d0..5673d80 100644 --- a/scripts/generator.gd +++ b/scripts/generator.gd @@ -4,7 +4,7 @@ extends Node # Declare member variables here. Examples: # var a = 2 # var b = "text" -var thread +#var thread const test_set1 = preload("res://set_scenes/forest_set.tscn") const test_set2 = preload("res://set_scenes/swing_set.tscn") # Called when the node enters the scene tree for the first time. @@ -13,8 +13,9 @@ func _ready(): pass # Replace with function body. func trigger_generation(p_position): - thread = Thread.new() - thread.start(self, "load_set_scene", p_position) + #thread = Thread.new() + #thread.start(self, "load_set_scene", p_position) + call_deferred("load_set_scene", p_position) func load_set_scene(p_position): diff --git a/set_scenes/initial_set.tscn b/set_scenes/initial_set.tscn index 60b7e04..b01dadd 100644 --- a/set_scenes/initial_set.tscn +++ b/set_scenes/initial_set.tscn @@ -25,36 +25,36 @@ texture = ExtResource( 3 ) [node name="Sprite5" type="Sprite" parent="."] position = Vector2( 378, -102 ) scale = Vector2( 0.1, 0.1 ) -z_index = 1 +z_index = -1 texture = ExtResource( 5 ) [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 60, -7 ) -scale = Vector2( 0.1, 0.1 ) +position = Vector2( 60, -8 ) +scale = Vector2( 0.1, 0.15 ) z_index = 1 texture = ExtResource( 1 ) [node name="Sprite6" type="Sprite" parent="."] -position = Vector2( -7, -7 ) -scale = Vector2( 0.1, 0.1 ) +position = Vector2( -7, -8 ) +scale = Vector2( 0.1, 0.15 ) z_index = 1 texture = ExtResource( 1 ) [node name="Sprite2" type="Sprite" parent="."] -position = Vector2( 178, -7 ) -scale = Vector2( 0.1, 0.1 ) +position = Vector2( 178, -8 ) +scale = Vector2( 0.1, 0.15 ) z_index = 1 texture = ExtResource( 1 ) [node name="Sprite3" type="Sprite" parent="."] -position = Vector2( 296, -7 ) -scale = Vector2( 0.1, 0.1 ) +position = Vector2( 296, -8 ) +scale = Vector2( 0.1, 0.15 ) z_index = 1 texture = ExtResource( 1 ) [node name="Sprite4" type="Sprite" parent="."] -position = Vector2( 413, -7 ) -scale = Vector2( 0.1, 0.1 ) +position = Vector2( 413, -8 ) +scale = Vector2( 0.1, 0.15 ) z_index = 1 texture = ExtResource( 1 ) diff --git a/ui_scenes/game_over.tscn b/ui_scenes/game_over.tscn index e5bd92a..c16a95a 100644 --- a/ui_scenes/game_over.tscn +++ b/ui_scenes/game_over.tscn @@ -17,7 +17,6 @@ script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] position = Vector2( 515, 297 ) -scale = Vector2( 0.854167, 0.901294 ) texture = ExtResource( 1 ) [node name="Label" type="Label" parent="."] diff --git a/utility_scenes/main_scene.tscn b/utility_scenes/main_scene.tscn index c0039da..b81c262 100644 --- a/utility_scenes/main_scene.tscn +++ b/utility_scenes/main_scene.tscn @@ -111,11 +111,11 @@ position = Vector2( 2749, -406 ) [node name="start" type="Node2D" parent="."] [node name="Sprite" type="Sprite" parent="start"] -position = Vector2( 2948, -604 ) +position = Vector2( 2963, -604 ) scale = Vector2( 0.35, 0.35 ) texture = ExtResource( 6 ) [node name="Sprite2" type="Sprite" parent="start"] -position = Vector2( 2953, -542 ) +position = Vector2( 2968, -542 ) scale = Vector2( 0.35, 0.35 ) texture = ExtResource( 11 ) diff --git a/utility_scenes/obstacles/logs.tscn b/utility_scenes/obstacles/logs.tscn index c4e444d..c8f7e28 100644 --- a/utility_scenes/obstacles/logs.tscn +++ b/utility_scenes/obstacles/logs.tscn @@ -39,6 +39,7 @@ color_ramp = SubResource( 3 ) script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] +modulate = Color( 0.0705882, 0.0901961, 2.00392, 1 ) position = Vector2( 2, -44 ) scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 2 ) @@ -47,6 +48,7 @@ texture = ExtResource( 2 ) position = Vector2( -1, 50 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +visible = false position = Vector2( 4, -95.5 ) shape = SubResource( 1 ) diff --git a/utility_scenes/obstacles/stump.tscn b/utility_scenes/obstacles/stump.tscn index 77d8c0d..7b20993 100644 --- a/utility_scenes/obstacles/stump.tscn +++ b/utility_scenes/obstacles/stump.tscn @@ -7,6 +7,7 @@ extents = Vector2( 30, 41.5 ) [node name="Stump" type="Node2D"] +modulate = Color( 0, 0.0509804, 2.24706, 1 ) script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] @@ -18,6 +19,7 @@ texture = ExtResource( 1 ) position = Vector2( -1, 50 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +visible = false position = Vector2( 2, -92.5 ) shape = SubResource( 1 ) diff --git a/utility_scenes/obstacles/thorns.tscn b/utility_scenes/obstacles/thorns.tscn index cd23f01..b8008c0 100644 --- a/utility_scenes/obstacles/thorns.tscn +++ b/utility_scenes/obstacles/thorns.tscn @@ -11,6 +11,7 @@ extents = Vector2( 54.5, 45 ) script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] +modulate = Color( 1, 1, 2.7, 1 ) position = Vector2( 0, -48 ) scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 2 ) @@ -19,6 +20,7 @@ texture = ExtResource( 2 ) position = Vector2( -1, 50 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +visible = false position = Vector2( 4.5, -95 ) shape = SubResource( 1 ) diff --git a/utility_scenes/player.tscn b/utility_scenes/player.tscn index cd8e017..277b404 100644 --- a/utility_scenes/player.tscn +++ b/utility_scenes/player.tscn @@ -111,15 +111,18 @@ tracks/1/keys = { } [node name="Player" type="KinematicBody2D"] +modulate = Color( 0.0666667, 0.0862745, 0.545098, 1 ) script = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] +visible = false shape = SubResource( 1 ) [node name="RayCast2D" type="RayCast2D" parent="."] enabled = true [node name="player_detection_range" type="Area2D" parent="."] +visible = false [node name="CollisionShape2D" type="CollisionShape2D" parent="player_detection_range"] shape = SubResource( 2 )