More bugfixes

FractalDiane · Jan 12, 2019 · 4603c1c · 4603c1c
1 parent 5b105ab
commit 4603c1c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Globals/audioplayer.tscn b/Globals/audioplayer.tscn
@@ -13,7 +13,7 @@
 [ext_resource path="res://Sounds/Ambient/Puzzle solved.wav" type="AudioStream" id=11]
 [ext_resource path="res://Sounds/Music/Final Boss.wav" type="AudioStream" id=12]
 
-[node name="audioplayer" type="Node"]
+[node name="audioplayer" type="Node" index="0"]
 
 script = ExtResource( 1 )
 
@@ -106,6 +106,6 @@ pitch_scale = 1.0
 autoplay = false
 mix_target = 0
 bus = "Master"
-script = ExtResource( 3 )
+script = ExtResource( 6 )
 
 
diff --git a/Instances/Enemies/SideEye.tscn b/Instances/Enemies/SideEye.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=21 format=2]
 
 [ext_resource path="res://Scripts/Objects/Enemies/SideEye.gd" type="Script" id=1]
 [ext_resource path="res://Sprites/Combat/Eye0.png" type="Texture" id=2]
@@ -16,14 +16,10 @@
 [ext_resource path="res://Sprites/Combat/Eye12.png" type="Texture" id=14]
 [ext_resource path="res://Sprites/Combat/Eye13.png" type="Texture" id=15]
 [ext_resource path="res://Sounds/Characters/enemydie2.wav" type="AudioStream" id=16]
-[ext_resource path="res://Sounds/Characters/enemydie3.wav" type="AudioStream" id=17]
+[ext_resource path="res://Scripts/System/EffectAudio.gd" type="Script" id=17]
+[ext_resource path="res://Sounds/Characters/enemydie3.wav" type="AudioStream" id=18]
 
