Fixed debugger errors in many files and optimized some scenes/code

2021-12-12 23:55:59 -06:00
parent fc6dfdef4d
commit ef5ce684eb
39 changed files with 657 additions and 740 deletions
--- a/Levels/Area2D.gd
+++ b/Levels/Area2D.gd
@@ -1,21 +0,0 @@
-extends Area2D
-
-onready var portal = get_node("../PortalDarkForest")
-onready var shape = portal.get_child(0)
-# 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:
-	shape.set_deferred("disabled",true)
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta: float) -> void:
-#  pass
-
-
-func _on_ChestDetection_body_entered(body: Node) -> void:
-	shape.set_deferred("disabled",false)
--- a/Levels/Camera2D.gd
+++ b/Levels/Camera2D.gd
@@ -1,29 +1,13 @@
 extends Camera2D

-
-# Declare member variables here. Examples:
-# var a: int = 2
-# var b: String = "text"
-
 signal enter_portal


-# 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_PortalDarkForest_body_entered(body: Node) -> void:
-	self.limit_bottom = -224
-	self.limit_top = -736
-	self.limit_left = -32
-	self.limit_right = 448
-	var player = get_parent()
-	player.position = Vector2(256,-232)
-	emit_signal('enter_portal')
-	
+func _on_PortalDarkForest_body_entered(_body: Node) -> void:
+    limit_bottom = -224
+    limit_top = -736
+    limit_left = -32
+    limit_right = 448
+    get_parent().position = Vector2(256, -232)
+    emit_signal('enter_portal')
+    return
--- a/Detection.gd
+++ b/Detection.gd
@@ -0,0 +1,15 @@
+extends Area2D
+
+onready var portal = get_node('../PortalDarkForest')
+onready var shape = portal.get_child(0)
+
+
+func _ready() -> void:
+    shape.set_deferred('disabled', true)
+    return
+
+
+func _on_chest_detection_body_entered(body: Node) -> void:
+    if body.is_in_group('player'):
+        shape.set_deferred('disabled', false)
+    return
--- a/Levels/Hub
+++ b/Levels/Hub
@@ -2,16 +2,16 @@ extends Node2D


 func _ready() -> void:
-	$YSort/Player.load_hud($HUD)
+    $YSort/Player.load_hud($HUD)

-	for level_portal in $'YSort/Level Portals'.get_children():
-		if level_portal.connect('enter_level', self, 'enter_level') != OK:
-			print('ERROR: Level Portal "enter_level" signal already connected.')
-	return
+    for level_portal in $'YSort/Level Portals'.get_children():
+        if level_portal.connect('enter_level', self, 'enter_level') != OK:
+            print('ERROR: Level Portal "enter_level" signal already connected.')
+    return


 func enter_level(level: String) -> void:
-	if get_tree().change_scene(level) != OK:
-		print('ERROR: Hub World failed to change scene to Level.')
-	queue_free()
-	return
+    if get_tree().change_scene(level) != OK:
+        print('ERROR: Hub World failed to change scene to Level.')
+    queue_free()
+    return
--- a/Levels/Interactables/Coin.gd
+++ b/Levels/Interactables/Coin.gd
@@ -3,8 +3,8 @@ extends Area2D
 signal coin_grabbed


-func _on_Node2D_body_entered(body: Node) -> void:
-    if body.get_name() == 'Player':
-        emit_signal("coin_grabbed")
-        print("coin!")
-        queue_free()
+func _on_coin_body_entered(body: Node) -> void:
+    if body.is_in_group('player'):
+        emit_signal('coin_grabbed')
+        call_deferred('queue_free')
+    return
--- a/Levels/Interactables/Coin.tscn
+++ b/Levels/Interactables/Coin.tscn
@@ -6,7 +6,7 @@
 [sub_resource type="CircleShape2D" id=1]
 radius = 6.38067

-[node name="coin" type="Area2D"]
+[node name="Coin" type="Area2D"]
 script = ExtResource( 1 )

 [node name="Sprite" type="Sprite" parent="."]
