Skip to content

Commit

Permalink
Adding web to spider and moving treetops to foreground
Browse files Browse the repository at this point in the history
  • Loading branch information
Gravedigger7789 committed Nov 23, 2021
1 parent 4d00987 commit 80008be
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/Level/Sandbox1.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ position = Vector2( 768, 320 )
obstacles = [ ExtResource( 7 ), ExtResource( 5 ) ]

[node name="PickupSpawner" parent="." instance=ExtResource( 3 )]
position = Vector2( 768, 229.081 )
position = Vector2( 768, 224 )
obstacles = [ ExtResource( 6 ), ExtResource( 8 ) ]
10 changes: 0 additions & 10 deletions src/Level/TreeBackground.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@ extends ParallaxBackground

export var velocity: Vector2 = Vector2(-400, 0)

onready var tree_spawner: SpriteSpawner = $TreeSpawner
onready var shrub_spawner: SpriteSpawner = $ShrubSpawner
onready var foliage_spawner: SpriteSpawner = $FoliageSpawner


func _ready():
tree_spawner.sprite_velocity = velocity
shrub_spawner.sprite_velocity = velocity
foliage_spawner.sprite_velocity = velocity


func _process(delta: float) -> void:
var offset: Vector2 = get_scroll_offset() + velocity * delta * Difficulty.speed_modifier
Expand Down
18 changes: 11 additions & 7 deletions src/Level/TreeBackground.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,6 @@ centered = false
[node name="TreeSpawner" parent="ParallaxBackground" instance=ExtResource( 9 )]
position = Vector2( 832, 320 )

[node name="TreeTops" type="ParallaxLayer" parent="ParallaxBackground"]
motion_mirroring = Vector2( 640, 0 )

[node name="Sprite" type="Sprite" parent="ParallaxBackground/TreeTops"]
texture = ExtResource( 2 )
centered = false

[node name="FoliageSpawner" parent="ParallaxBackground" instance=ExtResource( 9 )]
position = Vector2( 832, 24 )
textures = [ ExtResource( 20 ), ExtResource( 19 ), ExtResource( 21 ), ExtResource( 22 ) ]
Expand Down Expand Up @@ -110,6 +103,17 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="ParallaxForeground" type="ParallaxBackground" parent="."]
layer = 10
script = ExtResource( 1 )

[node name="TreeTops" type="ParallaxLayer" parent="ParallaxForeground"]
motion_mirroring = Vector2( 640, 0 )

[node name="Sprite" type="Sprite" parent="ParallaxForeground/TreeTops"]
texture = ExtResource( 2 )
centered = false

[node name="Floor" type="StaticBody2D" parent="."]
collision_layer = 4
collision_mask = 7
Expand Down
21 changes: 17 additions & 4 deletions src/Objects/Heart.tscn
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]

[ext_resource path="res://src/Objects/Obstacle.tscn" type="PackedScene" id=1]
[ext_resource path="res://src/Objects/Heart.gd" type="Script" id=2]
[ext_resource path="res://assets/collect/fly.png" type="Texture" id=3]
[ext_resource path="res://assets/collect/web.png" type="Texture" id=4]

[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 12, 12 )

[node name="Heart" instance=ExtResource( 1 )]
script = ExtResource( 2 )

[node name="Sprite" parent="." index="0"]
[node name="ColorRect" type="ColorRect" parent="." index="0"]
margin_left = -1.0
margin_top = -240.0
margin_right = 1.0
color = Color( 0.4, 0.4, 0.4, 1 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Sprite2" type="Sprite" parent="." index="1"]
texture = ExtResource( 4 )

[node name="Sprite" parent="." index="2"]
texture = ExtResource( 3 )

[node name="CollisionShape2D" parent="." index="1"]
[node name="CollisionShape2D" parent="." index="3"]
position = Vector2( 0, 0 )
shape = SubResource( 1 )

[node name="VisibilityNotifier2D" parent="." index="2"]
[node name="VisibilityNotifier2D" parent="." index="4"]
rect = Rect2( -12, -12, 24, 24 )

0 comments on commit 80008be

Please sign in to comment.