Update combat tab

This commit is contained in:
LeRatierBretonnien 2023-03-24 10:17:20 +01:00
parent 4ca23257cb
commit 0368be050b
11 changed files with 163 additions and 97 deletions

View File

@ -44,8 +44,8 @@ export class Hero6ActorSheet extends ActorSheet {
powers: await this.actor.getPowers( ),
talents: this.actor.getTalents( ),
complications: this.actor.getComplications( ),
martialarts: this.actor.getMartialArts( ),
maneuvers: this.actor.getManeuvers( ),
nonstockmaneuvers: this.actor.getNonStockManeuvers(),
weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
@ -153,9 +153,9 @@ export class Hero6ActorSheet extends ActorSheet {
this.actor.rollCharac(characKey);
});
html.find('.roll-direct').click((event) => {
const rollFormula = $(event.currentTarget).data("roll-formula");
let roll = new Roll(rollFormula).roll({async: false})
roll.toMessage()
const rollFormula = $(event.currentTarget).data("roll-formula")
const rollSource = $(event.currentTarget).data("roll-source")
Hero6Utility.processDirectRoll( { actorId: this.actor.id, rollFormula: rollFormula, rollSource: rollSource, mode:"directroll"} )
});
html.find('.roll-item').click((event) => {

View File

@ -67,8 +67,8 @@ export class Hero6Actor extends Actor {
}
}
computeDicesValue() {
this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceValue(this.system.characteristics.pre.value )
this.system.characteristics.str.strdice = Hero6Utility.getDerivatedDiceValue(this.system.characteristics.str.value )
this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.pre.value )
this.system.characteristics.str.strdice = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.str.value )
}
/* -------------------------------------------- */
prepareDerivedData() {
@ -235,11 +235,6 @@ export class Hero6Actor extends Actor {
Hero6Utility.sortArrayObjectsByName(comp)
return comp
}
getMartialArts() {
let comp = duplicate(this.items.filter(item => item.type == 'martialart') || [])
Hero6Utility.sortArrayObjectsByName(comp)
return comp
}
getComplications() {
let comp = duplicate(this.items.filter(item => item.type == 'complication') || [])
Hero6Utility.sortArrayObjectsByName(comp)
@ -285,25 +280,45 @@ export class Hero6Actor extends Actor {
offensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "offensive"),
defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive")
}
Hero6Utility.sortArrayObjectsByName(maneuvers.general)
Hero6Utility.sortArrayObjectsByName(maneuvers.offensive)
Hero6Utility.sortArrayObjectsByName(maneuvers.defensive)
return maneuvers
}
getNonStockManeuvers() {
let maneuvers = this.items.filter(item => item.type == "maneuver" && !item.system.isstock)
Hero6Utility.sortArrayObjectsByName(maneuvers)
return maneuvers
}
getEquipments() {
return this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
Hero6Utility.sortArrayObjectsByName(list)
return list
}
getWeapons() {
return this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
Hero6Utility.sortArrayObjectsByName(list)
return list
}
getArmors() {
return this.items.filter(item => item.type == "equipment" && item.system.subtype == "armor");
let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "armor");
Hero6Utility.sortArrayObjectsByName(list)
return list
}
getShields() {
return this.items.filter(item => item.type == "equipment" && item.system.subtype == "shield");
let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "shield");
Hero6Utility.sortArrayObjectsByName(list)
return list
}
getEquipmentsMoneys() {
return duplicate(this.items.filter(item => item.type == "equipment" && (item.system.subtype == "equipment" || item.system.subtype == "money")) || [])
let list = duplicate(this.items.filter(item => item.type == "equipment" && (item.system.subtype == "equipment" || item.system.subtype == "money")) || [])
Hero6Utility.sortArrayObjectsByName(list)
return list
}
getEquipmentsOnly() {
return duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
let list = duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
Hero6Utility.sortArrayObjectsByName(list)
return list
}
/* ------------------------------------------- */

View File