@@ -16,4 +16,4 @@ texture = ExtResource( 2 )
 [node name="coin" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )

-[connection signal="body_entered" from="." to="." method="_on_Node2D_body_entered"]
+[connection signal="body_entered" from="." to="." method="_on_coin_body_entered"]
--- a/Levels/Interactables/Gem.gd
+++ b/Levels/Interactables/Gem.gd
@@ -1,24 +1,11 @@
 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:
+func _on_AnimationPlayer_animation_finished(_anim_name: String) -> void:
    $GemSprite.visible = false
+    return


-func _on_AnimationPlayer_animation_started(anim_name: String) -> void:
+func _on_AnimationPlayer_animation_started(_anim_name: String) -> void:
    $GemSprite.visible = true
+    return
--- a/Levels/JournalScrap.tscn
+++ b/Levels/JournalScrap.tscn
--- a/Levels/Level
+++ b/Levels/Level
@@ -4,14 +4,14 @@ var death_count: int = 0


 func _ready() -> void:
-	$YSort/Player.load_hud($HUD)
-	return
+    $YSort/Player.load_hud($HUD)
+    return


 func _on_dark_matter_death() -> void:
-	death_count += 1
-	if death_count == 5:
-		if get_tree().change_scene('res://GUI/Level Complete.tscn') != OK:
-			print('ERROR: Level 1 failed to change scene to Level Complete.')
-		queue_free()
-	return
+    death_count += 1
+    if death_count == 5:
+        if get_tree().change_scene('res://GUI/Level Complete.tscn') != OK:
+            print('ERROR: Level 1 failed to change scene to Level Complete.')
+        queue_free()
+    return
--- a/Levels/Level
+++ b/Levels/Level
@@ -1,18 +1,18 @@
 extends Node2D

+
 func _ready() -> void:
-	#$YSort/Player.position = get_viewport_rect().size / 2
-	$YSort/Player.position = Vector2(0,0)
-	$YSort/Player.load_hud($HUD)
-	$HUD/Control.visible = false
-	return
+    $YSort/Player.load_hud($HUD)
+    return


-func _on_Area2D_body_entered(body):
-  $HUD/Control.visible = true
-  #print("j")
+func _on_journal_page_body_entered(body: Node) -> void:
+    if body.is_in_group('player'):
+        $'HUD/Journal Page Dialogue'.visible = true
+    return


 func _on_Camera2D_enter_portal() -> void:
