daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with main

Browse Source
This commit is contained in:
Daniel Tam
2021-12-07 20:21:41 -06:00
parent 05e04c7db9
commit 7d04c41d79
15 changed files with 203 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Levels/Hub World.gd
View File

@@ -2,5 +2,5 @@ extends Node2D
func _ready() -> void:
$YSort/Player.load_hud($HUD)
return
$YSort/Player.load_hud($HUD)
return

6
Levels/Interactables/Gem.gd
View File

@@ -8,7 +8,7 @@ extends Node2D
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -17,8 +17,8 @@ func _ready() -> void:
func _on_AnimationPlayer_animation_finished(anim_name: String) -> void:
$GemSprite.visible = false
$GemSprite.visible = false
func _on_AnimationPlayer_animation_started(anim_name: String) -> void:
$GemSprite.visible = true
$GemSprite.visible = true

2
Levels/Interactables/Gem.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Sprites/Assets/Resources_Basic.png" type="Texture" id=1]
[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]

22
Levels/Level 4.gd
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
gems -= 1
if gems == 0:
$YSort/Items/Door/doorClosed.visible = false
$YSort/Items/Door/doorOpened.visible = true
$DoorCollision.layers = 5
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

19
Levels/Level 4.tscn
View File

@@ -1,18 +1,18 @@
[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://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_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/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_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]
@@ -86,21 +86,21 @@ 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 = 2
frame = 10
playing = true
offset = Vector2( 679.819, 333.222 )
[node name="Fire2" type="AnimatedSprite" parent="."]
position = Vector2( -543.25, -212.563 )
frames = SubResource( 1 )
frame = 5
frame = 13
playing = true
offset = Vector2( 679.819, 333.222 )
[node name="Fire1" type="AnimatedSprite" parent="."]
position = Vector2( -479.806, -214.167 )
frames = SubResource( 1 )
frame = 12
frame = 6
playing = true
offset = Vector2( 679.819, 333.222 )
@@ -206,11 +206,12 @@ scale = Vector2( 1.25, 1.25 )
collision_layer = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="DoorCollision"]
position = Vector2( 201, -10 )
position = Vector2( 203, -9 )
shape = SubResource( 11 )
[node name="NextArea" type="Area2D" parent="."]
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="NextArea"]
position = Vector2( 200, -56 )