Fix merge conflicts when trying to merge main into forest

This commit is contained in:
Jasmine Hyder committed 2021-12-08 14:43:39 -06:00
commit 6d9267d23b
131 files changed
+3271 -294

No files matched your search

+24
View File
@@ -0,0 +1,24 @@
extends Node2D
# Declare member variables here. Examples:
# var a: int = 2
# var b: String = "text"
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta: float) -> void:
# pass
func _on_AnimationPlayer_animation_finished(anim_name: String) -> void:
$GemSprite.visible = false
func _on_AnimationPlayer_animation_started(anim_name: String) -> void:
$GemSprite.visible = true
+34
View File
@@ -0,0 +1,34 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Sprites/Assets/Resources_Basic.png" type="Texture" id=1]
[ext_resource path="res://Levels/Interactables/Gem.gd" type="Script" id=2]
[sub_resource type="Animation" id=3]
resource_name = "rise"
length = 1.2
tracks/0/type = "value"
tracks/0/path = NodePath("GemSprite:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.3, 0.8, 1.2 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 0,
"values": [ Vector2( 0, 0 ), Vector2( 0, -10 ), Vector2( 0, -18 ), Vector2( 0, -20 ) ]
}
[node name="Gem" type="Node2D"]
script = ExtResource( 2 )
[node name="GemSprite" type="Sprite" parent="."]
position = Vector2( 0, -20 )
texture = ExtResource( 1 )
region_enabled = true
region_rect = Rect2( 2, 50, 20, 20 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/rise = SubResource( 3 )
[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]
+23
View File
@@ -0,0 +1,23 @@
extends StaticBody2D
export var alignment: String = 'V'
func _ready() -> void:
if not alignment in ['V', 'H']:
print('Silver Barrier rotation needs to be "V" or "H"')
elif alignment == 'H':
rotation_degrees = 90
return
func _on_unlock_body_entered(body: Node) -> void:
if not 'player' in body.get_groups():
return
if body.has_item('Silver Key'):
body.remove_item('Silver Key')
$Sprite.animation = 'open'
$Collision.set_deferred('disabled', true)
$Unlock.set_deferred('monitoring', false)
return
+51
View File
@@ -0,0 +1,51 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://Sprites/Levels/Interactables/Silver_Barrier_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Interactables/Silver_Barrier_Closed.png" type="Texture" id=2]
[ext_resource path="res://Levels/Interactables/Silver Barrier.gd" type="Script" id=3]
[sub_resource type="SpriteFrames" id=1]
animations = [ {
"frames": [ ExtResource( 1 ) ],
"loop": true,
"name": "open",
"speed": 5.0
}, {
"frames": [ ExtResource( 2 ) ],
"loop": true,
"name": "closed",
"speed": 5.0
} ]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 6, 8 )
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 12, 10 )
[node name="Silver Barrier" type="StaticBody2D"]
collision_mask = 0
script = ExtResource( 3 )
[node name="Sprite" type="AnimatedSprite" parent="."]
light_mask = 8
frames = SubResource( 1 )
animation = "closed"
[node name="Collision" type="CollisionShape2D" parent="."]
light_mask = 0
shape = SubResource( 2 )
[node name="Unlock" type="Area2D" parent="."]
light_mask = 0
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Unlock"]
visible = false
light_mask = 0
shape = SubResource( 3 )
[connection signal="body_entered" from="Unlock" to="." method="_on_unlock_body_entered"]
@@ -0,0 +1,9 @@
extends Area2D
func _on_silver_key_pickup_body_entered(body: Node):
if 'player' in body.get_groups():
body.add_item('Silver Key')
call_deferred('queue_free')
return
@@ -0,0 +1,23 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Sprites/Levels/Interactables/Silver_Key.png" type="Texture" id=1]
[ext_resource path="res://Levels/Interactables/Silver Key Pickup.gd" type="Script" id=2]
[sub_resource type="CircleShape2D" id=1]
[node name="Silver Key Pickup" type="Area2D"]
collision_layer = 0
collision_mask = 2
monitorable = false
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
centered = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false
position = Vector2( 8, 8 )
shape = SubResource( 1 )
[connection signal="body_entered" from="." to="." method="_on_silver_key_pickup_body_entered"]
+17
View File
@@ -0,0 +1,17 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Sprites/Assets/blue_star.png" type="Texture" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 7.95021, 8.07351 )
[node name="Star" type="RigidBody2D"]
collision_layer = 4
collision_mask = 0
mode = 1
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
+33
View File
@@ -0,0 +1,33 @@
extends Sprite
var is_player_inside: bool = false
var is_opened: bool = false
var has_gem: bool = true
signal gem_collected
# Declare member variables here. Examples:
# var a: int = 2
# var b: String = "text"
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta: float) -> void:
# pass
func _on_Player_Detector_area_entered(area: Area2D) -> void:
if area.get_parent().name == 'Player':
if is_opened == false:
$chestClosed.visible = false
$chestOpened.visible = true
$Gem.visible = true
$Gem/AnimationPlayer.play('rise')
is_opened = true
has_gem = false
emit_signal('gem_collected')
+36
View File
@@ -0,0 +1,36 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Sprites/Levels/Interactables/Treasure_Chest_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Interactables/Treasure_Chest_Closed.png" type="Texture" id=2]
[ext_resource path="res://Levels/Interactables/Gem.tscn" type="PackedScene" id=3]
[ext_resource path="res://Levels/Interactables/Treasure Chest.gd" type="Script" id=4]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 21.3333, 17.3333 )
[node name="TreasureChest" type="Sprite" groups=["enemies"]]
script = ExtResource( 4 )
[node name="chestOpened" type="Sprite" parent="."]
visible = false
texture = ExtResource( 1 )
[node name="chestClosed" type="Sprite" parent="."]
texture = ExtResource( 2 )
[node name="Gem" parent="." instance=ExtResource( 3 )]
visible = false
[node name="Player Detector" type="Area2D" parent="."]
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
visible = false
position = Vector2( 1, -1 )
scale = Vector2( 1.5, 1.5 )
shape = SubResource( 1 )
[connection signal="area_entered" from="Player Detector" to="." method="_on_Player_Detector_area_entered"]
+17
View File
@@ -0,0 +1,17 @@
extends Node2D
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
$YSort/Player.load_hud($HUD)
return
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
+66
View File
@@ -0,0 +1,66 @@
[gd_scene load_steps=8 format=2]
[ext_resource path="res://Sprites/Assets/galaxy_background.png" type="Texture" id=1]
[ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=2]
[ext_resource path="res://GUI/Pause Screen.tscn" type="PackedScene" id=3]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=4]
[ext_resource path="res://Levels/Level 1.gd" type="Script" id=5]
[ext_resource path="res://Enemies/Dark Matter.tscn" type="PackedScene" id=6]
[ext_resource path="res://Levels/Interactables/Star.tscn" type="PackedScene" id=7]
[node name="Space Level" type="Node2D"]
script = ExtResource( 5 )
[node name="TextureRect" type="TextureRect" parent="."]
margin_right = 160.0
margin_bottom = 90.0
rect_scale = Vector2( 2.5, 2.5 )
texture = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="YSort" type="YSort" parent="."]
[node name="Player" parent="YSort" instance=ExtResource( 4 )]
position = Vector2( 178.673, 89.1493 )
[node name="Camera2D" type="Camera2D" parent="YSort/Player"]
current = true
limit_left = 0
limit_top = 0
limit_right = 400
limit_bottom = 225
[node name="Enemies" type="YSort" parent="YSort"]
[node name="Dark Matter" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 97.0154, 82.0323 )
collision_mask = 0
[node name="Dark Matter2" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 205.006, 50.8542 )
[node name="Dark Matter3" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 321.547, 98.5301 )
[node name="Dark Matter4" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 72.0435, 202.887 )
[node name="Dark Matter5" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 289.233, 198.649 )
[node name="Stars" type="YSort" parent="YSort"]
[node name="Star" parent="YSort/Stars" instance=ExtResource( 7 )]
position = Vector2( 140.092, 133.724 )
[node name="Star2" parent="YSort/Stars" instance=ExtResource( 7 )]
position = Vector2( 278.639, 33.3731 )
[node name="Star3" parent="YSort/Stars" instance=ExtResource( 7 )]
position = Vector2( 323.666, 161.038 )
[node name="HUD" parent="." instance=ExtResource( 2 )]
[node name="Pause Screen" parent="." instance=ExtResource( 3 )]
+12 -12
View File
@@ -3,22 +3,22 @@ extends Node2D
var gems: int = 4
func _ready() -> void:
#$YSort/Player.position = get_viewport_rect().size / 2
$YSort/Player.load_hud($HUD)
return
#$YSort/Player.position = get_viewport_rect().size / 2
$YSort/Player.load_hud($HUD)
return
func _on_TreasureChest_gem_collected() -> void:
gems -= 1
if gems == 0:
$YSort/Items/Door/doorClosed.visible = false
$YSort/Items/Door/doorOpened.visible = true
$DoorCollision.layers = 5
gems -= 1
if gems == 0:
$YSort/Items/Door/doorClosed.visible = false
$YSort/Items/Door/doorOpened.visible = true
$DoorCollision.layers = 5
func _on_NextArea_area_entered(area: Area2D) -> void:
if area.get_parent().name == 'Player':
$YSort/Player.position.x = 195
$YSort/Player.position.y = -335
if area.get_parent().name == 'Player':
$YSort/Player.position.x = 195
$YSort/Player.position.y = -335
+22 -7
View File
@@ -1,10 +1,25 @@
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=31 format=2]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_12.png" type="Texture" id=1]
[ext_resource path="res://Enemies/Hellhound.tscn" type="PackedScene" id=2]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_03.png" type="Texture" id=3]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_09.png" type="Texture" id=4]
[ext_resource path="res://Levels/Objects/Door.tscn" type="PackedScene" id=5]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png" type="Texture" id=6]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_04.png" type="Texture" id=7]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_06.png" type="Texture" id=8]
[ext_resource path="res://Levels/Level 4.gd" type="Script" id=9]
[ext_resource path="res://Sprites/Assets/tileset_mk_16_16_nature_tileset_godot.tres" type="TileSet" id=15]
[ext_resource path="res://Levels/Objects/TreasureChest.tscn" type="PackedScene" id=16]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_01.png" type="Texture" id=10]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_13.png" type="Texture" id=11]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_14.png" type="Texture" id=12]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_11.png" type="Texture" id=13]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_08.png" type="Texture" id=14]
[ext_resource path="res://Resources/Level_4_Tileset.tres" type="TileSet" id=15]
[ext_resource path="res://Levels/Interactables/Treasure Chest.tscn" type="PackedScene" id=16]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_02.png" type="Texture" id=17]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_07.png" type="Texture" id=18]
[ext_resource path="res://Sprites/Assets/Transparent_16x16.png" type="Texture" id=19]
[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_05.png" type="Texture" id=20]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=21]
[ext_resource path="res://GUI/Pause Screen.tscn" type="PackedScene" id=22]
[ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=23]
@@ -13,7 +28,7 @@
[sub_resource type="SpriteFrames" id=1]
animations = [ {
"frames": [ null, null, null, null, null, null, null, null, null, null, null, null, null, null ],
"frames": [ ExtResource( 10 ), ExtResource( 17 ), ExtResource( 3 ), ExtResource( 7 ), ExtResource( 20 ), ExtResource( 8 ), ExtResource( 18 ), ExtResource( 14 ), ExtResource( 4 ), ExtResource( 6 ), ExtResource( 13 ), ExtResource( 1 ), ExtResource( 11 ), ExtResource( 12 ) ],
"loop": true,
"name": "default",
"speed": 10.0
@@ -24,6 +39,7 @@ points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
[sub_resource type="TileSet" id=3]
0/name = "transparent16x16.png 0"
0/texture = ExtResource( 19 )
0/tex_offset = Vector2( 0, 0 )
0/modulate = Color( 1, 1, 1, 1 )
0/region = Rect2( 0, 0, 16, 16 )
@@ -70,21 +86,20 @@ tile_data = PoolIntArray( -2359292, 0, 5, -2359291, 0, 196610, -2359290, 0, 1966
[node name="Fire3" type="AnimatedSprite" parent="."]
position = Vector2( -607.628, -210.601 )
frames = SubResource( 1 )
frame = 8
frame = 4
playing = true
offset = Vector2( 679.819, 333.222 )
[node name="Fire2" type="AnimatedSprite" parent="."]
position = Vector2( -543.25, -212.563 )
frames = SubResource( 1 )
frame = 11
frame = 7
playing = true
offset = Vector2( 679.819, 333.222 )
[node name="Fire1" type="AnimatedSprite" parent="."]
position = Vector2( -479.806, -214.167 )
frames = SubResource( 1 )
frame = 4
playing = true
offset = Vector2( 679.819, 333.222 )
+36 -10
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=2]
[gd_scene load_steps=14 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://Levels/Level 5.gd" type="Script" id=2]
@@ -8,20 +8,25 @@
[ext_resource path="res://Music/Level_5.mp3" type="AudioStream" id=6]
[ext_resource path="res://GUI/Pause Screen.tscn" type="PackedScene" id=7]
[ext_resource path="res://Resources/Level_5_Walls_Tileset.tres" type="TileSet" id=8]
[ext_resource path="res://Enemies/Glowing Ghost.tscn" type="PackedScene" id=9]
[ext_resource path="res://Enemies/Chasing Glowing Ghost.tscn" type="PackedScene" id=9]
[ext_resource path="res://Levels/Traps/Spawn Trap.tscn" type="PackedScene" id=10]
[ext_resource path="res://Levels/Interactables/Silver Key Pickup.tscn" type="PackedScene" id=11]
[ext_resource path="res://Levels/Interactables/Silver Barrier.tscn" type="PackedScene" id=12]
[ext_resource path="res://Enemies/Creepy Glowing Ghost.tscn" type="PackedScene" id=13]
[node name="Void Level" type="Node2D"]
script = ExtResource( 2 )
[node name="CanvasModulate" type="CanvasModulate" parent="."]
visible = false
[node name="Darkness" type="CanvasModulate" parent="."]
color = Color( 0, 0, 0, 1 )
[node name="Floor" type="TileMap" parent="."]
self_modulate = Color( 0.627451, 0.627451, 0.627451, 1 )
tile_set = ExtResource( 4 )
cell_size = Vector2( 16, 16 )
collision_layer = 0
collision_mask = 0
occluder_light_mask = 0
format = 1
tile_data = PoolIntArray( -393225, 0, 0, -393224, 0, 1, -393223, 0, 1, -393222, 0, 1, -393221, 0, 1, -393220, 0, 1, -393219, 0, 1, -393218, 0, 1, -393217, 0, 1, -458752, 0, 1, -458751, 0, 1, -458750, 0, 1, -458749, 0, 1, -458748, 0, 1, -458747, 0, 1, -458746, 0, 1, -458745, 0, 1, -458744, 0, 1, -458743, 0, 1, -458742, 0, 1, -458741, 0, 1, -458740, 0, 1, -458739, 0, 1, -458738, 0, 1, -458737, 0, 1, -458736, 0, 1, -458735, 0, 1, -458734, 0, 1, -458733, 0, 1, -458732, 0, 1, -458731, 0, 1, -458730, 0, 1, -458729, 0, 1, -458728, 0, 1, -458727, 0, 1, -458726, 0, 1, -458725, 0, 1, -458724, 0, 1, -458723, 0, 1, -458722, 0, 1, -458721, 0, 1, -458720, 0, 1, -458719, 0, 1, -458718, 0, 1, -458717, 0, 1, -458716, 0, 2, -327689, 0, 65536, -327688, 0, 65537, -327687, 0, 65537, -327686, 0, 65537, -327685, 0, 65537, -327684, 0, 65537, -327683, 0, 65537, -327682, 0, 65537, -327681, 0, 65537, -393216, 0, 65537, -393215, 0, 65537, -393214, 0, 65537, -393213, 0, 65537, -393212, 0, 65537, -393211, 0, 65537, -393210, 0, 65537, -393209, 0, 65537, -393208, 0, 65537, -393207, 0, 65537, -393206, 0, 65537, -393205, 0, 65537, -393204, 0, 65537, -393203, 0, 65537, -393202, 0, 65537, -393201, 0, 65537, -393200, 0, 65537, -393199, 0, 65537, -393198, 0, 65537, -393197, 0, 65537, -393196, 0, 65537, -393195, 0, 65537, -393194, 0, 65537, -393193, 0, 65537, -393192, 0, 65537, -393191, 0, 65537, -393190, 0, 65537, -393189, 0, 65537, -393188, 0, 65537, -393187, 0, 65537, -393186, 0, 65537, -393185, 0, 65537, -393184, 0, 65537, -393183, 0, 65537, -393182, 0, 65537, -393181, 0, 65537, -393180, 0, 65538, -262153, 0, 65536, -262152, 0, 65537, -262151, 0, 65537, -262150, 0, 65537, -262149, 0, 65537, -262148, 0, 65537, -262147, 0, 65537, -262146, 0, 65537, -262145, 0, 65537, -327680, 0, 65537, -327679, 0, 65537, -327678, 0, 65537, -327677, 0, 65537, -327676, 0, 65537, -327675, 0, 65537, -327674, 0, 65537, -327673, 0, 65537, -327672, 0, 65537, -327671, 0, 65537, -327670, 0, 65537, -327669, 0, 65537, -327668, 0, 65537, -327667, 0, 65537, -327666, 0, 65537, -327665, 0, 65537, -327664, 0, 65537, -327663, 0, 65537, -327662, 0, 65537, -327661, 0, 65537, -327660, 0, 65537, -327659, 0, 65537, -327658, 0, 65537, -327657, 0, 65537, -327656, 0, 65537, -327655, 0, 65537, -327654, 0, 65537, -327653, 0, 65537, -327652, 0, 65537, -327651, 0, 65537, -327650, 0, 65537, -327649, 0, 65537, -327648, 0, 65537, -327647, 0, 65537, -327646, 0, 65537, -327645, 0, 65537, -327644, 0, 65538, -196617, 0, 65536, -196616, 0, 65537, -196615, 0, 65537, -196614, 0, 65537, -196613, 0, 65537, -196612, 0, 65537, -196611, 0, 65537, -196610, 0, 65537, -196609, 0, 65537, -262144, 0, 65537, -262143, 0, 65537, -262142, 0, 65537, -262141, 0, 65537, -262140, 0, 65537, -262139, 0, 65537, -262138, 0, 65537, -262137, 0, 65537, -262136, 0, 65537, -262135, 0, 65537, -262134, 0, 65537, -262133, 0, 65537, -262132, 0, 65537, -262131, 0, 65537, -262130, 0, 65537, -262129, 0, 65537, -262128, 0, 65537, -262127, 0, 65537, -262126, 0, 65537, -262125, 0, 65537, -262124, 0, 65537, -262123, 0, 65537, -262122, 0, 65537, -262121, 0, 65537, -262120, 0, 65537, -262119, 0, 65537, -262118, 0, 65537, -262117, 0, 65537, -262116, 0, 65537, -262115, 0, 65537, -262114, 0, 65537, -262113, 0, 65537, -262112, 0, 65537, -262111, 0, 65537, -262110, 0, 65537, -262109, 0, 65537, -262108, 0, 65538, -131081, 0, 65536, -131080, 0, 65537, -131079, 0, 65537, -131078, 0, 65537, -131077, 0, 65537, -131076, 0, 65537, -131075, 0, 65537, -131074, 0, 65537, -131073, 0, 65537, -196608, 0, 65537, -196607, 0, 65537, -196606, 0, 65537, -196605, 0, 65537, -196604, 0, 65537, -196603, 0, 65537, -196602, 0, 65537, -196601, 0, 65537, -196600, 0, 65537, -196599, 0, 65537, -196598, 0, 65537, -196597, 0, 65537, -196596, 0, 65537, -196595, 0, 65537, -196594, 0, 65537, -196593, 0, 65537, -196592, 0, 65537, -196591, 0, 65537, -196590, 0, 65537, -196589, 0, 65537, -196588, 0, 65537, -196587, 0, 65537, -196586, 0, 65537, -196585, 0, 65537, -196584, 0, 65537, -196583, 0, 65537, -196582, 0, 65537, -196581, 0, 65537, -196580, 0, 65537, -196579, 0, 65537, -196578, 0, 65537, -196577, 0, 65537, -196576, 0, 65537, -196575, 0, 65537, -196574, 0, 65537, -196573, 0, 65537, -196572, 0, 65538, -65545, 0, 65536, -65544, 0, 65537, -65543, 0, 65537, -65542, 0, 65537, -65541, 0, 65537, -65540, 0, 65537, -65539, 0, 65537, -65538, 0, 65537, -65537, 0, 65537, -131072, 0, 65537, -131071, 0, 65537, -131070, 0, 65537, -131069, 0, 65537, -131068, 0, 65537, -131067, 0, 65537, -131066, 0, 65537, -131065, 0, 65537, -131064, 0, 65537, -131063, 0, 65537, -131062, 0, 65537, -131061, 0, 65537, -131060, 0, 65537, -131059, 0, 65537, -131058, 0, 65537, -131057, 0, 65537, -131056, 0, 65537, -131055, 0, 65537, -131054, 0, 65537, -131053, 0, 65537, -131052, 0, 65537, -131051, 0, 65537, -131050, 0, 65537, -131049, 0, 65537, -131048, 0, 65537, -131047, 0, 65537, -131046, 0, 65537, -131045, 0, 65537, -131044, 0, 65537, -131043, 0, 65537, -131042, 0, 65537, -131041, 0, 65537, -131040, 0, 65537Line truncated
@@ -29,38 +34,59 @@ tile_data = PoolIntArray( -393225, 0, 0, -393224, 0, 1, -393223, 0, 1, -393222,
light_mask = 8
tile_set = ExtResource( 8 )
cell_size = Vector2( 16, 16 )
collision_mask = 0
format = 1
tile_data = PoolIntArray( -196589, 0, 0, -196588, 0, 1, -196587, 0, 1, -196586, 0, 1, -196585, 0, 1, -196584, 0, 1, -196583, 0, 2, -131055, 0, 0, -131054, 0, 1, -131053, 0, 131078, -131052, 0, 65541, -131051, 0, 131073, -131050, 0, 131073, -131049, 0, 131073, -131048, 0, 65542, -131047, 0, 65538, -65524, 0, 0, -65523, 0, 1, -65522, 0, 1, -65521, 0, 1, -65520, 0, 1, -65519, 0, 65545, -65518, 0, 131073, -65517, 0, 131073, -65516, 0, 131074, -65512, 0, 65536, -65511, 0, 65538, 12, 0, 65536, 13, 0, 65541, 14, 0, 131073, 15, 0, 131073, 16, 0, 131073, 17, 0, 131074, 24, 0, 65536, 25, 0, 65538, 65548, 0, 65536, 65549, 0, 65538, 65560, 0, 65536, 65561, 0, 65538, 131078, 0, 0, 131079, 0, 1, 131080, 0, 1, 131081, 0, 1, 131082, 0, 1, 131083, 0, 1, 131084, 0, 131078, 131085, 0, 65538, 131089, 0, 3, 131096, 0, 65536, 131097, 0, 65538, 196614, 0, 65536, 196615, 0, 65541, 196616, 0, 131073, 196617, 0, 131073, 196618, 0, 131073, 196619, 0, 131073, 196620, 0, 65542, 196621, 0, 65538, 196625, 0, 65539, 196632, 0, 65536, 196633, 0, 65538, 262150, 0, 65536, 262151, 0, 65538, 262156, 0, 65536, 262157, 0, 65538, 262161, 0, 65539, 262163, 0, 0, 262164, 0, 2, 262167, 0, 0, 262168, 0, 131078, 262169, 0, 65538, 327686, 0, 65536, 327687, 0, 65538, 327692, 0, 65536, 327693, 0, 65538, 327696, 0, 4, 327697, 0, 196615, 327699, 0, 131072, 327700, 0, 65543, 327703, 0, 65536, 327704, 0, 65541, 327705, 0, 131074, 393222, 0, 65536, 393223, 0, 65538, 393228, 0, 65536, 393229, 0, 131077, 393230, 0, 5, 393231, 0, 196609, 393232, 0, 196615, 393236, 0, 131075, 393239, 0, 65536, 393240, 0, 65538, 458758, 0, 131072, 458759, 0, 131074, 458761, 0, 0, 458762, 0, 2, 458764, 0, 131072, 458765, 0, 131073, 458766, 0, 131074, 458774, 0, 0, 458775, 0, 131078, 458776, 0, 65538, 524297, 0, 65536, 524298, 0, 65538, 524309, 0, 0, 524310, 0, 131078, 524311, 0, 65541, 524312, 0, 131074, 589833, 0, 65536, 589834, 0, 131077, 589835, 0, 1, 589836, 0, 1, 589837, 0, 1, 589838, 0, 1, 589839, 0, 1, 589840, 0, 1, 589841, 0, 1, 589842, 0, 1, 589843, 0, 1, 589844, 0, 1, 589845, 0, 131078, 589846, 0, 65541, 589847, 0, 131074, 655369, 0, 131072, 655370, 0, 131073, 655371, 0, 131073, 655372, 0, 131073, 655373, 0, 131073, 655374, 0, 131073, 655375, 0, 131073, 655376, 0, 131073, 655377, 0, 131073, 655378, 0, 131073, 655379, 0, 131073, 655380, 0, 131073, 655381, 0, 131073, 655382, 0, 131074 )
tile_data = PoolIntArray( -196589, 0, 0, -196588, 0, 1, -196587, 0, 1, -196586, 0, 1, -196585, 0, 1, -196584, 0, 1, -196583, 0, 2, -131055, 0, 0, -131054, 0, 1, -131053, 0, 131078, -131052, 0, 65541, -131051, 0, 131073, -131050, 0, 131073, -131049, 0, 131073, -131048, 0, 65542, -131047, 0, 65538, -65524, 0, 0, -65523, 0, 1, -65522, 0, 1, -65521, 0, 1, -65520, 0, 1, -65519, 0, 65545, -65518, 0, 131073, -65517, 0, 131073, -65516, 0, 131074, -65512, 0, 65536, -65511, 0, 65538, 12, 0, 65536, 13, 0, 65541, 14, 0, 131073, 15, 0, 131073, 16, 0, 131073, 17, 0, 131074, 24, 0, 65536, 25, 0, 65538, 65548, 0, 65536, 65549, 0, 65538, 65560, 0, 65536, 65561, 0, 65538, 131078, 0, 0, 131079, 0, 1, 131080, 0, 1, 131081, 0, 1, 131082, 0, 1, 131083, 0, 1, 131084, 0, 131078, 131085, 0, 65538, 131089, 0, 3, 131096, 0, 65536, 131097, 0, 65538, 196614, 0, 65536, 196615, 0, 65541, 196616, 0, 131073, 196617, 0, 131073, 196618, 0, 131073, 196619, 0, 131073, 196620, 0, 65542, 196621, 0, 65538, 196625, 0, 65539, 196632, 0, 65536, 196633, 0, 65538, 262150, 0, 65536, 262151, 0, 65538, 262156, 0, 65536, 262157, 0, 65538, 262161, 0, 65539, 262163, 0, 0, 262164, 0, 2, 262167, 0, 0, 262168, 0, 131078, 262169, 0, 65538, 327686, 0, 65536, 327687, 0, 65538, 327692, 0, 65536, 327693, 0, 65538, 327696, 0, 4, 327697, 0, 196615, 327699, 0, 131072, 327700, 0, 65543, 327703, 0, 65536, 327704, 0, 65541, 327705, 0, 131074, 393222, 0, 65536, 393223, 0, 65538, 393228, 0, 65536, 393229, 0, 131077, 393230, 0, 5, 393231, 0, 196609, 393232, 0, 196615, 393236, 0, 131075, 393239, 0, 65536, 393240, 0, 65538, 458755, 0, 0, 458756, 0, 2, 458758, 0, 65536, 458759, 0, 65538, 458761, 0, 0, 458762, 0, 2, 458764, 0, 131072, 458765, 0, 131073, 458766, 0, 131074, 458774, 0, 0, 458775, 0, 131078, 458776, 0, 65538, 524291, 0, 65536, 524292, 0, 65538, 524294, 0, 65536, 524295, 0, 65538, 524297, 0, 65536, 524298, 0, 65538, 524309, 0, 0, 524310, 0, 131078, 524311, 0, 65541, 524312, 0, 131074, 589827, 0, 65536, 589828, 0, 65538, 589830, 0, 131072, 589831, 0, 131074, 589833, 0, 65536, 589834, 0, 131077, 589835, 0, 1, 589836, 0, 1, 589837, 0, 1, 589838, 0, 1, 589839, 0, 1, 589840, 0, 1, 589841, 0, 1, 589842, 0, 1, 589843, 0, 1, 589844, 0, 1, 589845, 0, 131078, 589846, 0, 65541, 589847, 0, 131074, 655363, 0, 65536, 655364, 0, 65538, 655369, 0, 65536, 655370, 0, 65541, 655371, 0, 131073, 655372, 0, 131073, 655373, 0, 131073, 655374, 0, 131073, 655375, 0, 131073, 655376, 0, 131073, 655377, 0, 131073, 655378, 0, 131073, 655379, 0, 131073, 655380, 0, 131073, 655381, 0, 131073, 655382, 0, 131074, 720899, 0, 65536, 720900, 0, 65538, 720905, 0, 65536, 720906, 0, 65538, 786435, 0, 65536, 786436, 0, 65538, 786441, 0, 65536, 786442, 0, 65538, 851971, 0, 65536, 851972, 0, 65538, 851977, 0, 65536, 851978, 0, 65538, 917507, 0, 65536, 917508, 0, 65538, 917513, 0, 65536, 917514, 0, 65538, 983043, 0, 65536, 983044, 0, 131077, 983045, 0, 1, 983046, 0, 1, 983047, 0, 1, 983048, 0, 1, 983049, 0, 131078, 983050, 0, 65538, 1048579, 0, 131072, 1048580, 0, 131073, 1048581, 0, 131073, 1048582, 0, 131073, 1048583, 0, 131073, 1048584, 0, 131073, 1048585, 0, 131073, 1048586, 0, 131074 )
[node name="YSort" type="YSort" parent="."]
[node name="Player" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 160, 90 )
[node name="Camera2D" type="Camera2D" parent="YSort/Player"]
[node name="Camera" type="Camera2D" parent="YSort/Player"]
current = true
[node name="Light2D" type="Light2D" parent="YSort/Player"]
[node name="Light" type="Light2D" parent="YSort/Player"]
texture = ExtResource( 5 )
range_item_cull_mask = 15
shadow_enabled = true
[node name="Enemies" type="YSort" parent="YSort"]
[node name="Glowing Ghost 0" parent="YSort/Enemies" instance=ExtResource( 9 )]
[node name="Chasing Glowing Ghost 0" parent="YSort/Enemies" instance=ExtResource( 9 )]
position = Vector2( 281, 109 )
[node name="Glowing Ghost 1" parent="YSort/Enemies" instance=ExtResource( 9 )]
[node name="Chasing Glowing Ghost 1" parent="YSort/Enemies" instance=ExtResource( 9 )]
position = Vector2( 328.5, 20 )
[node name="Creepy Glowing Ghost 00" parent="YSort/Enemies" instance=ExtResource( 13 )]
position = Vector2( 310, 40 )
[node name="Creepy Glowing Ghost 01" parent="YSort/Enemies" instance=ExtResource( 13 )]
position = Vector2( 90, 175 )
[node name="Creepy Glowing Ghost 02" parent="YSort/Enemies" instance=ExtResource( 13 )]
position = Vector2( 100, 220 )
[node name="Interactables" type="Node2D" parent="."]
[node name="Silver Key Pickup" parent="Interactables" instance=ExtResource( 11 )]
position = Vector2( 240, 80 )
[node name="Silver Barrier" parent="Interactables" instance=ExtResource( 12 )]
position = Vector2( 136, 120 )
alignment = "H"
[node name="Traps" type="Node2D" parent="."]
[node name="Spawn Trap" parent="Traps" instance=ExtResource( 10 )]
position = Vector2( 256, 16 )
enemy_path = "res://Enemies/Glowing Ghost.tscn"
enemy_path = "res://Enemies/Chasing Glowing Ghost.tscn"
relative_x_tiles = -1
relative_y_tiles = 2
[node name="Projectiles" type="Node2D" parent="."]
[node name="HUD" parent="." instance=ExtResource( 3 )]
[node name="Pause Screen" parent="." instance=ExtResource( 7 )]
+4 -3
View File
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Sprites/Assets/DoorOpen.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Assets/DoorClosed.png" type="Texture" id=2]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Closed.png" type="Texture" id=2]
[node name="Door" type="Sprite"]
@@ -10,4 +11,4 @@ texture = ExtResource( 2 )
[node name="doorOpened" type="Sprite" parent="."]
visible = false
texture = ExtResource( 1 )
texture = ExtResource( 1 )
+9 -8
View File
@@ -5,14 +5,15 @@ export var relative_x_tiles: int
export var relative_y_tiles: int
func _on_spawn_trap_area_entered(_area: Area2D) -> void:
set_deferred('monitoring', false)
$Tile.set_deferred('disabled', true)
func _on_spawn_trap_body_entered(body: Node) -> void:
if body.is_in_group('player'):
set_deferred('monitoring', false)
var enemy: KinematicBody2D = load(enemy_path).instance()
enemy.position.x = position.x + (relative_x_tiles * 16 + 8)
enemy.position.y = position.y + (relative_y_tiles * 16 + 8)
var enemy: KinematicBody2D = load(enemy_path).instance()
enemy.position.x = position.x + (relative_x_tiles * 16 + 8)
enemy.position.y = position.y + (relative_y_tiles * 16 + 8)
var enemies: YSort = get_tree().get_current_scene().get_node('YSort/Enemies')
enemies.call_deferred('add_child', enemy)
var enemies: YSort = get_tree().get_current_scene().get_node('YSort/Enemies')
enemies.call_deferred('add_child', enemy)
call_deferred('queue_free')
return
+2 -1
View File
@@ -14,7 +14,8 @@ monitorable = false
script = ExtResource( 1 )
[node name="Tile" type="CollisionShape2D" parent="."]
light_mask = 0
position = Vector2( 8, 8 )
shape = SubResource( 1 )
[connection signal="area_entered" from="." to="." method="_on_spawn_trap_area_entered"]
[connection signal="body_entered" from="." to="." method="_on_spawn_trap_body_entered"]