@ -20,6 +20,9 @@ export class Hero6Utility {
Handlebars.registerHelper('count', function (list) {
return list.length;
})
Handlebars.registerHelper('exists', function (val) {
return val != null && val != undefined;
});
Handlebars.registerHelper('includes', function (array, val) {
return array.includes(val);
})
@ -78,12 +81,16 @@ export class Hero6Utility {
/*-------------------------------------------- */
static getDerivatedDiceValue(value) {
let dices = Math.floor(value/5) +"d6"
static getDerivatedDiceFormulas(value) {
let rollFormula = Math.floor(value/5) +"d6"
let displayFormula = Math.floor(value/5)
if ( value % 5 > 2) {
dices += "+1d3"
rollFormula += "+round(1d6/2)"
displayFormula += " 1/2d6"
} else {
displayFormula += "d6"
}
return dices
return {rollFormula:rollFormula, displayFormula: displayFormula}
}
/*-------------------------------------------- */
static upperFirst(text) {
@ -340,15 +347,53 @@ export class Hero6Utility {
}
rollData.margin = target - rollData.result
this.outputRollMessage(rollData)
}
/* -------------- ----------------------------- */
static processDirectRoll(rollData ) {
let roll = new Roll(rollData.rollFormula).roll({async: false})
rollData.roll = roll
// Compute BODY
let bodyValue = 0
for (let term of roll.terms) {
if ( term.constructor.name == "Die") {
for (let value of term.values) {
if (value > 1) {
bodyValue +=1
}
if (value == 6) {
bodyValue +=1
}
}
}
if ( term.constructor.name == "NumericTerm") {
if (term.total > 1) {
bodyValue +=1
}
if (term.total == 6) {
bodyValue +=1
}
}
}
rollData.result = roll.total
rollData.bodyValue = bodyValue
this.outputRollMessage(rollData)
}
/* -------------- ----------------------------- */
static async outputRollMessage(rollData) {
let msg = await this.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)
})
msg.setFlag("world", "rolldata", rollData)
console.log("Rolldata result", rollData)
}
/* -------------------------------------------- */
/* -------------- ----------------------------- */
static sortArrayObjectsByName(myArray) {
myArray.sort((a, b) => {
let fa = a.name.toLowerCase();

View File

@ -1452,3 +1452,7 @@ Focus FOC: #ff0084
min-height: 512px;
min-width: 256px;
}
.textarea-full-height {
min-height: 100%;
height: 100%;
}

View File

@ -91,7 +91,7 @@
"styles": [
"styles/simple.css"
],
"version": "10.0.29",
"version": "10.0.32",
"compatibility": {
"minimum": "10",
"verified": "10",
@ -99,7 +99,7 @@
},
"title": "Hero System v6 for FoundrtVTT (Official)",
"manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.29.zip",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.32.zip",
"url": "https://www.uberwald.me/gitea/uberwald/",
"background": "images/ui/hro6_welcome_page.webp",
"id": "fvtt-hero-system-6"

View File

@ -31,8 +31,9 @@
"xpearned": 0,
"xpspent": 0,
"combatskills": "",
"presenceattack": "",
"gmnotes": ""
"presenceattack": {},
"gmnotes": "",
"combatnotes1":""
}
},
"characteristics": {
@ -42,7 +43,7 @@
"value": 10,
"base": 10,
"category": "main",
"strdice": "",
"strdice": {},
"lift": "",
"strend": 0,
"hasroll": true,
@ -68,7 +69,8 @@
"hasroll": true,
"category": "main",
"value": 10,
"base": 10
"base": 10,
"perceptionroll": 10
},
"ego": {
"label": "Ego",
@ -314,7 +316,6 @@
"power",
"advantage",
"maneuver",
"martialart",
"limitation",
"complication",
"equipment"
@ -355,6 +356,7 @@
"pha": "",
"ocv": 0,
"dcv" : 0,
"isstock": false,
"active": false
},
"advantage": {
@ -458,15 +460,6 @@
"templates": [
"common"
]
},
"martialart": {
"maneuver_phase": 0,
"maneuver_ocv": 0,
"maneuver_dcv": 0,
"maneuver_effect": "",
"templates": [
"common"
]
}
}
}

View File

