mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-11 19:25:21 +01:00
For a rainy day.
This commit is contained in:
parent
8e588b3c47
commit
783f0a1a77
7 changed files with 49 additions and 10 deletions
|
|
@ -631,6 +631,10 @@ export default class DhCharacter extends BaseDataActor {
|
||||||
if(item.type === 'weapon'){ //Weapon Type
|
if(item.type === 'weapon'){ //Weapon Type
|
||||||
if(item.system.equipped) isValid = true;
|
if(item.system.equipped) isValid = true;
|
||||||
}
|
}
|
||||||
|
else if(item.type === 'weapon'){
|
||||||
|
//Logic to verify for feature
|
||||||
|
isValid=true;
|
||||||
|
}
|
||||||
else{
|
else{
|
||||||
isValid=true; //Other items like Loot,Consumables(will need to tweak consumable to activate after consume)
|
isValid=true; //Other items like Loot,Consumables(will need to tweak consumable to activate after consume)
|
||||||
}
|
}
|
||||||
|
|
@ -667,7 +671,7 @@ export default class DhCharacter extends BaseDataActor {
|
||||||
this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
|
this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
|
||||||
|
|
||||||
this.resources.armor = this._prepareArmorResources();
|
this.resources.armor = this._prepareArmorResources();
|
||||||
|
|
||||||
const armor = this.armor;
|
const armor = this.armor;
|
||||||
this.armorScore = this.resources.armor.max;
|
this.armorScore = this.resources.armor.max;
|
||||||
this.damageThresholds = {
|
this.damageThresholds = {
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ export default class DHArmor extends AttachableItem {
|
||||||
),
|
),
|
||||||
//Testing new armor schema
|
//Testing new armor schema
|
||||||
armor: new fields.SchemaField({
|
armor: new fields.SchemaField({
|
||||||
value: new fields.NumberField({integer: true, min: 0, initial: 0}),
|
value: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
max: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
priority: new fields.StringField({
|
priority: new fields.StringField({
|
||||||
required: true,
|
required: true,
|
||||||
choices: armorPriorityKeys,
|
choices: armorPriorityKeys,
|
||||||
|
|
|
||||||
|
|
@ -21,12 +21,12 @@ export default class DHConsumable extends BaseDataItem {
|
||||||
...super.defineSchema(),
|
...super.defineSchema(),
|
||||||
//Testing new armor schema
|
//Testing new armor schema
|
||||||
armor: new fields.SchemaField({
|
armor: new fields.SchemaField({
|
||||||
value: new fields.NumberField({integer: true, min: 0, initial: 0}),
|
value: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
||||||
priority: new fields.StringField({
|
priority: new fields.StringField({
|
||||||
required: true,
|
required: true,
|
||||||
choices: armorPriorityKeys,
|
choices: armorPriorityKeys,
|
||||||
initial: 'armor'
|
initial: 'consumable'
|
||||||
}),
|
}),
|
||||||
armorResourceToggle: new fields.BooleanField({initial: false})
|
armorResourceToggle: new fields.BooleanField({initial: false})
|
||||||
}),
|
}),
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import BaseDataItem from './base.mjs';
|
import BaseDataItem from './base.mjs';
|
||||||
|
import { armorPriorityKeys } from "../../config/itemConfig.mjs";
|
||||||
|
|
||||||
export default class DHFeature extends BaseDataItem {
|
export default class DHFeature extends BaseDataItem {
|
||||||
/** @inheritDoc */
|
/** @inheritDoc */
|
||||||
|
|
@ -24,6 +25,18 @@ export default class DHFeature extends BaseDataItem {
|
||||||
const fields = foundry.data.fields;
|
const fields = foundry.data.fields;
|
||||||
return {
|
return {
|
||||||
...super.defineSchema(),
|
...super.defineSchema(),
|
||||||
|
//Testing new armor schema
|
||||||
|
armor: new fields.SchemaField({
|
||||||
|
value: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
|
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
||||||
|
priority: new fields.StringField({
|
||||||
|
required: true,
|
||||||
|
choices: armorPriorityKeys,
|
||||||
|
initial: 'feature'
|
||||||
|
}),
|
||||||
|
armorResourceToggle: new fields.BooleanField({initial: false})
|
||||||
|
}),
|
||||||
|
//End
|
||||||
originItemType: new fields.StringField({
|
originItemType: new fields.StringField({
|
||||||
choices: CONFIG.DH.ITEM.featureTypes,
|
choices: CONFIG.DH.ITEM.featureTypes,
|
||||||
nullable: true,
|
nullable: true,
|
||||||
|
|
|
||||||
|
|
@ -21,12 +21,12 @@ export default class DHLoot extends BaseDataItem {
|
||||||
...super.defineSchema(),
|
...super.defineSchema(),
|
||||||
//Testing new armor schema
|
//Testing new armor schema
|
||||||
armor: new fields.SchemaField({
|
armor: new fields.SchemaField({
|
||||||
value: new fields.NumberField({integer: true, min: 0, initial: 0}),
|
value: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
max: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
priority: new fields.StringField({
|
priority: new fields.StringField({
|
||||||
required: true,
|
required: true,
|
||||||
choices: armorPriorityKeys,
|
choices: armorPriorityKeys,
|
||||||
initial: 'armor'
|
initial: 'loot'
|
||||||
}),
|
}),
|
||||||
armorResourceToggle: new fields.BooleanField({initial: false})
|
armorResourceToggle: new fields.BooleanField({initial: false})
|
||||||
}),
|
}),
|
||||||
|
|
|
||||||
|
|
@ -21,12 +21,12 @@ export default class DHWeapon extends AttachableItem {
|
||||||
...super.defineSchema(),
|
...super.defineSchema(),
|
||||||
//Testing new armor schema
|
//Testing new armor schema
|
||||||
armor: new fields.SchemaField({
|
armor: new fields.SchemaField({
|
||||||
value: new fields.NumberField({integer: true, min: 0, initial: 0}),
|
value: new fields.NumberField({required: true, integer: true, min: 0, initial: 0}),
|
||||||
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
max: new fields.NumberField({ required: true, integer: true, min: 0, initial: 0}),
|
||||||
priority: new fields.StringField({
|
priority: new fields.StringField({
|
||||||
required: true,
|
required: true,
|
||||||
choices: armorPriorityKeys,
|
choices: armorPriorityKeys,
|
||||||
initial: 'armor'
|
initial: 'weapon'
|
||||||
}),
|
}),
|
||||||
armorResourceToggle: new fields.BooleanField({initial: false})
|
armorResourceToggle: new fields.BooleanField({initial: false})
|
||||||
}),
|
}),
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,26 @@
|
||||||
data-group='{{tabs.settings.group}}'
|
data-group='{{tabs.settings.group}}'
|
||||||
>
|
>
|
||||||
{{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
|
{{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
|
||||||
|
|
||||||
|
<fieldset class="two-columns">
|
||||||
|
<legend>{{localize "DAGGERHEART.CONFIG.ItemArmor.settingTitle"}}</legend>
|
||||||
|
<span>{{localize "DAGGERHEART.CONFIG.ItemArmor.toggleTitle"}}</span>
|
||||||
|
{{formField
|
||||||
|
systemFields.armor.fields.armorResourceToggle
|
||||||
|
value=source.system.armor.armorResourceToggle
|
||||||
|
}}
|
||||||
|
{{#if source.system.armor.armorResourceToggle}}
|
||||||
|
<span>{{localize "DAGGERHEART.CONFIG.ItemArmor.title"}}</span>
|
||||||
|
<div class="nest-inputs">
|
||||||
|
{{formField systemFields.armor.fields.value value=source.system.armor.value label=(localize "DAGGERHEART.CONFIG.ItemArmor.value")}}
|
||||||
|
{{formField systemFields.armor.fields.max value=source.system.armor.max label=(localize "DAGGERHEART.CONFIG.ItemArmor.max")}}
|
||||||
|
{{formField
|
||||||
|
systemFields.armor.fields.priority
|
||||||
|
value=source.system.armor.priority
|
||||||
|
label=(localize "DAGGERHEART.CONFIG.ItemArmor.priority")
|
||||||
|
localize=true
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
</fieldset>
|
||||||
</section>
|
</section>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue