From 117e371ec2b17cdaf1e0441a22f3495407d9e897 Mon Sep 17 00:00:00 2001 From: techrunner Date: Fri, 16 Aug 2024 11:32:06 -0500 Subject: [PATCH] Changed Interactable items to extend Interactable and a --- Assets/scripts/Generator Panel.gd | 5 ++--- Assets/scripts/generator_key.gd | 5 +---- Assets/scripts/vape.gd | 8 ++------ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Assets/scripts/Generator Panel.gd b/Assets/scripts/Generator Panel.gd index efe722a..0da38c6 100644 --- a/Assets/scripts/Generator Panel.gd +++ b/Assets/scripts/Generator Panel.gd @@ -1,8 +1,7 @@ -extends StaticBody3D +extends Interactable + signal Generator_Started -@export var promt_message:String = "press e" -@export var promt_key:String @onready var animate = $AnimationPlayer diff --git a/Assets/scripts/generator_key.gd b/Assets/scripts/generator_key.gd index e5cabc6..6d65344 100644 --- a/Assets/scripts/generator_key.gd +++ b/Assets/scripts/generator_key.gd @@ -1,7 +1,4 @@ -extends StaticBody3D - -@export var promt_message:String = "Pickup Key" -@export var promt_key:String +extends Interactable func interact(player): GlobalSettings.HasGeneratorKey = true diff --git a/Assets/scripts/vape.gd b/Assets/scripts/vape.gd index eccc17b..b57873a 100644 --- a/Assets/scripts/vape.gd +++ b/Assets/scripts/vape.gd @@ -1,9 +1,5 @@ -extends Node3D - -@export var promt_message:String = "press e" -@export var promt_key:String - +extends Interactable func interact(player): print("vape picked up") - queue_free() + queue_free() \ No newline at end of file