-	$BGM1.stop()
-	$BGM2.play()
+    $BGM1.stop()
+    $BGM2.play()
+    return
--- a/Levels/Level
+++ b/Levels/Level
@@ -1,4 +1,4 @@
-[gd_scene load_steps=90 format=2]
+[gd_scene load_steps=91 format=2]

 [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Levels/Level 2.gd" type="Script" id=2]
@@ -8,10 +8,10 @@
 [ext_resource path="res://Levels/Objects/Chest.tscn" type="PackedScene" id=6]
 [ext_resource path="res://Sprites/Assets/cliffTileset.png" type="Texture" id=7]
 [ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=8]
-[ext_resource path="res://Enemies/Ghost_Enemy.tscn" type="PackedScene" id=9]
+[ext_resource path="res://Enemies/Ghost Enemy.tscn" type="PackedScene" id=9]
 [ext_resource path="res://Sprites/Assets/DeadTree.png" type="Texture" id=10]
 [ext_resource path="res://Sprites/Assets/darkForestTileset.png" type="Texture" id=11]
-[ext_resource path="res://Levels/Area2D.gd" type="Script" id=12]
+[ext_resource path="res://Levels/Chest Detection.gd" type="Script" id=12]
 [ext_resource path="res://Levels/Camera2D.gd" type="Script" id=13]
 [ext_resource path="res://Sprites/Assets/Shadow.png" type="Texture" id=14]
 [ext_resource path="res://Levels/Traps/Spawn Trap.tscn" type="PackedScene" id=15]
@@ -21,6 +21,7 @@
 [ext_resource path="res://Levels/Objects/Dialogue.tscn" type="PackedScene" id=19]
 [ext_resource path="res://Music/Level_2_2.mp3" type="AudioStream" id=20]
 [ext_resource path="res://Music/Level_2_1.mp3" type="AudioStream" id=21]
+[ext_resource path="res://Levels/Portal Dark Forest.gd" type="Script" id=22]

 [sub_resource type="TileSet" id=1]
 0/name = "darkForestTileset.png 0"
@@ -797,11 +798,6 @@ radius = 22.8792
 [node name="World" type="Node2D"]
 script = ExtResource( 2 )

-[node name="HUD" parent="." instance=ExtResource( 8 )]
-
-[node name="Control" parent="HUD" instance=ExtResource( 19 )]
-visible = false
-
 [node name="YSort" type="YSort" parent="."]

 [node name="Player" parent="YSort" instance=ExtResource( 1 )]
@@ -897,32 +893,31 @@ position = Vector2( 350, 0 )
 scale = Vector2( 0.5, 0.5 )
 z_index = 4

-[node name="Area2D" type="Area2D" parent="Collectible"]
+[node name="Journal Page" type="Area2D" parent="Collectible"]
 collision_layer = 3
 collision_mask = 3

-[node name="Sprite2" type="Sprite" parent="Collectible/Area2D"]
+[node name="Sprite" type="Sprite" parent="Collectible/Journal Page"]
 texture = ExtResource( 18 )

-[node name="CollisionShape2D" type="CollisionShape2D" parent="Collectible/Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Collectible/Journal Page"]
 shape = SubResource( 68 )

-[node name="Pause Screen" parent="." instance=ExtResource( 5 )]
-
 [node name="TreasureChest" parent="." instance=ExtResource( 6 )]
 position = Vector2( 54, 170 )
 scale = Vector2( 0.5, 0.5 )
 object_scene = ExtResource( 6 )

-[node name="ChestDetection" type="Area2D" parent="TreasureChest"]
+[node name="Chest Detection" type="Area2D" parent="TreasureChest"]
 script = ExtResource( 12 )

-[node name="CollisionShape2D" type="CollisionShape2D" parent="TreasureChest/ChestDetection"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="TreasureChest/Chest Detection"]
 position = Vector2( -1.78381, -1.75043 )
 scale = Vector2( 3.08, 1.96 )
 shape = SubResource( 65 )

 [node name="PortalDarkForest" type="Area2D" parent="TreasureChest"]
+script = ExtResource( 22 )

 [node name="CollisionShape2D" type="CollisionShape2D" parent="TreasureChest/PortalDarkForest"]
 position = Vector2( 402.642, -712.75 )
@@ -934,6 +929,7 @@ shape = SubResource( 66 )

 [node name="Spawn Trap" parent="Traps" instance=ExtResource( 15 )]
 position = Vector2( 296.416, -364.541 )
+enemy_path = "res://Enemies/Ghost Enemy.tscn"

 [node name="Skull" type="TileMap" parent="."]
 modulate = Color( 0.658824, 0.658824, 0.658824, 1 )
@@ -942,6 +938,13 @@ tile_set = SubResource( 67 )
 format = 1
 tile_data = PoolIntArray( -589828, 0, 0, -458754, 0, 0, -393220, 0, 0 )

+[node name="HUD" parent="." instance=ExtResource( 8 )]
+
+[node name="Journal Page Dialogue" parent="HUD" instance=ExtResource( 19 )]
+visible = false
+
+[node name="Pause Screen" parent="." instance=ExtResource( 5 )]
+
 [node name="BGM1" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 21 )
 volume_db = -10.0
@@ -952,6 +955,6 @@ stream = ExtResource( 20 )
 volume_db = -10.0

 [connection signal="enter_portal" from="YSort/Player/Camera2D" to="." method="_on_Camera2D_enter_portal"]
-[connection signal="body_entered" from="Collectible/Area2D" to="." method="_on_Area2D_body_entered"]
-[connection signal="body_entered" from="TreasureChest/ChestDetection" to="TreasureChest/ChestDetection" method="_on_ChestDetection_body_entered"]
+[connection signal="body_entered" from="Collectible/Journal Page" to="." method="_on_journal_page_body_entered"]
+[connection signal="body_entered" from="TreasureChest/Chest Detection" to="TreasureChest/Chest Detection" method="_on_chest_detection_body_entered"]
 [connection signal="body_entered" from="TreasureChest/PortalDarkForest" to="YSort/Player/Camera2D" method="_on_PortalDarkForest_body_entered"]
--- a/Levels/Level
+++ b/Levels/Level
@@ -1,57 +1,52 @@
 extends Node2D

-onready var coin = preload('res://Levels/Interactables/Coin.tscn')
+onready var coin: Resource = preload('res://Levels/Interactables/Coin.tscn')

-var screensize
-var score = 0
+var screensize: Vector2
+var score: int = 0


 func _ready() -> void:
-	$YSort/Player.load_hud($HUD)
-	screensize = get_viewport_rect().size
-	spawn_coins(8)
-	return
+    $YSort/Player.load_hud($HUD)
+    screensize = get_viewport_rect().size
+    spawn_coins(8)
+    return


 func spawn_coins(num: int) -> void:
-	for _i in range(num):
-		var g: Node = coin.instance()
-		$'coin_container'.add_child(g)
-		g.connect('coin_grabbed', self, '_on_coin_grabbed')
-		#g.set_pos(Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40)))
-		g.position = Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40))
-	return
+    for _i in range(num):
+        var g: Node = coin.instance()
+        $'coin_container'.add_child(g)
+        if g.connect('coin_grabbed', self, '_on_coin_grabbed') != OK:
+            print('ERROR: Coin "coin_grabbed" signal already connected.')
+        #g.set_pos(Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40)))
+        g.position = Vector2(rand_range(0, screensize.x - 40), rand_range(0, screensize.y - 40))
+    return


 func _on_coin_grabbed() -> void:
