public
/
fvtt-crucible-rpg
0
0
Fork 0
Code Issues Pull Requests Projects Releases 28 Wiki Activity

Minor fixes

This commit is contained in:
sladecraven 2022-09-12 23:06:13 +02:00
parent cdf2248afa
commit f57b57e57f
6 changed files with 83 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/.directory Normal file
View File

@ -0,0 +1,4 @@
[Dolphin]
Timestamp=2022,9,12,23,3,3.4699999999999998
Version=4
VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

3
images/icons/feats/.directory
View File

@ -1,6 +1,5 @@
[Dolphin] [Dolphin]
SortOrder=1 SortOrder=1
Timestamp=2022,7,27,18,56,49.607 Timestamp=2022,9,12,23,4,32.409
Version=4 Version=4
ViewMode=1
VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

3
modules/crucible-actor-sheet.js
View File

@ -158,6 +158,9 @@ export class CrucibleActorSheet extends ActorSheet {
html.find('.roll-shield-die').click((event) => { html.find('.roll-shield-die').click((event) => {
this.actor.rollShieldDie() this.actor.rollShieldDie()
}); });
html.find('.roll-target-die').click((event) => {
this.actor.rollDefenseRanged()
});
html.find('.roll-save').click((event) => { html.find('.roll-save').click((event) => {
const saveKey = $(event.currentTarget).data("save-key") const saveKey = $(event.currentTarget).data("save-key")

126
modules/crucible-actor.js
View File

@ -63,22 +63,26 @@ export class CrucibleActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
computeHitPoints() { computeHitPoints() {
let hp = duplicate(this.system.secondary.hp) if (this.type == "character") {
let max = (this.system.abilities.str.value + this.system.abilities.con.value) * 6 let hp = duplicate(this.system.secondary.hp)
if (max != hp.max || hp.value > max) { let max = (this.system.abilities.str.value + this.system.abilities.con.value) * 6
hp.max = max if (max != hp.max || hp.value > max) {
hp.value = max // Init case hp.max = max
this.update({ 'system.secondary.hp': hp }) hp.value = max // Init case
this.update({ 'system.secondary.hp': hp })
}
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
computeEffortPoints() { computeEffortPoints() {
let effort = duplicate(this.system.secondary.effort) if (this.type == "character") {
let max = (this.system.abilities.con.value + this.system.abilities.int.value) * 6 let effort = duplicate(this.system.secondary.effort)
if (max != effort.max || effort.value > max) { let max = (this.system.abilities.con.value + this.system.abilities.int.value) * 6
effort.max = max if (max != effort.max || effort.value > max) {
effort.value = max // Init case effort.max = max
this.update({ 'system.secondary.effort': effort }) effort.value = max // Init case
this.update({ 'system.secondary.effort': effort })
}
} }
} }
@ -329,21 +333,21 @@ export class CrucibleActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async rollArmor( rollData) { async rollArmor(rollData) {
let armor = this.getEquippedArmor() let armor = this.getEquippedArmor()
if (armor) { if (armor) {
} }
return { armor: "none"} return { armor: "none" }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async incDecHP( formula ) { async incDecHP(formula) {
let dmgRoll = new Roll(formula).roll( {async: false}) let dmgRoll = new Roll(formula).roll({ async: false })
await CrucibleUtility.showDiceSoNice(dmgRoll, game.settings.get("core", "rollMode")) await CrucibleUtility.showDiceSoNice(dmgRoll, game.settings.get("core", "rollMode"))
let hp = duplicate(this.system.secondary.hp) let hp = duplicate(this.system.secondary.hp)
hp.value = Number(hp.value) + Number(dmgRoll.total) hp.value = Number(hp.value) + Number(dmgRoll.total)
this.update( {'system.secondary.hp': hp }) this.update({ 'system.secondary.hp': hp })
return Number(dmgRoll.total) return Number(dmgRoll.total)
} }
@ -501,38 +505,38 @@ export class CrucibleActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
isForcedAdvantage() { isForcedAdvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.advantage) return this.items.find(cond => cond.type == "condition" && cond.system.advantage)
} }
isForcedDisadvantage() { isForcedDisadvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.disadvantage) return this.items.find(cond => cond.type == "condition" && cond.system.disadvantage)
} }
isForcedRollAdvantage() { isForcedRollAdvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.rolladvantage) return this.items.find(cond => cond.type == "condition" && cond.system.rolladvantage)
} }
isForcedRollDisadvantage() { isForcedRollDisadvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.rolldisadvantage) return this.items.find(cond => cond.type == "condition" && cond.system.rolldisadvantage)
} }
isNoAdvantage() { isNoAdvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.noadvantage) return this.items.find(cond => cond.type == "condition" && cond.system.noadvantage)
} }
isNoAction() { isNoAction() {
return this.items.find(cond => cond.type =="condition" && cond.system.noaction) return this.items.find(cond => cond.type == "condition" && cond.system.noaction)
} }
isAttackDisadvantage() { isAttackDisadvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.attackdisadvantage) return this.items.find(cond => cond.type == "condition" && cond.system.attackdisadvantage)
} }
isDefenseDisadvantage() { isDefenseDisadvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.defensedisadvantage) return this.items.find(cond => cond.type == "condition" && cond.system.defensedisadvantage)
} }
isAttackerAdvantage() { isAttackerAdvantage() {
return this.items.find(cond => cond.type =="condition" && cond.system.targetadvantage) return this.items.find(cond => cond.type == "condition" && cond.system.targetadvantage)
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getCommonRollData(abilityKey = undefined) { getCommonRollData(abilityKey = undefined) {
let noAction = this.isNoAction() let noAction = this.isNoAction()
if ( noAction) { if (noAction) {
ui.notifications.warn("You can't do any actions du to the condition : " + noAction.name ) ui.notifications.warn("You can't do any actions du to the condition : " + noAction.name)
return return
} }
@ -555,24 +559,24 @@ export class CrucibleActor extends Actor {
rollData.forceRollAdvantage = this.isForcedRollAdvantage() rollData.forceRollAdvantage = this.isForcedRollAdvantage()
rollData.forceRollDisadvantage = this.isForcedRollDisadvantage() rollData.forceRollDisadvantage = this.isForcedRollDisadvantage()
rollData.noAdvantage = this.isNoAdvantage() rollData.noAdvantage = this.isNoAdvantage()
if ( rollData.defenderTokenId) { if (rollData.defenderTokenId) {
let defenderToken = game.canvas.tokens.get(rollData.defenderTokenId) let defenderToken = game.canvas.tokens.get(rollData.defenderTokenId)
let defender = defenderToken.actor let defender = defenderToken.actor
// Distance management // Distance management
let token = this.token let token = this.token
if ( !token) { if (!token) {
let tokens =this.getActiveTokens() let tokens = this.getActiveTokens()
token = tokens[0] token = tokens[0]
} }
if ( token ) { if (token) {
const ray = new Ray(token.object?.center || token.center, defenderToken.center) const ray = new Ray(token.object?.center || token.center, defenderToken.center)
rollData.tokensDistance = canvas.grid.measureDistances([{ray}], {gridSpaces:false})[0] / canvas.grid.grid.options.dimensions.distance rollData.tokensDistance = canvas.grid.measureDistances([{ ray }], { gridSpaces: false })[0] / canvas.grid.grid.options.dimensions.distance
} else { } else {
ui.notifications.info("No token connected to this actor, unable to compute distance.") ui.notifications.info("No token connected to this actor, unable to compute distance.")
return return
} }
if (defender ) { if (defender) {
rollData.forceAdvantage = defender.isAttackerAdvantage() rollData.forceAdvantage = defender.isAttackerAdvantage()
rollData.advantageFromTarget = true rollData.advantageFromTarget = true
} }
@ -637,7 +641,7 @@ export class CrucibleActor extends Actor {
rollData.skill = skill rollData.skill = skill
rollData.weapon = weapon rollData.weapon = weapon
rollData.img = weapon.img rollData.img = weapon.img
if ( !rollData.forceDisadvantage) { // This is an attack, check if disadvantaged if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged
rollData.forceDisadvantage = this.isAttackDisadvantage() rollData.forceDisadvantage = this.isAttackDisadvantage()
} }
/*if (rollData.weapon.system.isranged && rollData.tokensDistance > CrucibleUtility.getWeaponMaxRange(rollData.weapon) ) { /*if (rollData.weapon.system.isranged && rollData.tokensDistance > CrucibleUtility.getWeaponMaxRange(rollData.weapon) ) {
@ -669,7 +673,7 @@ export class CrucibleActor extends Actor {
rollData.skill = skill rollData.skill = skill
rollData.weapon = weapon rollData.weapon = weapon
rollData.img = weapon.img rollData.img = weapon.img
if ( !rollData.forceDisadvantage) { // This is an attack, check if disadvantaged if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged
rollData.forceDisadvantage = this.isDefenseDisadvantage() rollData.forceDisadvantage = this.isDefenseDisadvantage()
} }
@ -687,14 +691,16 @@ export class CrucibleActor extends Actor {
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
rollData.defenderTokenId = undefined // Cleanup rollData.defenderTokenId = undefined // Cleanup
rollData.mode = "rangeddefense" rollData.mode = "rangeddefense"
rollData.attackRollData = duplicate(attackRollData) if ( attackRollData) {
rollData.sizeDice = CrucibleUtility.getSizeDice( this.system.biodata.size ) rollData.attackRollData = duplicate(attackRollData)
rollData.effectiveRange = CrucibleUtility.getWeaponRange(attackRollData.weapon) rollData.effectiveRange = CrucibleUtility.getWeaponRange(attackRollData.weapon)
rollData.tokensDistance = attackRollData.tokensDistance // QoL copy rollData.tokensDistance = attackRollData.tokensDistance // QoL copy
}
rollData.sizeDice = CrucibleUtility.getSizeDice(this.system.biodata.size)
rollData.distanceBonusDice = 0 //Math.max(0, Math.floor((rollData.tokensDistance - rollData.effectiveRange) + 0.5)) rollData.distanceBonusDice = 0 //Math.max(0, Math.floor((rollData.tokensDistance - rollData.effectiveRange) + 0.5))
rollData.hasCover = "none" rollData.hasCover = "none"
rollData.situational = "none" rollData.situational = "none"
rollData.useshield = false rollData.useshield = false
rollData.shield = this.getEquippedShield() rollData.shield = this.getEquippedShield()
this.startRoll(rollData) this.startRoll(rollData)
} }
@ -722,54 +728,54 @@ export class CrucibleActor extends Actor {
let multiply = 1 let multiply = 1
let disadvantage = false let disadvantage = false
let advantage = false let advantage = false
let messages = ["Armor applied"] let messages = ["Armor applied"]
if (rollData) { if (rollData) {
if (CrucibleUtility.isArmorLight(armor) && CrucibleUtility.isWeaponPenetrating(rollData.attackRollData.weapon) ) { if (CrucibleUtility.isArmorLight(armor) && CrucibleUtility.isWeaponPenetrating(rollData.attackRollData.weapon)) {
return { armorIgnored: true, nbSuccess: 0, messages: ["Armor ignored : Penetrating weapons ignore Light Armors."] } return { armorIgnored: true, nbSuccess: 0, messages: ["Armor ignored : Penetrating weapons ignore Light Armors."] }
} }
if (CrucibleUtility.isWeaponPenetrating(rollData.attackRollData.weapon) ) { if (CrucibleUtility.isWeaponPenetrating(rollData.attackRollData.weapon)) {
messages.push("Armor reduced by 1 (Penetrating weapon)") messages.push("Armor reduced by 1 (Penetrating weapon)")
reduce = 1 reduce = 1
} }
if (CrucibleUtility.isWeaponLight(rollData.attackRollData.weapon) ) { if (CrucibleUtility.isWeaponLight(rollData.attackRollData.weapon)) {
messages.push("Armor with advantage (Light weapon)") messages.push("Armor with advantage (Light weapon)")
advantage = true advantage = true
} }
if (CrucibleUtility.isWeaponHeavy(rollData.attackRollData.weapon) ) { if (CrucibleUtility.isWeaponHeavy(rollData.attackRollData.weapon)) {
messages.push("Armor with disadvantage (Heavy weapon)") messages.push("Armor with disadvantage (Heavy weapon)")
disadvantage = true disadvantage = true
} }
if (CrucibleUtility.isWeaponHack(rollData.attackRollData.weapon) ) { if (CrucibleUtility.isWeaponHack(rollData.attackRollData.weapon)) {
messages.push("Armor reduced by 1 (Hack weapon)") messages.push("Armor reduced by 1 (Hack weapon)")
reduce = 1 reduce = 1
} }
if (CrucibleUtility.isWeaponUndamaging(rollData.attackRollData.weapon) ) { if (CrucibleUtility.isWeaponUndamaging(rollData.attackRollData.weapon)) {
messages.push("Armor multiplied by 2 (Undamaging weapon)") messages.push("Armor multiplied by 2 (Undamaging weapon)")
multiply = 2 multiply = 2
} }
} }
let diceColor = armor.system.absorprionroll let diceColor = armor.system.absorprionroll
let armorResult = await CrucibleUtility.getRollTableFromDiceColor( diceColor, false ) let armorResult = await CrucibleUtility.getRollTableFromDiceColor(diceColor, false)
console.log("Armor log", armorResult) console.log("Armor log", armorResult)
let armorValue = (Number(armorResult.text) + reduce) * multiply let armorValue = Math.max(0, (Number(armorResult.text) + reduce) * multiply)
if ( advantage || disadvantage) { if (advantage || disadvantage) {
let armorResult2 = await CrucibleUtility.getRollTableFromDiceColor( diceColor, false ) let armorResult2 = await CrucibleUtility.getRollTableFromDiceColor(diceColor, false)
let armorValue2 = (Number(armorResult2.text) + reduce) * multiply let armorValue2 = Math.max(0, (Number(armorResult2.text) + reduce) * multiply)
if ( advantage) { if (advantage) {
armorValue = (armorValue2 > armorValue) ? armorValue2 : armorValue armorValue = (armorValue2 > armorValue) ? armorValue2 : armorValue
messages.push(`Armor advantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`) messages.push(`Armor advantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)
} }
if ( disadvantage) { if (disadvantage) {
armorValue = (armorValue2 < armorValue) ? armorValue2 : armorValue armorValue = (armorValue2 < armorValue) ? armorValue2 : armorValue
messages.push(`Armor disadvantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`) messages.push(`Armor disadvantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)
} }
} }
armorResult.armorValue = armorValue armorResult.armorValue = armorValue
if ( !rollData) { if (!rollData) {
ChatMessage.create( { content: "Armor result : " + armorValue } ) ChatMessage.create({ content: "Armor result : " + armorValue })
} }
messages.push( "Armor result : " + armorValue) messages.push("Armor result : " + armorValue)
return { armorIgnored: false, nbSuccess: armorValue, rawArmor: armorResult.text, messages: messages } return { armorIgnored: false, nbSuccess: armorValue, rawArmor: armorResult.text, messages: messages }
} }
return { armorIgnored: true, nbSuccess: 0, messages: ["No armor equipped."] } return { armorIgnored: true, nbSuccess: 0, messages: ["No armor equipped."] }

6
system.json
View File

@ -199,15 +199,15 @@
"styles": [ "styles": [
"styles/simple.css" "styles/simple.css"
], ],
"version": "10.0.10", "version": "10.0.11",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "10",
"verified": "10.279", "verified": "10.285",
"maximum": "10" "maximum": "10"
}, },
"title": "Crucible RPG", "title": "Crucible RPG",
"manifest": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/raw/master/system.json", "manifest": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/raw/master/system.json",
"download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v10.0.10.zip", "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v10.0.11.zip",
"url": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg", "url": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg",
"background": "images/ui/crucible_welcome_page.webp", "background": "images/ui/crucible_welcome_page.webp",
"id": "fvtt-crucible-rpg" "id": "fvtt-crucible-rpg"

6
templates/actor-sheet.html
View File

@ -59,6 +59,12 @@
</span> </span>
</li> </li>
{{/if}} {{/if}}
<li class="item flexrow list-item" data-attr-key="class">
<img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
<span class="ability-label " name="rollTarget">
<h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
</span>
</li>
</ul> </ul>
</div> </div>