Ready to work on actual logic for battles.

This commit is contained in:
2026-01-15 22:17:50 -06:00
parent 274cbef780
commit 346e3f0607
9 changed files with 75 additions and 22 deletions

View File

@@ -12,7 +12,8 @@ enum InteractType {
NONE,
CONVERSATION,
ONE_TIME_ITEM,
CUTSCENE
CUTSCENE,
BATTLE_TEST,
};
@export_category("Identification")

View File

@@ -30,6 +30,9 @@ func isInteractable() -> bool:
if entity.oneTimeItem.item == Item.Id.NULL:
return false
return true
if entity.interactType == Entity.InteractType.BATTLE_TEST:
return true
return false
@@ -63,6 +66,18 @@ func onInteract(other:Entity) -> void:
entity.cutscene.queue(cutscene)
cutscene.start()
return
Entity.InteractType.BATTLE_TEST:
var testEnemy = BattleFighter.new({
'controller': BattleFighter.FighterController.AI
})
var cutscene:Cutscene = Cutscene.new()
cutscene.addCallable(BattleStartAction.getStartBattleCallable({
BATTLE.BattlePosition.RIGHT_MIDDLE_FRONT: PartySingleton.PARTY_JOHN,
BATTLE.BattlePosition.LEFT_MIDDLE_FRONT: testEnemy
}))
cutscene.start()
return
_:
pass

View File

@@ -32,6 +32,11 @@ entityId = "bcabec96-8d33-4c16-a997-3bb3b0562b33"
interactType = 1
conversation = Array[ExtResource("3_p7git")]([SubResource("Resource_xf0pb")])
[node name="NotPlayer4" parent="." instance=ExtResource("2_jmygs")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.68074, 1.11219, 0.0142021)
entityId = "bcabec96-8d33-4c16-a997-3bb3b0562b33"
interactType = 4
[node name="NotPlayer2" parent="." instance=ExtResource("2_jmygs")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00883961, 1.11219, 4.34543)
entityId = "ad5a1504-7fbf-45d6-b1bf-6e7af6314066"