-	score += 1
-	print(score)
-	$'Level 3 HUD/Label'.set_text(str(score) + '/5')
-	return
+    score += 1
+    $'Level 3 HUD/Label'.set_text(str(score) + '/5')
+    return


 func _timer_out() -> void:
-	get_tree().change_scene('res://Levels/Hub World.tscn')
-	queue_free()
-	return
+    if get_tree().change_scene('res://GUI/Level Failed.tscn') != OK:
+        print('ERROR: Level 3 failed to change scene to Level Failed.')
+    queue_free()
+    return


 func _on_TreasureChest_ice_key_collected() -> void:
-	$YSort/Door/doorClosed.visible = false
-	$YSort/Door/doorOpened.visible = true
-	$YSort/DoorCollision.layers = 5
-	return
-
-
-func _on_DoorDetector_body_entered(body: Node) -> void:
-	if body.is_in_group('player'):
-		print('WIN WIN WIN')
-		get_tree().change_scene('res://Levels/Hub World.tscn')
-	return
+    $YSort/Door/doorClosed.visible = false
+    $YSort/Door/doorOpened.visible = true
+    $YSort/DoorCollision.layers = 5
+    return


 func _on_DoorDetector_area_entered(area: Area2D) -> void:
-	if area.get_parent().name == 'Player':
-		get_tree().change_scene('res://GUI/Level Complete.tscn')
-		queue_free()
-	return
+    if area.get_parent().name == 'Player':
+        if get_tree().change_scene('res://GUI/Level Complete.tscn') != OK:
+            print('ERROR: Level 3 failed to change scene to Level Complete.')
+        queue_free()
+    return
--- a/Levels/Level
+++ b/Levels/Level
@@ -127,31 +127,23 @@ position = Vector2( 250.562, 86.6365 )

 [node name="Enemies" type="YSort" parent="YSort"]