-
-
-
-
-
-[sub_resource type="SpriteFrames" id=3]
+[sub_resource type="SpriteFrames" id=1]
 
 animations = [ {
 "frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ) ],
@@ -42,7 +38,7 @@ animations = [ {
 custom_solver_bias = 0.0
 extents = Vector2( 5, 7.45525 )
 
-[node name="Eye" type="StaticBody2D" groups=[
+[node name="Eye" type="StaticBody2D" index="0" groups=[
 "BossEye",
 ]]
 
@@ -58,7 +54,7 @@ _sections_unfolded = [ "Transform" ]
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="." index="0"]
 
-frames = SubResource( 3 )
+frames = SubResource( 1 )
 animation = "up"
 frame = 1
 
@@ -75,15 +71,17 @@ pitch_scale = 1.0
 autoplay = false
 mix_target = 0
 bus = "Master"
+script = ExtResource( 17 )
 
 [node name="SoundHit2" type="AudioStreamPlayer" parent="." index="3"]
 
-stream = ExtResource( 17 )
+stream = ExtResource( 18 )
 volume_db = 0.0
 pitch_scale = 1.0
 autoplay = false
 mix_target = 0
 bus = "Master"
+script = ExtResource( 17 )
 
 [connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"]
 

diff --git a/Scenes/Dungeon 2/Dungeon2-8.tscn b/Scenes/Dungeon 2/Dungeon2-8.tscn
@@ -7,7 +7,7 @@
 [ext_resource path="res://Instances/System/PitController.tscn" type="PackedScene" id=5]
 [ext_resource path="res://Instances/Transition.tscn" type="PackedScene" id=6]
 
-[node name="Node2D" type="Node2D" index="0"]
+[node name="Node2D" type="Node2D"]
 
 _sections_unfolded = [ "Transform" ]
 
@@ -46,7 +46,7 @@ __meta__ = {
 
 [node name="PitController" parent="." index="3" instance=ExtResource( 5 )]
 
-has_platform = true
+has_platform = false
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="PitController" index="3"]
 

diff --git a/Scenes/Dungeon 2/Dungeon2-9.tscn b/Scenes/Dungeon 2/Dungeon2-9.tscn
@@ -9,7 +9,7 @@
 [ext_resource path="res://Instances/Objects/Sentry.tscn" type="PackedScene" id=7]
 [ext_resource path="res://Instances/JumpPoint.tscn" type="PackedScene" id=8]
 
-[node name="Node2D" type="Node2D" index="0"]
+[node name="Node2D" type="Node2D"]
 
 _sections_unfolded = [ "Transform" ]
 

diff --git a/Scenes/GATE/Gate-FINALBOSS1.tscn b/Scenes/GATE/Gate-FINALBOSS1.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=19 format=2]
 
 [ext_resource path="res://Sprites/UI/Background.png" type="Texture" id=1]
 [ext_resource path="res://Instances/UI.tscn" type="PackedScene" id=2]
@@ -10,6 +10,7 @@
 [ext_resource path="res://Sprites/Props/Registry.png" type="Texture" id=8]
 [ext_resource path="res://Scripts/Scenes/FinalBossIntro.gd" type="Script" id=9]
 [ext_resource path="res://Sounds/Music/Registry.wav" type="AudioStream" id=10]
+[ext_resource path="res://Scripts/System/MusicAudio.gd" type="Script" id=11]
 
 [sub_resource type="Gradient" id=1]
 
@@ -116,15 +117,15 @@ corrupt_interval = 1.5
 
 [node name="CorruptionOverlaySprite" parent="CorruptionOverlay" index="1"]
 
-frame = 7
+frame = 11
 
 [node name="CorruptionOverlay2" parent="." index="4" instance=ExtResource( 5 )]
 
 corrupt = false
 
 [node name="CorruptionOverlaySprite" parent="CorruptionOverlay2" index="1"]
 
-frame = 7
+frame = 11
 
 [node name="Transition" parent="." index="5" instance=ExtResource( 6 )]
 
@@ -235,6 +236,7 @@ pitch_scale = 1.0
 autoplay = false
 mix_target = 0
 bus = "Master"
+script = ExtResource( 11 )
 
 [node name="TimerMusic" type="Timer" parent="RegistryEntryTrigger" index="2"]
 

diff --git a/Scenes/Startup.tscn b/Scenes/Startup.tscn
@@ -7,7 +7,7 @@
 [node name="Node2D" type="Node2D" index="0"]
 
 script = ExtResource( 1 )
-start_scene = "res://Scenes/Dungeon 2/Dungeon2-11.tscn"
+start_scene = "res://Scenes/Dungeon 2/Dungeon2-8.tscn"
 start_position = Vector2( 80, 72 )
 flags = [ "jari_talk", "cultist40_talk", "holding_dungeon1key", "dungeon1_switchesTL", "dungeon1_switchesTR", "dungeon1_switchTL_1", "dungeon1_switchTL_2", "dungeon1_switchTL_3", "dungeon1_switchTL_4", "dungeon1_switchTR_1", "dungeon1_switchTR_2", "dungeon1_switchTR_3", "dungeon1_switchTR_4", "kein_talk", "keininside_talk", "dungeon1_switches2TL", "dungeon1_switches2TR", "dungeon1_switches2BL", "dungeon1_switches2BR", "dungeon1_switchTR_5", "dungeon1_switchBR2_1", "dungeon1_switchBR2_2", "dungeon1_switchBR2_3", "dungeon1_switchBR2_4", "dungeon1_switchTR2_1", "dungeon1_switchTR2_2", "dungeon1_switchTR2_3", "dungeon1_switchTR2_4", "dungeon1_switchTL2_1", "dungeon1_switchTL2_2", "dungeon1_switchBL2_1", "dungeon1_switchBL2_2", "dungeon1_switchBL2_3", "iiro_talk", "dungeon2_switchIntro", "dungeon2_switchesL", "dungeon2_switchesR", "dungeon2_switchL1", "dungeon2_switchL2", "dungeon2_switchR1", "dungeon2_switchR2", "dungeon2_switchR3", "dungeon2_switchR4", "dungeon2_door1", "gold_1", "gold_2", "gold_3", "gold_4", "gold_5", "gold_6", "gold_7", "gold_8", "gold_9", "dungeon2_switchesL2", "dungeon2_switchesR2", "holding_dungeon2key", "holding_bow", "dungeon1_complete", "keinoutside_talk", "dungeon2_complete", "holding_gatekey", "jarid1_talk", "jarid2_talk", "iiro00_talk", "azura_talk", "azura12_talk", "azura00_talk", "gallaro_talk", "gold_10", "gold_11", "kein00_talk" ]
 title_screen = true