Merge branch 'rebase'

project.godot

@@ -22,7 +22,7 @@ _global_script_classes=[ {
 "base": "Node",
 "class": "MusicChangedSlowAction",
 "language": "GDScript",
-"path": "res://scripts/OnMusicChangedSlowTrigger.gd"
+"path": "res://scripts/TriggerOnMusicChangedSlow.gd"
 }, {
 "base": "Action",
 "class": "PlaySound",
@@ -35,6 +35,11 @@ _global_script_classes=[ {
 "path": "res://scripts/Library/Actions/TriggerBase.gd"
 }, {
 "base": "TriggerBase",
+"class": "TriggerOnCollision",
+"language": "GDScript",
+"path": "res://scripts/Library/Actions/TriggerOnCollision.gd"
+}, {
+"base": "TriggerBase",
 "class": "TriggerOnReady",
 "language": "GDScript",
 "path": "res://scripts/Library/Actions/TriggerOnReady.gd"
@@ -45,6 +50,7 @@ _global_script_class_icons={
 "MusicChangedSlowAction": "",
 "PlaySound": "",
 "TriggerBase": "",
+"TriggerOnCollision": "",
 "TriggerOnReady": ""
 }
 

scripts/Library/Actions/TriggerOnCollision.gd

@@ -1,6 +1,9 @@
-extends TriggerBase
+class_name TriggerOnCollision extends TriggerBase
 
-export var collision_area
+export(NodePath) var collision_area
 
 func _ready():
-	pass # Replace with function body.
+	collision_area.connect("body_entered", self, "_on_body_entered")
+	
+func _on_body_entered(body: Node):
+	triggerAction(body)

scripts/OnMusicChangedSlowTrigger.gd

@@ -1,11 +0,0 @@
-class_name MusicChangedSlowAction extends Node
-
-func _ready():
-	MusicSingleton.register_change_action(self)
-	MusicSingleton.change_music()
-
-func _exit_tree():
-	MusicSingleton.unregister_change_action(self)
-	
-func execute() -> void:
-	print("Executed OnMusicChangedSlowAction")