Extensive work on the sideview and initial work on player profiles, inventory display, and renaming adventurerdata vs adventurer to adventurer vs adventurersprite

This commit is contained in:
2025-08-27 08:02:11 -04:00
parent 38845e26fa
commit 2a236ea041
55 changed files with 1975 additions and 417 deletions

View File

@@ -1,6 +1,7 @@
class_name Quest extends Object
enum Status{
OPEN,
TAKEN,
@@ -11,49 +12,140 @@ enum Status{
}
class Event:
var enemy_types: Dictionary[String, PackedScene] = {
"goo": preload("res://templates/enemies/goo.tscn")
}
enum Type{
WAIT,
COMBAT,
CHOICE
}
enum CombatState{
FIGHTING,
VICTORY,
DEFEAT
}
var type : Type = Type.WAIT
var enemies : Array[String] = []
var time : float = 1
var time_elapsed
signal completed()
signal failed()
var participants : Array = []
var turn_queue : Array = []
var busy_list : Array = []
var combat_state
var dex_speed : int
var start(quest : Quest) -> void:
func start(quest : Quest) -> void:
match(type):
Type.WAIT:
pass
return
Type.COMBAT:
combat_state = CombatState.FIGHTING
var enemy_list = []
for enemy_name in enemies:
enemy_list.append(enemy_types[enemy_name].instantiate())
quest.questview.set_questor_animation("idle")
for enemy in enemy_list:
quest.questview.pause_setting()
quest.questview.place_enemy(enemy)
quest.questview.set_enemy_animation(enemy, "idle")
start_combat([quest.questor.quest_sprite], enemy_list)
func start_combat(adventurers : Array, enemies : Array) -> void:
participants = []
participants.append_array(adventurers)
participants.append_array(enemies)
var c_order : Array = []
var dex_speed = 0
for p in participants:
c_order.append([p, p.stats.dex])
if p.stats.dex > dex_speed:
dex_speed = p.stats.dex
c_order.append([p, p.stats.DEX])
if p.stats.DEX > dex_speed:
dex_speed = p.stats.DEX
c_order.sort_custom(func(a,b): return a[1] > b[1])
var delay = 5
var last_time = 0
for c in c_order:
c[0].busy.connect(_on_busy.bind(c[0]))
c[0].action_complete.connect(_on_combat_action_complete.bind(c[0]))
c[0].died.connect(_on_death.bind(c[0]))
var time = delay * dex_speed / c[1]
turn_queue.append({"combatant":c[0], "time": time - last_time})
last_time = time
func execute_attack(combatant, target) -> void:
busy_list.append(target)
#TODO: Make the combatant execute an attack
#TODO: Make the target take damage
func execute_attack(combatant : QuestSprite, target : QuestSprite) -> void:
var tween = combatant.create_tween()
tween.tween_interval(.25)
tween.tween_callback(combatant.attack.bind(target))
func add_to_turn_queue(combatant) -> void:
#Calculate time
var time = dex_speed / combatant.stats.DEX
#Walk through list to find insertion point
var idx = -1
for i in range(len(turn_queue)):
if turn_queue[i].time > time:
idx = i
break
else:
time -= turn_queue[i].time
var entry = {"combatant":combatant, "time":time}
if idx == -1:
turn_queue.append(entry)
else:
turn_queue[idx].time -= time
turn_queue.insert(idx,entry)
func _on_busy(combatant : QuestSprite) -> void:
busy_list.append(combatant)
func _on_death(killer : QuestSprite, combatant : QuestSprite) -> void:
busy_list.erase(combatant)
remove_from_queue(combatant)
participants.erase(combatant)
if killer != combatant:
var xp = Game.calculate_kill_exp(killer, combatant)
print("%s has earned %d exp" % [killer.name, xp])
killer.exp += xp
var enemy_list : Array = get_enemy_list(killer)
if len(enemy_list) == 0:
if killer is QuestorSprite:
victory()
else:
defeat()
func victory():
print("Questor won!")
combat_state = CombatState.VICTORY
for p : QuestorSprite in participants:
p.check_levelup()
#TODO: Notify player if level up occurs
time = 10
func defeat():
print("Questor lost!")
combat_state = CombatState.DEFEAT
failed.emit()
func remove_from_queue(combatant : QuestSprite) -> void:
var idx = -1
for i in range(len(turn_queue)):
if turn_queue[i].combatant == combatant:
idx = i
break
if idx != -1:
turn_queue.remove_at(idx)
else:
printerr("Tried to remove someone not in the turn queue")
func _on_combat_action_complete(requeue : bool, combatant : QuestSprite) -> void:
busy_list.erase(combatant)
if requeue:
add_to_turn_queue(combatant)
func execute_action(combatant) -> void:
busy_list = [combatant]
@@ -74,21 +166,29 @@ class Event:
func process(delta : float) -> void:
#TODO: Make quest combat work
if type == Type.COMBAT:
if len(busy_list) < 1:
if len(turn_queue) > 0:
turn_queue[0].time -= delta
if turn_queue[0].time <= 0:
var c = turn_queue.pop_front()
if len(turn_queue) > 0:
turn_queue[0].time += c.time
execute_action(c.combatant)
else:
resolve_combat()
time_elapsed += delta
if time_elapsed >= time:
completed.emit()
match(type):
Type.COMBAT:
match(combat_state):
CombatState.FIGHTING:
if len(busy_list) < 1:
if len(turn_queue) > 0:
turn_queue[0].time -= delta
if turn_queue[0].time <= 0:
var c = turn_queue.pop_front()
print("%s taking a turn!" % [c.combatant.name])
if len(turn_queue) > 0:
turn_queue[0].time += c.time
execute_action(c.combatant)
else:
resolve_combat()
CombatState.VICTORY:
time_elapsed += delta
if time_elapsed >= time:
completed.emit()
Type.WAIT:
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."
@@ -104,14 +204,15 @@ var progress : float = 0
var current_step : int = 0
var taken : bool = false
var status : Status = Status.OPEN
var questview : QuestView = null
var questor : AdventurerData = null
var questor : Adventurer = null
signal status_changed(status : Status)
func _init() -> void:
pass
func initiate(member : AdventurerData) -> void:
func initiate(member : Adventurer) -> void:
questor = member
status = Status.TAKEN
status_changed.emit(Status.TAKEN)
@@ -138,7 +239,7 @@ func num_events() -> int:
return len(events)
#TODO: Put in quest requirements
func is_eligible(member : AdventurerData) -> bool:
func is_eligible(member : Adventurer) -> bool:
return !taken
func is_taken() -> bool: