Mostly fixed battle stuff

This commit is contained in:
2026-01-18 11:19:26 -06:00
parent 6f3f613f56
commit 73104560e8
5 changed files with 104 additions and 29 deletions

View File

@@ -1,5 +1,6 @@
class_name BattleAction
var handle:String
var speedModifier:float
var canTargetMultiple:bool
var canTargetEnemy:bool
@@ -7,6 +8,7 @@ var canTargetAlly:bool
var preferAlly:bool
func _init(params:Dictionary) -> void:
self.handle = params["handle"]
self.speedModifier = params.get("speedModifier", 1.0)
self.canTargetMultiple = params.get("canTargetMultiple", false)
self.canTargetEnemy = params.get("canTargetEnemy", true)

View File

@@ -13,4 +13,4 @@ func getPriority() -> float:
return 1.0
func execute(cutscene:Cutscene) -> void:
pass
pass

View File

@@ -12,7 +12,6 @@ enum BattleMoveResult {
CRIT,
}
var name:String
var power:int
var mpCost:int
var accuracy:float
@@ -20,7 +19,7 @@ var moveType:MoveType
var fieldUse:bool
func _init(params:Dictionary) -> void:
self.name = params.get("name", "Unknown Move")
super(params)
self.power = params.get("power", 0)
self.mpCost = params.get("mpCost", 0)
self.speedModifier = params.get("speedModifier", 1.0)
@@ -67,14 +66,14 @@ func canFighterUse(fighter:BattleFighter) -> bool:
# Moves
static var MOVE_PUNCH = BattleMove.new({
"name": "Punch",
"handle": "punch",
"power": 15,
"accuracy": 0.95,
"moveType": MoveType.PHYSICAL
})
static var MOVE_FIRE1 = BattleMove.new({
"name": "Fire",
"handle": "fire1",
"power": 25,
"mpCost": 5,
"accuracy": 0.9,
@@ -83,7 +82,7 @@ static var MOVE_FIRE1 = BattleMove.new({
})
static var MOVE_HEAL1 = BattleMove.new({
"name": "Heal",
"handle": "heal1",
"power": -20,
"mpCost": 8,
"accuracy": 1.0,