-[node name="Snowman 1" parent="YSort/Enemies" groups=[
-"enemies",
-] instance=ExtResource( 4 )]
+[node name="Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
 position = Vector2( 268.977, 221.859 )
 collision_layer = 4
 collision_mask = 5

-[node name="Snowman 2" parent="YSort/Enemies" groups=[
-"enemies",
-] instance=ExtResource( 4 )]
+[node name="Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
 position = Vector2( 124.417, 123.977 )
 collision_layer = 4
 collision_mask = 5

-[node name="Blue Snowman 1" parent="YSort/Enemies" groups=[
-"enemies",
-] instance=ExtResource( 6 )]
+[node name="Blue Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
 position = Vector2( 252.747, 40.9419 )
 collision_layer = 4
 collision_mask = 5
 script = ExtResource( 7 )

-[node name="Blue Snowman 2" parent="YSort/Enemies" groups=[
-"enemies",
-] instance=ExtResource( 6 )]
+[node name="Blue Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
 position = Vector2( 105.053, 195.4 )
 collision_layer = 4
 collision_mask = 5
@@ -233,3 +225,4 @@ autoplay = true
 [connection signal="ice_key_collected" from="YSort/TreasureChest" to="." method="_on_TreasureChest_ice_key_collected"]
 [connection signal="frozen" from="YSort/Player" to="Effects/SlowTime" method="start"]
 [connection signal="unfreeze" from="Effects/SlowTime" to="YSort/Player" method="_on_SlowTime_unfreeze"]
+[connection signal="timer_out" from="HUD/Countdown Timer" to="." method="_timer_out"]
--- a/Levels/Level
+++ b/Levels/Level
@@ -4,31 +4,34 @@ var gems: int = 4


 func _ready() -> void:
-	$YSort/Player.load_hud($HUD)
-	return
+    $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
-	return
+    if gems == 0:
+        $YSort/Items/Door/doorClosed.visible = false
+        $YSort/Items/Door/doorOpened.visible = true
+        $DoorCollision.layers = 5
+    return


 func _on_NextArea_area_entered(area: Area2D) -> void:
-	if area.get_parent().name == 'Player':
-		$YSort/Player.position.x = 195
-		$YSort/Player.position.y = -335
-	return
+    if area.get_parent().name == 'Player':
+        $YSort/Player.position.x = 195
+        $YSort/Player.position.y = -335
+    return


 func _on_Demon_Boss_demon_boss_death() -> void:
-	$Timer.start()
+    $Timer.start()
+    return


 func _on_Timer_timeout() -> void:
-	get_tree().change_scene('res://GUI/Level Complete.tscn')
-	queue_free()
+    if get_tree().change_scene('res://GUI/Level Complete.tscn') != OK:
+        print('ERROR: Level 4 failed to change scene to Level Complete.')
+    queue_free()
+    return
--- a/Levels/Level
+++ b/Levels/Level
@@ -2,27 +2,27 @@ extends Node2D


 func _ready() -> void:
-	$YSort/Player.load_hud($HUD)
-	return
+    $YSort/Player.load_hud($HUD)
+    return


 func _on_activate_boss_teleporter_body_entered(body: Node) -> void:
-	if body.is_in_group('player'):
-		$'Interactables/Boss Teleporter'.set_deferred('visible', true)
-		$'Interactables/Activate Boss Teleporter'.call_deferred('queue_free')
-	return
+    if body.is_in_group('player'):
+        $'Interactables/Boss Teleporter'.set_deferred('visible', true)
+        $'Interactables/Activate Boss Teleporter'.call_deferred('queue_free')
+    return


 func _on_eyeball_boss_death() -> void:
-	$YSort/Enemies.call_deferred('queue_free')
-	$Lights.call_deferred('queue_free')
-	$Darkness.set_visible(false)
-	$Ending.start()
-	return
+    $YSort/Enemies.call_deferred('queue_free')
+    $Lights.call_deferred('queue_free')
+    $Darkness.set_visible(false)
+    $Ending.start()
+    return


 func _on_ending_timeout():
-	if get_tree().change_scene('res://GUI/Level Complete.tscn') != OK:
-		print('ERROR: Level 5 failed to change scene to Level Complete.')
-	queue_free()
-	return
+    if get_tree().change_scene('res://GUI/Level Complete.tscn') != OK:
+        print('ERROR: Level 5 failed to change scene to Level Complete.')
+    queue_free()
+    return
--- a/Levels/Objects/Chest.gd
+++ b/Levels/Objects/Chest.gd
@@ -1,38 +1,33 @@
 extends AnimatedSprite

-export(PackedScene) var object_scene: PackedScene = null
+export var object_scene: PackedScene = null

-var is_player_inside: bool = false
-var is_opened: bool = false
 var has_key: bool = false

-onready var animation_player: AnimationPlayer = get_node("AnimationPlayer")
-onready var tween: Tween = get_node("Key/Tween")

 func _ready() -> void:
-    assert(object_scene!=null)
-    animation_player.play("closed")
+    assert(object_scene != null)
+    $AnimationPlayer.play('closed')
    $Key/KeySprite.visible = false
-    
-func _input(event: InputEvent) -> void:
-    if is_player_inside and not is_opened:
-      is_opened = true
-      animation_player.play("open")
-      _drop_object()
+    return
+
+
+func _on_area_body_entered(body: Node) -> void:
+    if body.is_in_group('player'):
+        $Area/CollisionShape2D.set_deferred('disabled', true)
+        $AnimationPlayer.play('open')
+        _drop_object()
+    return
+

 func _drop_object() -> void:
-    #print($Key.position)
    $Key/KeySprite.visible = true
-    tween.interpolate_property($Key, "position", Vector2(0,0), Vector2(0, -10), 1.0, Tween.TRANS_QUAD, 
-                              Tween.EASE_OUT)
-    tween.start()
-    yield(tween, "tween_completed")
-    $Key/KeySprite.visible = false
-    
-    
-func _on_Area2D_player_entered(_player: KinematicBody2D) -> void:
-    is_player_inside = true
-    
+    if not $Key/Tween.interpolate_property($Key, 'position', Vector2(0,0), Vector2(0, -10), 1.0,
+                                           Tween.TRANS_QUAD, Tween.EASE_OUT):
+        print('ERROR: Chest key animation has errors.')
+    if not $Key/Tween.start():
+        print('ERROR: Chest key animation failed to start.')

-func _on_Area2D_player_exited(_player: KinematicBody2D) -> void:
-    is_player_inside = false
+    yield($Key/Tween, 'tween_completed')
+    $Key/KeySprite.visible = false
+    return
--- a/Levels/Objects/Chest.tscn
+++ b/Levels/Objects/Chest.tscn
@@ -174,5 +174,4 @@ animation = "closed"
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Entrance"]
 anims/closed = SubResource( 6 )

-[connection signal="body_entered" from="Area" to="." method="_on_Area2D_player_entered"]
-[connection signal="body_exited" from="Area" to="." method="_on_Area2D_player_exited"]
+[connection signal="body_entered" from="Area" to="." method="_on_area_body_entered"]
--- a/Levels/Objects/DialogBox.gd
+++ b/Levels/Objects/DialogBox.gd
@@ -1,63 +1,63 @@
 extends ColorRect

-export var dialogPath = ""
-export(float) var textSpeed = 0.05
+export var dialog_path: String = ''
+export var text_speed: float = 0.05

-var dialog
-var phraseNum = 0
+var dialog: Array
+var phrase_num: int = 0
 var finished = false

-func _ready():
-   # self.visible = false
-    $Timer.wait_time = textSpeed
-    dialog = getDialog()
-    assert(dialog, "Dialong not found")
-    nextPhrase()
-  
-  
-func _process(delta):
+
+func _ready() -> void:
+    $Timer.wait_time = text_speed
+    dialog = get_dialog()
+    assert(dialog, 'Dialog not found')
+    next_phrase()
+    return
+
+
+func _input(event: InputEvent) -> void:
    $Indicator.visible = finished
-    if Input.is_action_just_pressed("ui_accept"):
+    if event.is_action_pressed('ui_accept'):
        if finished:
-            nextPhrase()
+            next_phrase()
        else:
            $Text.visible_characters = len($Text.text)
-func getDialog() -> Array:
+    return
+
+
+func get_dialog() -> Array:
    var f = File.new()
-    assert(f.file_exists(dialogPath), "File path does not exist")
-    
-    f.open(dialogPath, File.READ)
+    assert(f.file_exists(dialog_path), 'File path does not exist')
+
+    f.open(dialog_path, File.READ)
    var json = f.get_as_text()
-    
+
    var output = parse_json(json)
-    
+
    if typeof(output) == TYPE_ARRAY:
        return output
    else:
        return []
-        
-func nextPhrase() -> void:
-    if phraseNum >= len(dialog):
+
+func next_phrase() -> void:
+    if phrase_num >= len(dialog):
        queue_free()
        return
-        
+
    finished = false
-    
-    $Name.bbcode_text = dialog[phraseNum]["Name"]
-    $Text.bbcode_text = dialog[phraseNum]["Text"]
-    
+
+    $Name.bbcode_text = dialog[phrase_num]['Name']
+    $Text.bbcode_text = dialog[phrase_num]['Text']
+
    $Text.visible_characters = 0
-    
+
    while $Text.visible_characters < len($Text.text):
        $Text.visible_characters += 1
-        
+
        $Timer.start()
-        yield($Timer, "timeout")
-        
+        yield($Timer, 'timeout')
+
    finished = true
-    phraseNum += 1
+    phrase_num += 1
    return
-        
-        
-        
-        
--- a/Levels/Objects/Dialogue.tscn
+++ b/Levels/Objects/Dialogue.tscn
@@ -28,7 +28,7 @@ tracks/0/keys = {
 "values": [ NodePath("..") ]
 }

-[node name="Control" type="Control"]
+[node name="Dialogue" type="Control"]
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -46,7 +46,7 @@ script = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
-dialogPath = "res://Levels/Objects/journalScrapDialog.json"
+dialog_path = "res://Levels/Objects/journalScrapDialog.json"

 [node name="Name" type="RichTextLabel" parent="DialogBox"]
 anchor_bottom = 2.0
--- a/Levels/Objects/Key.gd
+++ b/Levels/Objects/Key.gd
@@ -1,24 +1,11 @@
 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:
+func _on_AnimationPlayer_animation_finished(_anim_name: String) -> void:
    $IceKeySprite.visible = false
+    return


-func _on_AnimationPlayer_animation_started(anim_name: String) -> void:
+func _on_AnimationPlayer_animation_started(_anim_name: String) -> void:
    $IceKeySprite.visible = true
+    return
--- a/Levels/Objects/TreasureChest_L3.gd
+++ b/Levels/Objects/TreasureChest_L3.gd
@@ -1,34 +1,20 @@
 extends Sprite

+signal ice_key_collected
+
 var is_player_inside: bool = false
 var is_opened: bool = false
 var has_key: bool = true

-signal ice_key_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:
-    print(get_parent().get_parent().score)
    if area.get_parent().name == 'Player' and get_parent().get_parent().score >= 5:
        if is_opened == false:
            $chestClosed.visible = false
            $chestOpened.visible = true
            $Key.visible = true
-            $Key/AnimationPlayer.play("rise")
+            $Key/AnimationPlayer.play('rise')
            is_opened = true
            has_key = false
-            emit_signal("ice_key_collected")
+            emit_signal('ice_key_collected')
+    return
--- a/Levels/Portal
+++ b/Levels/Portal
@@ -0,0 +1,7 @@
+extends Area2D
+
+
+func _ready() -> void:
+    visible = false
+    $CollisionShape2D.visible = false
+    return
--- a/Levels/PortalDarkForest.gd
+++ b/Levels/PortalDarkForest.gd
@@ -1,17 +0,0 @@
-extends Area2D
-
-
-# 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:
-  self.visible = false
-  $CollisionShape2D.visible = false
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta: float) -> void:
-#  pass
--- a/Levels/Traps/Spawn
+++ b/Levels/Traps/Spawn
@@ -1,6 +1,6 @@
 extends Area2D

-export var enemy_path: String = 'res://Enemies/Ghost_Enemy.tscn'
+export var enemy_path: String = 'res://Enemies/ENEMY.tscn'
 export var relative_x_tiles: int
 export var relative_y_tiles: int