@ -98,7 +98,7 @@
<a class="" data-tab="skills">Skills</a>
<a class="" data-tab="perks">Perks</a>
<a class="" data-tab="talents">Talents</a>
<a class="" data-tab="martial">Martial Arts</a>
<a class="" data-tab="maneuver">Maneuvers</a>
<a class="" data-tab="powers">Powers</a>
<a class="" data-tab="complications">Complications</a>
<a class="" data-tab="equipment">Equipment</a>
@ -117,7 +117,7 @@
<ul class="item-list alternate-list">
<li class="item">
<label class="item-field-label-medium">STR Dice</label>
<a class="roll-direct" data-roll-formula="{{characteristics.str.strdice}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice}}</a>
<a class="roll-direct" data-roll-source="STR Dice" data-roll-formula="{{characteristics.str.strdice.rollFormula}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice.displayFormula}}</a>
<label class="item-field-label-short">&nbsp;</label>
<label class="item-field-label-medium">Lift</label>
<input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
@ -127,7 +127,7 @@
</li>
<li class="flexrow item">
<label class="item-field-label-long">Presence attack</label>
<a class="roll-direct" data-roll-formula="{{system.biodata.presenceattack}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack}}</a>
<a class="roll-direct" data-roll-source="Presence attack" data-roll-formula="{{system.biodata.presenceattack.rollFormula}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack.displayFormula}}</a>
</li>
</ul>
@ -187,10 +187,10 @@
<label class="">Vitals</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Val.</label>
<label class="short-label">Val</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Dam.</label>
<label class="short-label">Dmg</label>
</span>
</li>
{{#each characteristics as |char key|}}
@ -214,10 +214,10 @@
<label class="">Defenses</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Val.</label>
<label class="short-label">Val</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Res.</label>
<label class="short-label">Res</label>
</span>
</li>
{{#each characteristics as |char key|}}
@ -277,16 +277,14 @@
<label class="">Senses</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Val.</label>
</span>
</li>
{{#each senses as |sense key|}}
<li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
<span class="item-field-label-long">{{sense.label}}</span>
<span class="item-field-label-short">{{sense.value}}</span>
<span class="item-field-label-long">Perception Roll</span>
<input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.int.perceptionroll" value="{{characteristics.int.perceptionroll}}" data-dtype="Number" />
</li>
{{/each}}
</ul>
<textarea type="text" class="textarea-full-height padd-right" name="system.biodata.combatnotes1" data-dtype="String">{{system.biodata.combatnotes1}}</textarea>
</div>
<div>
@ -296,10 +294,10 @@
<label class="">Movement</label>
</span>
<span class="item-field-label-short">
<label class="short-label">C.</label>
<label class="short-label">C</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Non-C.</label>
<label class="short-label">NC</label>
</span>
</li>
{{#each characteristics as |char key|}}
@ -457,28 +455,39 @@
</ul>
</div>
{{!-- Martial Tab --}}
<div class="tab martial" data-group="primary" data-tab="martial">
{{!-- Maneuvers Tab --}}
<div class="tab maneuver" data-group="primary" data-tab="maneuver">
<ul class="stat-list alternate-list item-list">
<li class="item flexrow list-item items-title-bg">
<span class="item-field-label-long-img">
<label class="">Martial Arts</label>
<label class="">Maneuvers</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Roll</label>
<label class="short-label">PHA</label>
</span>
<span class="item-field-label-short">
<label class="short-label">OCV</label>
</span>
<span class="item-field-label-short">
<label class="short-label">DCV</label>
</span>
<span class="item-field-label-long">
<label class="short-label">Effects</label>
</span>
</li>
{{#each martialarts as |martial key|}}
<li class="item stat flexrow list-item list-item-shadow" data-item-id="{{martial._id}}">
{{#each nonstockmaneuvers as |maneuver key|}}
<li class="item stat flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
<a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
src="{{martial.img}}" /></a>
<span class="item-name-label"><a class="roll-item" data-type="talent">{{martial.name}}</a></span>
{{#if martial.system.hasroll}}
<span class="item-field-label-short">{{martial.system.roll}}-</span>
{{else}}
<span class="item-field-label-short">&nbsp;</span>
{{/if}}
src="{{maneuver.img}}" /></a>
<span class="item-field-label-long">{{maneuver.name}}</span>
<span class="item-field-label-short">{{maneuver.system.pha}}</span>
<span class="item-field-label-short">{{maneuver.system.ocv}}</span>
<span class="item-field-label-short">{{maneuver.system.dcv}}</span>
<span class="item-field-label-long">{{maneuver.system.effects}}</span>
<div class="item-filler">&nbsp;</div>
<div class="item-controls item-controls-fixed">
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>

View File

@ -18,8 +18,14 @@
<div>
<ul>
{{#if target}}
<li>Target Roll : {{target}}-
</li>
{{/if}}
{{#if rollSource}}
<li>Roll : {{rollSource}}</li>
{{/if}}
{{#if charac}}
<li>CHAR : {{charac.label}}</li>
@ -29,11 +35,24 @@
<li>{{item.name}} ({{upperFirst item.type}})</li>
{{/if}}
{{#if (exists bonusMalus)}}
<li>Bonus/Penalty : {{bonusMalus}}
</li>
{{/if}}
<li><strong>Result : {{result}}</strong> ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>
<li><strong>Result : {{result}}</strong>
{{#if (exists margin)}}
({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})
{{/if}}
</li>
{{#if (exists bodyValue)}}
<li><strong>BODY : {{bodyValue}}</strong>
{{/if}}
{{#if (exists margin)}}
<li><strong>Margin : {{margin}}</strong>
{{/if}}
</ul>
</div>

View File

@ -27,6 +27,10 @@
</select>
</li>
<li class="flexrow"><label class="item-field-label-medium">Is stock ?</label>
<label class="item-field-label-medium"><input type="checkbox" name="system.isstock" {{checked system.isstock}}/></label>
</li>
<li class="flexrow"><label class="item-field-label-medium">PHA</label>
<input type="text" class="item-field-label-medium" name="system.pha" value="{{system.pha}}" data-dtype="String"/>
</li>

View File

@ -1,23 +0,0 @@
<form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header">
<img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div>
</header>
{{> systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs}}
{{!-- Sheet Body --}}
<section class="sheet-body">
<div class="tab details" data-group="primary" data-tab="details">
<ul>
{{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
{{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
</ul>
</div>
</section>
</form>