More work on combat

data/quests/quest.gd

@@ -73,6 +73,7 @@ class Event:
 					enemy_list.append(enemy_types[enemy_name].instantiate())
 				quest.questview.set_questor_animation("idle")
 				for enemy in enemy_list:
+					enemy.flip_h()
 					quest.questview.pause_setting()
 					quest.questview.place_enemy(enemy, true)
 					quest.questview.set_enemy_animation(enemy, "idle")
@@ -82,10 +83,12 @@ class Event:
 		participants = []
 		participants.append_array(adventurers)
 		participants.append_array(enemies)
-		
+		time = 1.25
+		time_elapsed = 0
 		var c_order : Array = []
 		var dex_speed = 0
 		for p in participants:
+			p.show_lifebar(true)
 			c_order.append([p, p.stats.DEX])
 			if p.stats.DEX > dex_speed:
 				dex_speed = p.stats.DEX
@@ -150,7 +153,8 @@ class Event:
 		for p : QuestorSprite in participants:
 			p.check_levelup()
 			#TODO: Notify player if level up occurs
-		time = 5
+		time = 3
+		time_elapsed = 0
 	
 	func defeat():
 		print("Questor lost!")
@@ -194,12 +198,21 @@ class Event:
 		return lst
 	
 	func resolve_combat() -> void:
+		for p in participants:
+			p.show_lifebar(false)
 		pass
 			
 	func process(delta : float) -> void:
 		#TODO: Make quest combat work
 		match(type):
 			Type.COMBAT:
+				if time != 0:
+					time_elapsed += delta
+					if time_elapsed >= time:
+						time = 0
+						time_elapsed = 0
+					else:
+						return
 				match(combat_state):
 					CombatState.FIGHTING:
 						if len(busy_list) < 1:
@@ -214,8 +227,7 @@ class Event:
 							else:
 								resolve_combat()
 					CombatState.VICTORY:
-						time_elapsed += delta
-						if time_elapsed >= time:
+							resolve_combat()
 							complete = true
 							completed.emit()
 			Type.WAIT: