Skip to content

Commit

Permalink
some final fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
angad-k committed Dec 27, 2021
1 parent 75590ce commit d52ba89
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 17 deletions.
7 changes: 4 additions & 3 deletions scripts/generator.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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):

Expand Down
22 changes: 11 additions & 11 deletions set_scenes/initial_set.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down
1 change: 0 additions & 1 deletion ui_scenes/game_over.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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="."]
Expand Down
4 changes: 2 additions & 2 deletions utility_scenes/main_scene.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
2 changes: 2 additions & 0 deletions utility_scenes/obstacles/logs.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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 )

Expand Down
2 changes: 2 additions & 0 deletions utility_scenes/obstacles/stump.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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="."]
Expand All @@ -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 )

Expand Down
2 changes: 2 additions & 0 deletions utility_scenes/obstacles/thorns.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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 )

Expand Down
3 changes: 3 additions & 0 deletions utility_scenes/player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down

0 comments on commit d52ba89

Please sign in to comment.