Restructured files and worked on more complex quest progression

scripts/quest.gd

@@ -6,9 +6,27 @@ enum Status{
 	TAKEN,
 	IN_PROGRESS,
 	COMPLETED,
-	FAILED
+	FAILED,
+	CLOSED
 }
 
+class Event:
+	enum Type{
+		WAIT,
+		COMBAT,
+		CHOICE
+	}
+	var type : Type = Type.WAIT
+	var enemies : Array[String] = []
+	var time : float = 1
+	var time_elapsed
+	signal completed()
+	
+	func process(delta : float) -> void:
+		#TODO: Make quest combat work
+		time_elapsed += delta
+		if time_elapsed >= time:
+			completed.emit()
 
 var name : String = "A Basic Quest"
 var desc : String = "The default quest, with no special anything."
@@ -17,10 +35,7 @@ var location : String
 var steps : int = 1
 var rewards : Dictionary
 var length : float = 10
-var step_outcomes : Array = [
-	{"pass":"I succeeded!", "fail":"I failed!"}
-]	
-
+var events : Array[Event] = []
 
 
 var progress : float = 0
@@ -57,6 +72,8 @@ func complete() -> void:
 		#else it's a guild item they'll bring back for us
 	Game.notice("%s completed the quest '%s'!" % [questor.full_name(), name])
 
+func num_events() -> int:
+	return len(events)
 #TODO: Put in quest requirements
 func is_eligible(member : AdventurerData) -> bool:
 	return !taken