forked from public/foundryvtt-reve-de-dragon
Roll V2: cuisine
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { ActorToken } from "../actor-token.mjs"
|
||||
import { TokenActor } from "../technical/actor-token.mjs"
|
||||
import { StatusEffects } from "../settings/status-effects.js"
|
||||
import { ROLL_TYPE_ATTAQUE, ROLL_TYPE_DEFENSE } from "./roll-constants.mjs"
|
||||
import { PART_ATTAQUE } from "./roll-part-attaque.mjs"
|
||||
@@ -9,8 +9,8 @@ export class RollBasicParts {
|
||||
|
||||
static restore(rollData) {
|
||||
rollData.ids.sceneId = rollData.ids.sceneId ?? canvas.scene.id
|
||||
rollData.active = RollBasicParts.$getActor(rollData)
|
||||
rollData.opponent = RollBasicParts.$getOpponent(rollData)
|
||||
rollData.active = RollBasicParts.getTokenActor(rollData)
|
||||
rollData.opponent = RollBasicParts.getTokenActorOpponent(rollData)
|
||||
if (rollData.type.opposed == undefined) {
|
||||
rollData.type.opposed = rollData.opponent != null
|
||||
}
|
||||
@@ -64,30 +64,30 @@ export class RollBasicParts {
|
||||
}
|
||||
}
|
||||
|
||||
static $getActor(rollData) {
|
||||
static getTokenActor(rollData) {
|
||||
if (rollData.ids.actorTokenId) {
|
||||
return ActorToken.fromTokenId(rollData.ids.actorTokenId, rollData.ids.sceneId)
|
||||
return TokenActor.fromTokenId(rollData.ids.actorTokenId, rollData.ids.sceneId)
|
||||
}
|
||||
else {
|
||||
const actorId = rollData.ids.actorId ?? (canvas.tokens.controlled.length == 1
|
||||
/** TODO: jets de plusieurs personnages??? */
|
||||
? canvas.tokens.controlled[0]
|
||||
: undefined)
|
||||
return ActorToken.fromActorId(actorId, () => { throw new Error("Pas d'acteur sélectionné") })
|
||||
return TokenActor.fromActorId(actorId, () => { throw new Error("Pas d'acteur sélectionné") })
|
||||
}
|
||||
}
|
||||
|
||||
static $getOpponent(rollData) {
|
||||
static getTokenActorOpponent(rollData) {
|
||||
if (rollData.ids.opponentTokenId) {
|
||||
return ActorToken.fromTokenId(rollData.ids.opponentTokenId, rollData.ids.sceneId)
|
||||
return TokenActor.fromTokenId(rollData.ids.opponentTokenId, rollData.ids.sceneId)
|
||||
}
|
||||
else if (rollData.ids.opponentId) {
|
||||
return ActorToken.fromActorId(rollData.ids.opponentId)
|
||||
return TokenActor.fromActorId(rollData.ids.opponentId)
|
||||
}
|
||||
else {
|
||||
const targets = Array.from(game.user.targets)
|
||||
if (targets.length == 1) {
|
||||
return ActorToken.fromToken(targets[0])
|
||||
return TokenActor.fromToken(targets[0])
|
||||
}
|
||||
else {
|
||||
return undefined
|
||||
|
Reference in New Issue
Block a user