Merged with main and fixed merge conflicts

This commit is contained in:
VoidTwo
2021-11-29 13:22:17 -06:00
161 changed files with 2958 additions and 576 deletions

View File

@@ -0,0 +1,34 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://Sprites/Enemies/pink_snowman.png" type="Texture" id=1]
[ext_resource path="res://Enemies/snowmen_enemy.gd" type="Script" id=2]
[sub_resource type="CapsuleShape2D" id=1]
radius = 6.0
height = 5.0
[sub_resource type="CircleShape2D" id=2]
radius = 56.0659
[node name="snowmen_enemy" type="KinematicBody2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
shape = SubResource( 2 )
[node name="Timer" type="Timer" parent="."]
autostart = true
[connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
[connection signal="body_exited" from="Area2D" to="." method="_on_Area2D_body_exited"]
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]