public/fvtt-avd12
Archived
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

Various spell stuff enhancements

Browse Source
This commit is contained in:
LeRatierBretonnien 2022-12-20 17:47:46 +01:00
parent 28e8edc867
commit e0026adfcd
8 changed files with 103 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/avd12-actor.js
View File

@ -373,14 +373,24 @@ export class Avd12Actor extends Actor {
let focusBonus = this.items.filter( it => it.system.focuspointsbonus > 0).reduce((sum, item2) => sum = item2.system.focuspointsbonus, 0)
let focusregenbonus = this.items.filter( it => it.system.focusregenbonus > 0).reduce((sum, item2) => sum = item2.system.focusregenbonus, 0)
let burnchancebonus = this.items.filter( it => it.system.burnchancebonus > 0).reduce((sum, item2) => sum = item2.system.burnchancebonus, 0)
console.log("FINAL BONUS", focusBonus, focusregenbonus, burnchancebonus)
let focusPoints = focusData.focusPoints + focusBonus
let focusRegen = focusData.focusRegen + focusregenbonus
//console.log("Update focus", focusPoints, focusRegen)
if ( focusPoints != this.system.focus.focuspoints || focusRegen != this.system.focus.focusregen) {
let focusData = duplicate(this.system.focus)
focusData.focuspoints = focusPoints
focusData.focusregen = focusRegen
this.update( {'system.focus': focusData})
}
//console.log("FINAL BONUS", focusBonus, focusregenbonus, burnchancebonus)
return {
focusPoints : focusData.focusPoints + focusBonus,
focusPoints : focusPoints,
burnChance: focusData.burnChance + burnchancebonus,
focusRegen: focusData.focusRegen + focusregenbonus,
focusRegen: focusRegen,
spellAttackBonus: focusData.spellAttackBonus,
spellDamageBonus: focusData.spellDamageBonus,
currentFocusPoints: this.system.focus.currentFocusPoints
currentFocusPoints: this.system.focus.currentfocuspoints
}
}
return {
@ -581,26 +591,42 @@ export class Avd12Actor extends Actor {
}
/* -------------------------------------------- */
rollSpell(spellId) {
async rollSpell(spellId) {
let spell = this.items.get(spellId)
if (spell) {
spell = duplicate(spell)
let rollData = this.getCommonRollData()
rollData.mode = "spell"
rollData.spell = spell
rollData.spellAttack = this.system.bonus.spell.attack
rollData.spellDamage = this.system.bonus.spell.damage
rollData.spellCost = Avd12Utility.getSpellCost(spell)
rollData.title = "Roll Spell " + spell.name
rollData.img = spell.img
if (spell.system.spelltype != "utility") {
let rollData = this.getCommonRollData()
rollData.mode = "spell"
rollData.spell = spell
rollData.spellAttack = this.system.bonus.spell.attack
rollData.spellDamage = this.system.bonus.spell.damage
rollData.spellCost = Avd12Utility.getSpellCost(spell)
rollData.title = "Roll Spell " + spell.name
rollData.img = spell.img
this.startRoll(rollData)
} else {
this.spentFocusPoints( spell )
let msg = await Avd12Utility.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-avd12/templates/chat/chat-utility-spell.hbs`, rollData)
})
msg.setFlag("world", "rolldata", rollData)
}
} else {
ui.notifications.warn("Unable to find the relevant spell.")
}
}
/* -------------------------------------------- */
spentFocusPoints( spell) {
let spellCost = Avd12Utility.getSpellCost(spell)
let focusData = duplicate(this.system.focus)
focusData.currentfocuspoints -= spellCost
focusData.currentfocuspoints = Math.max(focusData.currentfocuspoints, 0)
console.log("New fovcus", this.system, focusData)
this.update({'system.focus': focusData})
}
/* -------------------------------------------- */
rollWeapon(weaponId) {
let weapon = this.items.get(weaponId)

4
modules/avd12-utility.js
View File

@ -541,6 +541,10 @@ export class Avd12Utility {
}
}
if (rollData.spell) {
actor.spentFocusPoints(rollData.spell)
}
let msg = await this.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-avd12/templates/chat/chat-generic-result.hbs`, rollData)
})

4
template.json
View File

@ -191,7 +191,7 @@
"focus": {
"focuspoints": 0,
"focusregen": 0,
"currentFocusPoints": 0
"currentfocuspoints": 0
},
"lifeline": {
"value": 0,
@ -438,6 +438,8 @@
"school": "",
"damage": "",
"damagetype": "",
"damagesecondary": "",
"damagesecondarytype": "",
"range": 0,
"components": "",
"reaction": false,

8
templates/actors/actor-sheet.hbs
View File

@ -64,7 +64,7 @@
<span class="item-name-label-header-short">Health</span>
<input type="text" class="item-field-label-short" name="system.health.value" value="{{system.health.value}}" data-dtype="Number"/> /
<input type="text" class="item-field-label-short" name="system.health.max" value="{{system.health.max}}" data-dtype="Number"/>
<input type="text" class="item-field-label-short" name="system.health.max" value="{{system.health.max}}" data-dtype="Number" disabled/>
<span class="item-name-label-header-medium">&nbsp;</span>
@ -72,14 +72,14 @@
<li class="item flexrow list-item">
<span class="item-name-label-header-short">Focus Regen</span>
<input type="text" class="item-field-label-short" value="{{focusData.focusRegen}}" data-dtype="Number" disabled/>
<input type="text" class="item-field-label-short" value="{{system.focus.focusregen}}" data-dtype="Number" disabled/>
<span class="item-name-label-header-short">&nbsp;</span>
<span class="item-name-label-header-short">Focus Points</span>
<input type="text" class="item-field-label-short" value="{{focusData.currentFocusPoints}}" data-dtype="Number" disabled/> /
<input type="text" class="item-field-label-short" value="{{focusData.focusPoints}}" data-dtype="Number" disabled/>
<input type="text" class="item-field-label-short" name="system.focus.currentfocuspoints" value="{{system.focus.currentfocuspoints}}" data-dtype="Number"/> /
<input type="text" class="item-field-label-short" value="{{system.focus.focuspoints}}" data-dtype="Number" disabled/>
<span class="item-name-label-header-medium">&nbsp;</span>
</li>

7
templates/chat/chat-generic-result.hbs
View File

@ -23,6 +23,13 @@
</li>
{{/if}}
{{#if spell}}
<li>Spell : {{spell.name}} ({{spell.system.level}})
</li>
<li>Focus Points Spent : {{spellCost}}
</li>
{{/if}}
<li>Dice Formula {{diceFormula}} </li>
<li>Result {{roll.total}} </li>

28
templates/chat/chat-utility-spell.hbs Normal file
View File

@ -0,0 +1,28 @@
<div class="chat-message-header">
{{#if actorImg}}
<img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
{{/if}}
<h4 class=chat-actor-name>{{alias}}</h4>
</div>
<hr>
{{#if img}}
<div >
<img class="chat-icon" src="{{img}}" alt="{{name}}" />
</div>
{{/if}}
<div class="flexcol">
</div>
<div>
<ul>
<li>Utility Spell {{spell.name}} has been casted !
</li>
<li>Focus Points Spent : {{spellCost}}
</li>
</ul>
</div>
</div>

4
templates/dialogs/roll-dialog-generic.hbs
View File

@ -47,6 +47,9 @@
</select>
</div>
{{#if spell}}
{{else}}
<div class="flexrow">
<span class="roll-dialog-label">Target check : </span>
<select id="targetCheck" name="targetCheck">
@ -60,6 +63,7 @@
{{/select}}
</select>
</div>
{{/if}}
</div>

14
templates/items/item-spell-sheet.hbs
View File

@ -69,6 +69,20 @@
</select>
</li>
<li class="flexrow">
<label class="item-field-label-long">Secondary Damage</label>
<input type="text" class="item-field-label-short" name="system.damagesecondary" value="{{system.damagesecondary}}" data-dtype="String"/>
</li>
<li class="flexrow">
<label class="item-field-label-long">Secondary Damage Type</label>
<select class="item-field-label-long" type="text" name="system.damagesecondarytype" value="{{system.damagesecondarytype}}" data-dtype="String">
{{#select system.damagetype}}
{{> systems/fvtt-avd12/templates/items/partial-options-damage-types.hbs}}
{{/select}}
</select>
</li>
<li class="flexrow">
<label class="item-field-label-long">Range</label>
<input type="text" class="item-field-label-short" name="system.range" value="{{system.range}}" data-dtype="Number"/>