Compare commits
12 Commits
fvtt-pegas
...
fvtt-pegas
Author | SHA1 | Date | |
---|---|---|---|
de3e16a3f0 | |||
7fcb5c36b6 | |||
be83dbd055 | |||
662804c658 | |||
4311a4762d | |||
8ddc3ad776 | |||
f4a8aa7927 | |||
45332702dc | |||
d8215301b4 | |||
932573c9ae | |||
d6a57de134 | |||
e2d5a0ec74 |
File diff suppressed because it is too large
Load Diff
@ -146,10 +146,10 @@ export class PegasusUtility {
|
||||
static updateEffectsBonusDice(rollData) {
|
||||
let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-bonus-dice")
|
||||
for (let effect of rollData.effectsList) {
|
||||
if (effect && effect.applied && effect.type == "effect" && effect.effect && effect.effect.system.bonusdice) {
|
||||
if (effect && effect.applied && effect.type == "effect" && !effect.effect?.system?.hindrance && effect.effect && effect.effect.system.bonusdice) {
|
||||
newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.effect.system.effectlevel, 0, effect.effect.name))
|
||||
}
|
||||
if (effect && effect.applied && effect.type == "effect" && effect.value && effect.isdynamic) {
|
||||
if (effect && effect.applied && effect.type == "effect" && effect.value && effect.isdynamic && !effect.effect?.system?.hindrance) {
|
||||
newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.value, 0, effect.name))
|
||||
}
|
||||
}
|
||||
@ -161,7 +161,9 @@ export class PegasusUtility {
|
||||
let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-hindrance")
|
||||
for (let hindrance of rollData.effectsList) {
|
||||
if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance))) {
|
||||
console.log("Adding Hindrance 1", hindrance, newDicePool)
|
||||
newDicePool = newDicePool.concat(this.buildDicePool("effect-hindrance", (hindrance.value) ? hindrance.value : hindrance.effect.system.effectlevel, 0, hindrance.name))
|
||||
console.log("Adding Hindrance 2", newDicePool)
|
||||
}
|
||||
}
|
||||
rollData.dicePool = newDicePool
|
||||
@ -1208,14 +1210,15 @@ export class PegasusUtility {
|
||||
let agitatorTokens = canvas.tokens.placeables.filter(token => token.actor.isAgitator() && !token.document.hidden)
|
||||
for (let token of agitatorTokens) {
|
||||
token.refresh()
|
||||
if (token.document.disposition == 0) {
|
||||
continue
|
||||
let ennemies = []
|
||||
if (token.document.disposition == -1) {
|
||||
ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0 ))
|
||||
}
|
||||
let disposition = ( token.document.disposition == -1) ? 1 : -1
|
||||
let ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == disposition)
|
||||
let neutrals = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == 0)
|
||||
if (neutrals ) {
|
||||
ennemies = ennemies.concat(neutrals)
|
||||
if (token.document.disposition == 1) {
|
||||
ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 0 ))
|
||||
}
|
||||
if (token.document.disposition == 0) {
|
||||
ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 1 ))
|
||||
}
|
||||
for (let ennemy of ennemies) {
|
||||
if (ennemy.actor.id != token.actor.id) {
|
||||
|
@ -23,7 +23,7 @@
|
||||
"manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/raw/branch/master/system.json",
|
||||
"compatibility": {
|
||||
"minimum": "10",
|
||||
"verified": "10.285",
|
||||
"verified": "10.286",
|
||||
"maximum": "10"
|
||||
},
|
||||
"id": "fvtt-pegasus-rpg",
|
||||
@ -253,7 +253,7 @@
|
||||
],
|
||||
"title": "Pegasus RPG",
|
||||
"url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
|
||||
"version": "10.1.0",
|
||||
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.0.zip",
|
||||
"version": "10.1.3",
|
||||
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.3.zip",
|
||||
"background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
|
||||
}
|
@ -417,6 +417,7 @@
|
||||
"affectstatus": false,
|
||||
"affectedstatus": "",
|
||||
"locked": false,
|
||||
"droptext": "",
|
||||
"description": ""
|
||||
},
|
||||
"race": {
|
||||
|
@ -85,7 +85,10 @@
|
||||
<li class="flexrow"><label class="generic-label">Locked (Only GM can change/edit) ?</label>
|
||||
<label class="attribute-value checkbox"><input type="checkbox" name="system.locked" {{checked data.locked}}/></label>
|
||||
</li>
|
||||
|
||||
<li class="flexrow"><label class="generic-label">Display Text when added to Actor</label>
|
||||
<input type="text" class="input-numeric-short padd-right" name="system.droptext" value="{{data.droptext}}" data-dtype="String"/>
|
||||
</li>
|
||||
|
||||
<li class="flexrow"><label class="generic-label">Affect Status?</label>
|
||||
<label class="attribute-value checkbox"><input type="checkbox" name="system.affectstatus" {{checked data.affectstatus}}/></label>
|
||||
</li>
|
||||
|
@ -14,7 +14,7 @@
|
||||
</span>
|
||||
<select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.level"
|
||||
value="{{stat.level}}" data-dtype="Number" disabled>
|
||||
{{#select stat.level}}
|
||||
{{#select (add stat.level stat.bonuseffect)}}
|
||||
{{#if (eq key "ad")}}
|
||||
{{{@root.optionsLevel}}}
|
||||
{{else}}
|
||||
|
Reference in New Issue
Block a user