Compare commits

...

4 Commits

6 changed files with 129 additions and 93 deletions

View File

@ -764,17 +764,17 @@ export class PegasusActor extends Actor {
/* -------------------------------------------- */
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)
return
}
let myself = this
let combat = duplicate(myself.system.combat)
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) {
this.deleteEmbeddedDocuments("ActiveEffect", [ daze.id ] )
this.deleteEmbeddedDocuments("ActiveEffect", [daze.id])
}
if (combat.stunlevel >= 0) {
myself.update({ 'system.combat': combat })
@ -786,7 +786,7 @@ export class PegasusActor extends Actor {
if (!daze) {
this.createEmbeddedDocuments("ActiveEffect", [
{ label: 'Daze', icon: 'icons/svg/daze.svg', flags: { core: { statusId: 'daze' } } }
])
])
}
if (incDec > 0) {
chatData.content = `<div>${this.name} suffered a Stun level.</div`
@ -811,7 +811,7 @@ export class PegasusActor extends Actor {
/* -------------------------------------------- */
modifyMomentum(incDec) {
if ( this.system.combat.stunlevel > 0 ) {
if (this.system.combat.stunlevel > 0) {
ui.notifications.warn("Unable to gain/use Momentum while stunned")
return
}
@ -1467,7 +1467,7 @@ export class PegasusActor extends Actor {
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;
if (mrLevel != this.system.mr.value) {
updates['system.mr.value'] = mrLevel
@ -1502,7 +1502,7 @@ export class PegasusActor extends Actor {
}
if (this.isOwner || game.user.isGM) {
// Update current hindrance level
let hindrance = this.system.combat.hindrancedice
let hindrance = 0; //this.system.combat.hindrancedice
if (!this.checkIgnoreHealth()) {
if (this.system.secondary.health.status == "wounded") {
hindrance += 1
@ -1578,8 +1578,8 @@ export class PegasusActor extends Actor {
for (let e of effects) {
meleeBonus += Number(e.system.effectlevel)
}
this.baseMDL = this.system.biodata.sizenum + this.system.biodata.sizebonus + this.system.statistics.str.value +
this.system.statistics.str.mod + this.system.statistics.str.bonuseffect + meleeBonus
this.baseMDL = this.system.biodata.sizenum + this.system.biodata.sizebonus + this.system.statistics.str.value +
this.system.statistics.str.mod + this.system.statistics.str.bonuseffect + meleeBonus
let weaponsMelee = this.items.filter(it => it.type == "weapon" && it.system.damagestatistic.toLowerCase() == "str")
for (let w of weaponsMelee) {
let damage = this.baseMDL + Number(w.system.damage)
@ -1614,11 +1614,11 @@ export class PegasusActor extends Actor {
if (role?.name?.toLowerCase() == "defender") { // Add defender bonus to ADRL
roleBonus = this.getRoleLevel()
}
this.baseADRL = roleBonus + armorBonus + this.system.statistics.phy.value + this.system.statistics.phy.mod +
this.system.statistics.phy.bonuseffect + this.system.biodata.sizenum + this.system.biodata.sizebonus
this.baseADRL = roleBonus + armorBonus + this.system.statistics.phy.value + this.system.statistics.phy.mod +
this.system.statistics.phy.bonuseffect + this.system.biodata.sizenum + this.system.biodata.sizebonus
let armors = this.items.filter(it => it.type == "armor")
for (let a of armors) {
let adrl = this.baseADRL + a.system.resistance
let adrl = this.baseADRL + a.system.resistance
if (adrl != a.system.adrl) {
updates.push({ _id: a.id, "system.adrl": adrl })
}
@ -1924,6 +1924,18 @@ export class PegasusActor extends Actor {
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) {
@ -1935,15 +1947,9 @@ export class PegasusActor extends Actor {
if (overCapacity > 0) {
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) {
if (effect.system.hindrance) {
hindrancesDices += effect.system.effectlevel
if ( effect.system.oneuse) {
effect.system.isUSed = true // Ensure deletion
this.deleteEmbeddedDocuments('Item', [effect.id])
}
}
hindrancesDices += effect.system.effectlevel
}
if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
hindrancesDices += 1
@ -2248,6 +2254,7 @@ export class PegasusActor extends Actor {
}
rollData.hindranceDices = this.computeCurrentHindrances(statKey)
rollData.minHindranceDices = rollData.hindranceDices
this.processSizeBonus(rollData)
this.addEffects(rollData, isInit, isPower, subKey == "power-dmg")
@ -2298,7 +2305,7 @@ export class PegasusActor extends Actor {
}
/* -------------------------------------------- */
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
for (let e of effects) {
nbTics += Number(e.system.extratics)
@ -2427,8 +2434,8 @@ export class PegasusActor extends Actor {
rollData.title = "MR / Initiative"
rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect()
rollData.TICs = []
for(let i=0; i<rollData.nbTIC; i++) {
rollData.TICs.push( {text:"NONE", revealed: false, displayed: false})
for (let i = 0; i < rollData.nbTIC; i++) {
rollData.TICs.push({ text: "NONE", revealed: false, displayed: false })
}
}
this.startRoll(rollData);

View File

@ -296,6 +296,13 @@ export class PegasusRollDialog extends Dialog {
PegasusUtility.removeFromDicePool(this.rollData, idx)
this.refreshDialog()
})
html.find('.pool-remove-hindrance-dice').click(async (event) => {
if (this.rollData.hindranceDices > this.rollData.minHindranceDices) {
this.rollData.hindranceDices--;
}
this.refreshDialog()
})
}

View File

@ -165,7 +165,8 @@ export class PegasusUtility {
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" },
{ 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,11 +284,15 @@ export class PegasusUtility {
/* -------------------------------------------- */
static addDicePool(rollData, diceKey, level) {
let newDice = {
name: "dice-click", key: diceKey, level: level,
img: `systems/fvtt-pegasus-rpg/images/dice/${diceKey}.webp`
if (diceKey == "hindrance") {
rollData.hindranceDices +=1
} else {
let newDice = {
name: "dice-click", key: diceKey, level: level,
img: `systems/fvtt-pegasus-rpg/images/dice/${diceKey}.webp`
}
rollData.dicePool.push(newDice)
}
rollData.dicePool.push(newDice)
}
/*-------------------------------------------- */
@ -801,11 +806,11 @@ export class PegasusUtility {
}
}
}
let actor = game.actors.get(rollData.actorId)
if (toRem.length > 0) {
//console.log("Going to remove one use effects", toRem)
let actor = game.actors.get(rollData.actorId)
actor.deleteEmbeddedDocuments('Item', toRem)
}
actor.checkEFfectsHindranceDeletion(rollData.statKey)
}
/* -------------------------------------------- */

View File

@ -1536,4 +1536,13 @@ Focus FOC: #ff0084
max-width: 48px;
max-height: 48px;
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;
}

View File

@ -252,7 +252,7 @@
],
"title": "Pegasus RPG",
"url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
"version": "11.0.19",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.19.zip",
"version": "11.0.23",
"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"
}

View File

@ -26,7 +26,7 @@
{{#if statVehicle}}
<div class="flexrow">
<span class="roll-dialog-label">{{upper statVehicle.label}} :</span>
<span class="roll-dialog-label">{{upper statVehicle.label}} :</span>
<select class="roll-dialog-label" id="statVehicleLevel" type="text" name="statVehicleLevel"
value="{{statVehicle.currentlevel}}" data-dtype="Number" {{#if statKey}}disabled{{/if}}>
{{#select statVehicle.currentlevel}}
@ -37,73 +37,72 @@
</div>
{{/if}}
{{#if specList}}
<div class="flexrow">
<span class="roll-dialog-label">Spec : </span>
<select class="roll-dialog-label" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}"
data-dtype="String">
{{#select selectedSpec}}
<option value="0">None</option>
{{#each specList as |spec idx|}}
<option value="{{spec._id}}">{{spec.name}}</option>
{{/each}}
{{/select}}
</select>
<span class="small-label">&nbsp;</span>
</div>
<div class="flexrow">
<span class="roll-dialog-label">Spec Dice : </span>
<select class="roll-dialog-label" id="specDicesLevel" type="text" name="specDicesLevel"
value="{{specDicesLevel}}" data-dtype="Number" {{#if specList}}disabled{{/if}}>
{{#select specDicesLevel}}
{{{optionsDiceList}}}
{{/select}}
</select>
<span class="small-label">&nbsp;</span>
</div>
{{/if}}
{{#if specList}}
<div class="flexrow">
<span class="roll-dialog-label">Spec : </span>
<select class="roll-dialog-label" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}"
data-dtype="String">
{{#select selectedSpec}}
<option value="0">None</option>
{{#each specList as |spec idx|}}
<option value="{{spec._id}}">{{spec.name}}</option>
{{/each}}
{{/select}}
</select>
<span class="small-label">&nbsp;</span>
</div>
<div class="flexrow">
<span class="roll-dialog-label">Spec Dice : </span>
<select class="roll-dialog-label" id="specDicesLevel" type="text" name="specDicesLevel"
value="{{specDicesLevel}}" data-dtype="Number" {{#if specList}}disabled{{/if}}>
{{#select specDicesLevel}}
{{{optionsDiceList}}}
{{/select}}
</select>
<span class="small-label">&nbsp;</span>
</div>
{{/if}}
{{/if}}
<div class="dice-pool-div">
<span>
<h3 class="dice-pool-label">Current pool</h3>
</span>
<div class="flexrow dice-pool-stack">
{{#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"
src="{{dice.img}}" alt="dices"></a></span>
<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" src="{{dice.img}}" alt="dices"></a></span>
{{/each}}
</div>
</div>
{{#if noBonusDice}}
<div class="flexrow">
No bonus dice due to effect !
</div>
{{else}}
<div class="flexrow">
{{#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"
src="{{dice.img}}" alt="dices"></a></span>
{{/each}}
</div>
{{/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"
<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}}
<div class="flexrow">
No bonus dice due to effect !
</div>
{{else}}
<div class="flexrow">
{{#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-add" src="{{dice.img}}" alt="dices"></a></span>
{{/each}}
</div>
{{/if}}
<div class="flexrow">
<span class="roll-dialog-label">Modifiers : </span>
@ -129,21 +128,30 @@
<option value="d6">Outnumbered 2 Extra Allies d6</option>
<option value="d8">Outnumbered 3 Extra Allies d8</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="d12">Eyes/head d12<option>
<option value="d12">Eyes/head d12
<option>
<option value="none4">===== Impact DMG Bonus</option>
<option value="d4">Soft d4<option>
<option value="d6">Thin/Flimsy d6<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="d4">Soft d4
<option>
<option value="d6">Thin/Flimsy d6
<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="d4">Concentrated<option>
<option value="d4">Off Hand d4<option>
<option value="d4">Concentrated
<option>
<option value="d4">Off Hand d4
<option>
<option value="d6">Higher Ground d6</option>
{{/select}}
</select>
</select>
</div>
</div>
@ -154,14 +162,14 @@
{{else}}
{{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
{{/if}}
{{#if isInit}}
{{#each TICs as |tic index|}}
<div class="flexrow">
<span class="roll-dialog-label">TIC {{add index 1}}:</span>
<input class="roll-input-tic" id="roll-input-tic{{index}}" type="text" value="{{tic.text}}" data-dtype="String">
</div>
{{/each}}
{{#each TICs as |tic index|}}
<div class="flexrow">
<span class="roll-dialog-label">TIC {{add index 1}}:</span>
<input class="roll-input-tic" id="roll-input-tic{{index}}" type="text" value="{{tic.text}}" data-dtype="String">
</div>
{{/each}}
{{/if}}
</div>