Compare commits
3 Commits
fvtt-pegas
...
master
Author | SHA1 | Date | |
---|---|---|---|
0c215e7a9c | |||
1b655a9c0e | |||
bbf0f31d4c |
@ -764,17 +764,17 @@ export class PegasusActor extends Actor {
|
|||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
modifyStun(incDec) {
|
modifyStun(incDec) {
|
||||||
if ( incDec < 0 && (this.system.secondary.confidence.status == "anxious" || this.system.secondary.confidence.status == "lostface") ) {
|
if (incDec < 0 && (this.system.secondary.confidence.status == "anxious" || this.system.secondary.confidence.status == "lostface")) {
|
||||||
ui.notifications.warn("Unable to recover STUN because of Confidence status : " + this.system.secondary.confidence.status)
|
ui.notifications.warn("Unable to recover STUN because of Confidence status : " + this.system.secondary.confidence.status)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
let myself = this
|
let myself = this
|
||||||
let combat = duplicate(myself.system.combat)
|
let combat = duplicate(myself.system.combat)
|
||||||
combat.stunlevel += incDec
|
combat.stunlevel += incDec
|
||||||
let daze = this.effects.find( e => e.label == "Daze")
|
let daze = this.effects.find(e => e.label == "Daze")
|
||||||
|
|
||||||
if (daze && combat.stunlevel == 0) {
|
if (daze && combat.stunlevel == 0) {
|
||||||
this.deleteEmbeddedDocuments("ActiveEffect", [ daze.id ] )
|
this.deleteEmbeddedDocuments("ActiveEffect", [daze.id])
|
||||||
}
|
}
|
||||||
if (combat.stunlevel >= 0) {
|
if (combat.stunlevel >= 0) {
|
||||||
myself.update({ 'system.combat': combat })
|
myself.update({ 'system.combat': combat })
|
||||||
@ -811,7 +811,7 @@ export class PegasusActor extends Actor {
|
|||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
modifyMomentum(incDec) {
|
modifyMomentum(incDec) {
|
||||||
if ( this.system.combat.stunlevel > 0 ) {
|
if (this.system.combat.stunlevel > 0) {
|
||||||
ui.notifications.warn("Unable to gain/use Momentum while stunned")
|
ui.notifications.warn("Unable to gain/use Momentum while stunned")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -1467,7 +1467,7 @@ export class PegasusActor extends Actor {
|
|||||||
updates['system.momentum.max'] = momentum
|
updates['system.momentum.max'] = momentum
|
||||||
}
|
}
|
||||||
|
|
||||||
let mrLevel = (this.system.statistics.agi.value + this.system.statistics.agi.mod + this.system.statistics.str.value + this.system.statistics.str.mod) - (this.system.statistics.phy.value+this.system.statistics.phy.mod)
|
let mrLevel = (this.system.statistics.agi.value + this.system.statistics.agi.mod + this.system.statistics.str.value + this.system.statistics.str.mod) - (this.system.statistics.phy.value + this.system.statistics.phy.mod)
|
||||||
mrLevel = (mrLevel < 1) ? 1 : mrLevel;
|
mrLevel = (mrLevel < 1) ? 1 : mrLevel;
|
||||||
if (mrLevel != this.system.mr.value) {
|
if (mrLevel != this.system.mr.value) {
|
||||||
updates['system.mr.value'] = mrLevel
|
updates['system.mr.value'] = mrLevel
|
||||||
@ -1502,7 +1502,7 @@ export class PegasusActor extends Actor {
|
|||||||
}
|
}
|
||||||
if (this.isOwner || game.user.isGM) {
|
if (this.isOwner || game.user.isGM) {
|
||||||
// Update current hindrance level
|
// Update current hindrance level
|
||||||
let hindrance = this.system.combat.hindrancedice
|
let hindrance = 0; //this.system.combat.hindrancedice
|
||||||
if (!this.checkIgnoreHealth()) {
|
if (!this.checkIgnoreHealth()) {
|
||||||
if (this.system.secondary.health.status == "wounded") {
|
if (this.system.secondary.health.status == "wounded") {
|
||||||
hindrance += 1
|
hindrance += 1
|
||||||
@ -1924,6 +1924,18 @@ export class PegasusActor extends Actor {
|
|||||||
await this.createEmbeddedDocuments('Item', newItems)
|
await this.createEmbeddedDocuments('Item', newItems)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
/* -------------------------------------------- */
|
||||||
|
checkEFfectsHindranceDeletion(statKey) {
|
||||||
|
let toRem = []
|
||||||
|
let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.oneuse &&
|
||||||
|
effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
|
||||||
|
for (let effect of effects) {
|
||||||
|
toRem.push(effect.id)
|
||||||
|
}
|
||||||
|
if (toRem.length > 0) {
|
||||||
|
this.deleteEmbeddedDocuments('Item', toRem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
computeCurrentHindrances(statKey) {
|
computeCurrentHindrances(statKey) {
|
||||||
@ -1935,15 +1947,9 @@ export class PegasusActor extends Actor {
|
|||||||
if (overCapacity > 0) {
|
if (overCapacity > 0) {
|
||||||
hindrancesDices += overCapacity
|
hindrancesDices += overCapacity
|
||||||
}
|
}
|
||||||
let effects = this.items.filter(item => item.type == 'effect')
|
let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
|
||||||
for (let effect of effects) {
|
for (let effect of effects) {
|
||||||
if (effect.system.hindrance && ( effect.system.stataffected == statKey || effect.system.stataffected == "all")) {
|
|
||||||
hindrancesDices += effect.system.effectlevel
|
hindrancesDices += effect.system.effectlevel
|
||||||
if ( effect.system.oneuse) {
|
|
||||||
effect.system.isUSed = true // Ensure deletion
|
|
||||||
this.deleteEmbeddedDocuments('Item', [effect.id])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
|
if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
|
||||||
hindrancesDices += 1
|
hindrancesDices += 1
|
||||||
@ -2248,6 +2254,7 @@ export class PegasusActor extends Actor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rollData.hindranceDices = this.computeCurrentHindrances(statKey)
|
rollData.hindranceDices = this.computeCurrentHindrances(statKey)
|
||||||
|
rollData.minHindranceDices = rollData.hindranceDices
|
||||||
|
|
||||||
this.processSizeBonus(rollData)
|
this.processSizeBonus(rollData)
|
||||||
this.addEffects(rollData, isInit, isPower, subKey == "power-dmg")
|
this.addEffects(rollData, isInit, isPower, subKey == "power-dmg")
|
||||||
@ -2298,7 +2305,7 @@ export class PegasusActor extends Actor {
|
|||||||
}
|
}
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
getExtraTICsFromEffect() {
|
getExtraTICsFromEffect() {
|
||||||
let effects = this.items.filter(it => it.type == "effect" && Number(it.system.extratics)>0)
|
let effects = this.items.filter(it => it.type == "effect" && Number(it.system.extratics) > 0)
|
||||||
let nbTics = 0
|
let nbTics = 0
|
||||||
for (let e of effects) {
|
for (let e of effects) {
|
||||||
nbTics += Number(e.system.extratics)
|
nbTics += Number(e.system.extratics)
|
||||||
@ -2427,8 +2434,8 @@ export class PegasusActor extends Actor {
|
|||||||
rollData.title = "MR / Initiative"
|
rollData.title = "MR / Initiative"
|
||||||
rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect()
|
rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect()
|
||||||
rollData.TICs = []
|
rollData.TICs = []
|
||||||
for(let i=0; i<rollData.nbTIC; i++) {
|
for (let i = 0; i < rollData.nbTIC; i++) {
|
||||||
rollData.TICs.push( {text:"NONE", revealed: false, displayed: false})
|
rollData.TICs.push({ text: "NONE", revealed: false, displayed: false })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.startRoll(rollData);
|
this.startRoll(rollData);
|
||||||
|
@ -296,6 +296,13 @@ export class PegasusRollDialog extends Dialog {
|
|||||||
PegasusUtility.removeFromDicePool(this.rollData, idx)
|
PegasusUtility.removeFromDicePool(this.rollData, idx)
|
||||||
this.refreshDialog()
|
this.refreshDialog()
|
||||||
})
|
})
|
||||||
|
html.find('.pool-remove-hindrance-dice').click(async (event) => {
|
||||||
|
if (this.rollData.hindranceDices > this.rollData.minHindranceDices) {
|
||||||
|
this.rollData.hindranceDices--;
|
||||||
|
}
|
||||||
|
this.refreshDialog()
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -165,7 +165,8 @@ export class PegasusUtility {
|
|||||||
static getDiceList() {
|
static getDiceList() {
|
||||||
return [{ key: "d4", level: 1, img: "systems/fvtt-pegasus-rpg/images/dice/d4.webp" }, { key: "d6", level: 2, img: "systems/fvtt-pegasus-rpg/images/dice/d6.webp" },
|
return [{ key: "d4", level: 1, img: "systems/fvtt-pegasus-rpg/images/dice/d4.webp" }, { key: "d6", level: 2, img: "systems/fvtt-pegasus-rpg/images/dice/d6.webp" },
|
||||||
{ key: "d8", level: 3, img: "systems/fvtt-pegasus-rpg/images/dice/d8.webp" }, { key: "d10", level: 4, img: "systems/fvtt-pegasus-rpg/images/dice/d10.webp" },
|
{ key: "d8", level: 3, img: "systems/fvtt-pegasus-rpg/images/dice/d8.webp" }, { key: "d10", level: 4, img: "systems/fvtt-pegasus-rpg/images/dice/d10.webp" },
|
||||||
{ key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" }]
|
{ key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" },
|
||||||
|
{ key: "hindrance", level: 0, img: "systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png"}]
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
@ -283,12 +284,16 @@ export class PegasusUtility {
|
|||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
static addDicePool(rollData, diceKey, level) {
|
static addDicePool(rollData, diceKey, level) {
|
||||||
|
if (diceKey == "hindrance") {
|
||||||
|
rollData.hindranceDices +=1
|
||||||
|
} else {
|
||||||
let newDice = {
|
let newDice = {
|
||||||
name: "dice-click", key: diceKey, level: level,
|
name: "dice-click", key: diceKey, level: level,
|
||||||
img: `systems/fvtt-pegasus-rpg/images/dice/${diceKey}.webp`
|
img: `systems/fvtt-pegasus-rpg/images/dice/${diceKey}.webp`
|
||||||
}
|
}
|
||||||
rollData.dicePool.push(newDice)
|
rollData.dicePool.push(newDice)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*-------------------------------------------- */
|
/*-------------------------------------------- */
|
||||||
static removeFromDicePool(rollData, diceIdx) {
|
static removeFromDicePool(rollData, diceIdx) {
|
||||||
@ -801,11 +806,11 @@ export class PegasusUtility {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (toRem.length > 0) {
|
|
||||||
//console.log("Going to remove one use effects", toRem)
|
|
||||||
let actor = game.actors.get(rollData.actorId)
|
let actor = game.actors.get(rollData.actorId)
|
||||||
|
if (toRem.length > 0) {
|
||||||
actor.deleteEmbeddedDocuments('Item', toRem)
|
actor.deleteEmbeddedDocuments('Item', toRem)
|
||||||
}
|
}
|
||||||
|
actor.checkEFfectsHindranceDeletion(rollData.statKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
|
@ -1537,3 +1537,12 @@ Focus FOC: #ff0084
|
|||||||
max-height: 48px;
|
max-height: 48px;
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
}
|
}
|
||||||
|
.dice-pool-image-add {
|
||||||
|
border: 0;
|
||||||
|
margin-left: 4px;
|
||||||
|
min-width: 32px;
|
||||||
|
min-height: 32px;
|
||||||
|
max-width: 32px;
|
||||||
|
max-height: 32px;
|
||||||
|
flex-grow: 0;
|
||||||
|
}
|
@ -252,7 +252,7 @@
|
|||||||
],
|
],
|
||||||
"title": "Pegasus RPG",
|
"title": "Pegasus RPG",
|
||||||
"url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
|
"url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
|
||||||
"version": "11.0.20",
|
"version": "11.0.23",
|
||||||
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.20.zip",
|
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.23.zip",
|
||||||
"background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
|
"background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
|
||||||
}
|
}
|
@ -71,12 +71,24 @@
|
|||||||
</span>
|
</span>
|
||||||
<div class="flexrow dice-pool-stack">
|
<div class="flexrow dice-pool-stack">
|
||||||
{{#each dicePool as |dice idx|}}
|
{{#each dicePool as |dice idx|}}
|
||||||
<span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}" data-dice-key="{{dice.key}}"><img class="dice-pool-image"
|
<span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}"
|
||||||
src="{{dice.img}}" alt="dices"></a></span>
|
data-dice-key="{{dice.key}}"><img class="dice-pool-image" src="{{dice.img}}" alt="dices"></a></span>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="dice-pool-div">
|
||||||
|
<span>
|
||||||
|
<h3 class="dice-pool-label">Hindrance Dice</h3>
|
||||||
|
</span>
|
||||||
|
<div class="flexrow dice-pool-stack">
|
||||||
|
{{#for 1 hindranceDices 1}}
|
||||||
|
<span><a class="pool-remove-hindrance-dice" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
|
||||||
|
src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" alt="dices"></a></span>
|
||||||
|
{{/for}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{{#if noBonusDice}}
|
{{#if noBonusDice}}
|
||||||
<div class="flexrow">
|
<div class="flexrow">
|
||||||
No bonus dice due to effect !
|
No bonus dice due to effect !
|
||||||
@ -84,25 +96,12 @@
|
|||||||
{{else}}
|
{{else}}
|
||||||
<div class="flexrow">
|
<div class="flexrow">
|
||||||
{{#each diceList as |dice idx|}}
|
{{#each diceList as |dice idx|}}
|
||||||
<span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img class="dice-pool-image"
|
<span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img
|
||||||
src="{{dice.img}}" alt="dices"></a></span>
|
class="dice-pool-image-add" src="{{dice.img}}" alt="dices"></a></span>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{#if hindranceDices}}
|
|
||||||
<div class="dice-pool-div">
|
|
||||||
<span>
|
|
||||||
<h3 class="dice-pool-label">Hindrance Dice</h3>
|
|
||||||
</span>
|
|
||||||
<div class="flexrow dice-pool-stack">
|
|
||||||
{{#for 1 hindranceDices 1}}
|
|
||||||
<span><a class="" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
|
|
||||||
src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" alt="dices"></a></span>
|
|
||||||
{{/for}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
<div class="flexrow">
|
<div class="flexrow">
|
||||||
|
|
||||||
@ -129,18 +128,27 @@
|
|||||||
<option value="d6">Outnumbered 2 Extra Allies d6</option>
|
<option value="d6">Outnumbered 2 Extra Allies d6</option>
|
||||||
<option value="d8">Outnumbered 3 Extra Allies d8</option>
|
<option value="d8">Outnumbered 3 Extra Allies d8</option>
|
||||||
<option value="d10">Outnumbered 4 Extra Allies d10</option>
|
<option value="d10">Outnumbered 4 Extra Allies d10</option>
|
||||||
<option value="d12">Outnumbered 5 Extra Allies d12<option>
|
<option value="d12">Outnumbered 5 Extra Allies d12
|
||||||
|
<option>
|
||||||
<option value="none4">===== Called DMG Shot Bonus</option>
|
<option value="none4">===== Called DMG Shot Bonus</option>
|
||||||
<option value="d12">Eyes/head d12<option>
|
<option value="d12">Eyes/head d12
|
||||||
|
<option>
|
||||||
<option value="none4">===== Impact DMG Bonus</option>
|
<option value="none4">===== Impact DMG Bonus</option>
|
||||||
<option value="d4">Soft d4<option>
|
<option value="d4">Soft d4
|
||||||
<option value="d6">Thin/Flimsy d6<option>
|
<option>
|
||||||
<option value="d8">Solid Furniture d8<option>
|
<option value="d6">Thin/Flimsy d6
|
||||||
<option value="d10">Thin Metal/Thick Wood d10<option>
|
<option>
|
||||||
<option value="d12">Solid Object/Concrete d12<option>
|
<option value="d8">Solid Furniture d8
|
||||||
|
<option>
|
||||||
|
<option value="d10">Thin Metal/Thick Wood d10
|
||||||
|
<option>
|
||||||
|
<option value="d12">Solid Object/Concrete d12
|
||||||
|
<option>
|
||||||
<option value="none5">===== Other Circumstances</option>
|
<option value="none5">===== Other Circumstances</option>
|
||||||
<option value="d4">Concentrated<option>
|
<option value="d4">Concentrated
|
||||||
<option value="d4">Off Hand d4<option>
|
<option>
|
||||||
|
<option value="d4">Off Hand d4
|
||||||
|
<option>
|
||||||
<option value="d6">Higher Ground d6</option>
|
<option value="d6">Higher Ground d6</option>
|
||||||
{{/select}}
|
{{/select}}
|
||||||
</select>
|
</select>
|
||||||
|
Loading…
Reference in New Issue
Block a user