Compare commits

...

16 Commits
v9 ... v10

Author SHA1 Message Date
15e249e41e v12 support 2024-06-07 11:26:46 +02:00
a3b6908a17 Enhance stats 2024-02-08 12:53:15 +01:00
6e5bb5da32 v10/v11 compat 2023-05-25 16:22:02 +02:00
29ff86f4bd v10/v11 compat 2023-05-25 16:10:09 +02:00
aa243a7b80 Sync 2023-02-02 18:35:15 +01:00
c061b67bb3 Sync 2023-02-02 18:32:47 +01:00
c6c8622552 Sync 2023-02-02 18:32:25 +01:00
f6104e533c Sync 2023-02-02 18:28:24 +01:00
23b6a41eac Sync 2023-02-02 18:25:16 +01:00
f0c5e7b95d Sync 2023-02-02 18:24:58 +01:00
4b9af6a383 Allow items links in editors 2022-09-28 15:53:50 +02:00
d94c1a4dce v10 compat 2022-09-19 09:26:57 +02:00
bef1750231 v10 compatibility 2022-07-17 20:54:13 +02:00
1f0506f5c2 v10 compatibility 2022-07-17 20:53:25 +02:00
e52b62a314 v10 branch - Update manifest 2022-07-13 08:12:58 +02:00
9551b2a050 v10 branch - Update manifest 2022-07-13 08:11:00 +02:00
95 changed files with 799 additions and 680 deletions

View File

@ -10,7 +10,7 @@ export class SoSActorSheet extends ActorSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return mergeObject(super.defaultOptions, { return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["sos", "sheet", "actor"], classes: ["sos", "sheet", "actor"],
template: "systems/foundryvtt-shadows-over-sol/templates/actor-sheet.html", template: "systems/foundryvtt-shadows-over-sol/templates/actor-sheet.html",
width: 640, width: 640,
@ -22,8 +22,8 @@ export class SoSActorSheet extends ActorSheet {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getData() { async getData() {
const objectData = SoSUtility.data(this.object); const objectData = this.object
let formData = { let formData = {
title: this.title, title: this.title,
id: objectData.id, id: objectData.id,
@ -32,8 +32,11 @@ export class SoSActorSheet extends ActorSheet {
name: objectData.name, name: objectData.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
data: foundry.utils.deepClone(this.object.data), data: foundry.utils.deepClone(this.object.system),
effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)), effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
history: await TextEditor.enrichHTML(this.object.system.history, {async: true}),
notes: await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
gmnotes: await TextEditor.enrichHTML(this.object.system.gmnotes, {async: true}),
limited: this.object.limited, limited: this.object.limited,
options: this.options, options: this.options,
owner: this.document.isOwner owner: this.document.isOwner
@ -44,52 +47,52 @@ export class SoSActorSheet extends ActorSheet {
formData.edgecard = this.actor.getEdgesCard(); formData.edgecard = this.actor.getEdgesCard();
formData.deckSize = this.actor.getDeckSize(); formData.deckSize = this.actor.getDeckSize();
formData.skills = this.actor.data.items.filter( item => item.type == 'skill').sort( (a, b) => { formData.skills = this.actor.items.filter( item => item.type == 'skill').sort( (a, b) => {
if ( a.name > b.name ) return 1; if ( a.name > b.name ) return 1;
return -1; return -1;
}); });
formData.skill1 = formData.skills.slice(0, Math.ceil(formData.skills.length/2) ) formData.skill1 = formData.skills.slice(0, Math.ceil(formData.skills.length/2) )
formData.skill2 = formData.skills.slice(Math.ceil(formData.skills.length/2), formData.skills.length ) formData.skill2 = formData.skills.slice(Math.ceil(formData.skills.length/2), formData.skills.length )
formData.consequences = this.actor.data.items.filter( item => item.type == 'consequence').sort( (a, b) => { formData.consequences = this.actor.items.filter( item => item.type == 'consequence').sort( (a, b) => {
if ( a.name > b.name ) return 1; if ( a.name > b.name ) return 1;
return -1; return -1;
}); });
formData.gears = this.actor.data.items.filter( item => item.type == 'gear').concat( this.actor.data.items.filter( item => item.type == 'container') ); formData.gears = this.actor.items.filter( item => item.type == 'gear').concat( this.actor.items.filter( item => item.type == 'container') );
// Build the gear tree // Build the gear tree
formData.gearsRoot = formData.gears.filter(item => item.data.data.containerid == ""); formData.gearsRoot = formData.gears.filter(item => item.system.containerid == "");
for ( let container of formData.gearsRoot) { for ( let container of formData.gearsRoot) {
if ( container.type == 'container') { if ( container.type == 'container') {
container.data.contains = [] container.system.contains = []
container.data.containerEnc = 0; container.system.containerEnc = 0;
for (let gear of formData.gears) { for (let gear of formData.gears) {
console.log("GEAR", gear, container) console.log("GEAR", gear, container)
if ( gear.data.data.containerid == container.id) { if ( gear.system.containerid == container.id) {
container.data.contains.push( gear ) container.system.contains.push( gear )
if ( !gear.data.data.neg && !gear.data.data.software ) { if ( !gear.system.neg && !gear.system.software ) {
container.data.containerEnc += (gear.data.data.big > 0) ? gear.data.data.big : 1; container.system.containerEnc += (gear.system.big > 0) ? gear.system.big : 1;
} }
} }
} }
} }
} }
formData.weapons = this.actor.data.items.filter( item => item.type == 'weapon'); formData.weapons = this.actor.items.filter( item => item.type == 'weapon');
formData.armors = this.actor.data.items.filter( item => item.type == 'armor'); formData.armors = this.actor.items.filter( item => item.type == 'armor');
formData.totalEncumbrance = SoSUtility.computeEncumbrance(this.actor.data.items); formData.totalEncumbrance = SoSUtility.computeEncumbrance(this.actor.items);
formData.wounds = duplicate(this.actor.data.data.wounds); formData.wounds = foundry.utils.duplicate(this.actor.system.wounds);
formData.isGM = game.user.isGM; formData.isGM = game.user.isGM;
formData.currentWounds = this.actor.computeCurrentWounds(); formData.currentWounds = this.actor.computeCurrentWounds();
formData.totalWounds = this.actor.data.data.scores.wound.value; formData.totalWounds = this.actor.system.scores.wound.value;
formData.subcultureList = this.actor.data.items.filter( item => item.type == 'subculture'); formData.subcultureList = this.actor.items.filter( item => item.type == 'subculture');
if ( formData.subculture != "" ) { // background.subculture contains the main subculture ID if ( formData.subculture != "" ) { // background.subculture contains the main subculture ID
formData.mainSubculture = formData.subcultureList.find( subc => subc._id == data.data.subculture); formData.mainSubculture = formData.subcultureList.find( subc => subc._id == this.actor.system.subculture);
} }
formData.languageList = this.actor.data.items.filter( item => item.type == 'language'); formData.languageList = this.actor.items.filter( item => item.type == 'language');
formData.weaknessList = this.actor.data.items.filter( item => item.type == 'weakness'); formData.weaknessList = this.actor.items.filter( item => item.type == 'weakness');
formData.geneline = this.actor.data.items.find( item => item.type == 'geneline'); formData.geneline = this.actor.items.find( item => item.type == 'geneline');
formData.editStatSkill = this.options.editStatSkill; formData.editStatSkill = this.options.editStatSkill;
console.log("stats", formData); console.log("stats", formData);
@ -178,7 +181,7 @@ export class SoSActorSheet extends ActorSheet {
const li = $(event.currentTarget).parents(".item"); const li = $(event.currentTarget).parents(".item");
const item = this.actor.items.get(li.data("item-id")); const item = this.actor.items.get(li.data("item-id"));
let severity = $(event.currentTarget).val(); let severity = $(event.currentTarget).val();
this.actor.updateEmbeddedDocuments( "Item", [ { _id: item.id, 'data.severity': severity} ] ); this.actor.updateEmbeddedDocuments( "Item", [ { _id: item.id, 'system.severity': severity} ] );
this.render(true); this.render(true);
}); });
html.find('.lock-unlock-sheet').click((event) => { html.find('.lock-unlock-sheet').click((event) => {

View File

@ -61,24 +61,24 @@ export class SoSActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
checkDeck() { checkDeck() {
if ( !this.cardDeck && this.hasPlayerOwner ) { if ( !this.system.cardDeck && this.hasPlayerOwner ) {
this.cardDeck = new SoSCardDeck(); this.system.cardDeck = new SoSCardDeck();
this.cardDeck.initCardDeck( this, this.data.data.internals.deck ); this.system.cardDeck.initCardDeck( this, this.system.internals.deck );
} }
if ( !this.hasPlayerOwner ) { if ( !this.hasPlayerOwner ) {
this.cardDeck = game.system.sos.gmDeck.GMdeck; this.system.cardDeck = game.system.sos.gmDeck.GMdeck;
console.log("DECK : ", this.cardDeck); console.log("DECK : ", this.system.cardDeck);
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getDeckSize() { getDeckSize() {
return this.cardDeck.getDeckSize(); return this.system.cardDeck.getDeckSize();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getEdgesCard( ) { getEdgesCard( ) {
let edgesCard = duplicate(this.cardDeck.data.cardEdge); let edgesCard = foundry.utils.duplicate(this.system.cardDeck.data.cardEdge);
for (let edge of edgesCard) { for (let edge of edgesCard) {
edge.path = `systems/foundryvtt-shadows-over-sol/img/cards/${edge.cardName}.webp` edge.path = `systems/foundryvtt-shadows-over-sol/img/cards/${edge.cardName}.webp`
} }
@ -86,36 +86,36 @@ export class SoSActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
resetDeckFull( ) { resetDeckFull( ) {
this.cardDeck.shuffleDeck(); this.system.cardDeck.shuffleDeck();
this.cardDeck.drawEdge( this.data.data.scores.edge.value ); this.system.cardDeck.drawEdge( this.system.scores.edge.value );
this.saveDeck(); this.saveDeck();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
drawNewEdge( ) { drawNewEdge( ) {
this.cardDeck.drawEdge( 1 ); this.system.cardDeck.drawEdge( 1 );
this.saveDeck(); this.saveDeck();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
discardEdge( cardName ) { discardEdge( cardName ) {
this.cardDeck.discardEdge( cardName ); this.system.cardDeck.discardEdge( cardName );
this.saveDeck(); this.saveDeck();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
resetDeck( ) { resetDeck( ) {
this.cardDeck.resetDeck(); this.system.cardDeck.resetDeck();
this.saveDeck(); this.saveDeck();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
saveDeck( ) { saveDeck( ) {
let deck = { deck: duplicate(this.cardDeck.data.deck), let deck = { deck: foundry.utils.duplicate(this.system.cardDeck.data.deck),
discard: duplicate(this.cardDeck.data.discard), discard: foundry.utils.duplicate(this.system.cardDeck.data.discard),
cardEdge: duplicate(this.cardDeck.data.cardEdge) cardEdge: foundry.utils.duplicate(this.system.cardDeck.data.cardEdge)
} }
if ( this.hasPlayerOwner ) { if ( this.hasPlayerOwner ) {
this.update( { 'data.internals.deck': deck }); this.update( { 'system.internals.deck': deck });
} else { } else {
game.settings.set("foundryvtt-shadows-over-sol", "gmDeck", deck ); game.settings.set("foundryvtt-shadows-over-sol", "gmDeck", deck );
} }
@ -123,55 +123,55 @@ export class SoSActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
getDefense( ) { getDefense( ) {
return this.data.data.scores.defense; return this.system.scores.defense;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
computeDefense() { computeDefense() {
return { value: Math.ceil((this.data.data.stats.speed.value + this.data.data.stats.perception.value + this.data.data.stats.dexterity.value) / 2) + this.data.data.scores.defense.bonusmalus, return { value: Math.ceil((this.system.stats.speed.value + this.system.stats.perception.value + this.system.stats.dexterity.value) / 2) + this.system.scores.defense.bonusmalus,
critical: this.data.data.stats.speed.value + this.data.data.stats.perception.value + this.data.data.stats.dexterity.value + this.data.data.scores.defense.bonusmalus critical: this.system.stats.speed.value + this.system.stats.perception.value + this.system.stats.dexterity.value + this.system.scores.defense.bonusmalus
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getEdge( ) { getEdge( ) {
return this.data.data.scores.edge.value; return this.system.scores.edge.value;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getEncumbrance( ) { getEncumbrance( ) {
return this.data.data.scores.encumbrance.value; return this.system.scores.encumbrance.value;
} }
computeEncumbrance( ) { computeEncumbrance( ) {
return this.data.data.stats.strength.value + this.data.data.scores.encumbrance.bonusmalus; return this.system.stats.strength.value + this.system.scores.encumbrance.bonusmalus;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
computeEdge( ) { computeEdge( ) {
return Math.ceil( (this.data.data.stats.intelligence.value + this.data.data.stats.charisma.value) / 2) + this.data.data.scores.edge.bonusmalus; return Math.ceil( (this.system.stats.intelligence.value + this.system.stats.charisma.value) / 2) + this.system.scores.edge.bonusmalus;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getShock( ) { getShock( ) {
return this.data.data.scores.shock.value; return this.system.scores.shock.value;
} }
computeShock() { computeShock() {
return Math.ceil( this.data.data.stats.endurance.value + this.data.data.stats.determination.value + this.data.data.scores.dr.value) + this.data.data.scores.shock.bonusmalus; return Math.ceil( this.system.stats.endurance.value + this.system.stats.determination.value + this.system.scores.dr.value) + this.system.scores.shock.bonusmalus;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getWound( ) { getWound( ) {
return this.data.data.scores.wound.value; return this.system.scores.wound.value;
} }
computeWound() { computeWound() {
return Math.ceil( (this.data.data.stats.strength.value + this.data.data.stats.endurance.value) / 2) + this.data.data.scores.wound.bonusmalus; return Math.ceil( (this.system.stats.strength.value + this.system.stats.endurance.value) / 2) + this.system.scores.wound.bonusmalus;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getSkillExperience( skillName ) { getSkillExperience( skillName ) {
return this.data.items.filter( item => item.type == 'skillexperience' && item.data.skill == skillName); return this.items.filter( item => item.type == 'skillexperience' && item.system.skill == skillName);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async wornObject( itemID) { async wornObject( itemID) {
let item = this.items.get(itemID); let item = this.items.get(itemID);
if (item && item.data.data) { if (item && item.system) {
let update = { _id: item.id, "data.worn": !item.data.data.worn }; let update = { _id: item.id, "system.worn": !item.system.worn };
await this.updateEmbeddedDocuments("Item", [update]); await this.updateEmbeddedDocuments("Item", [update]);
} }
} }
@ -179,8 +179,8 @@ export class SoSActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
async equipObject(itemID) { async equipObject(itemID) {
let item = this.items.get(itemID) let item = this.items.get(itemID)
if (item && item.data.data) { if (item && item.system) {
let update = { _id: item.id, "data.equiped": !item.data.data.equiped }; let update = { _id: item.id, "system.equiped": !item.system.equiped };
await this.updateEmbeddedDocuments("Item", [update]); await this.updateEmbeddedDocuments("Item", [update]);
} }
} }
@ -198,7 +198,7 @@ export class SoSActor extends Actor {
await this.update( {'data.scores.edge.value': this.computeEdge()}); await this.update( {'data.scores.edge.value': this.computeEdge()});
} }
// Encumbrance // Encumbrance
if ( this.getEncumbrance() != this.data.data.stats.strength.value ) { if ( this.getEncumbrance() != this.system.stats.strength.value ) {
await this.update( {'data.scores.encumbrance.value': this.computeEncumbrance() }); await this.update( {'data.scores.encumbrance.value': this.computeEncumbrance() });
} }
// Shock // Shock
@ -213,31 +213,31 @@ export class SoSActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
async updateWound(woundName, value) { async updateWound(woundName, value) {
let wounds = duplicate(this.data.data.wounds) let wounds = foundry.utils.duplicate(this.system.wounds)
wounds[woundName] = value; wounds[woundName] = value;
await this.update( { 'data.wounds': wounds } ); await this.update( { 'system.wounds': wounds } );
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async updateSkill(skillName, value) { async updateSkill(skillName, value) {
let skill = this.data.items.find( item => item.name == skillName); let skill = this.items.find( item => item.name == skillName);
if (skill) { if (skill) {
const update = { _id: skill.id, 'data.value': value }; const update = { _id: skill.id, 'system.value': value };
const updated = await this.updateEmbeddedDocuments("Item", [ update] ); // Updates one EmbeddedEntity const updated = await this.updateEmbeddedDocuments("Item", [ update] ); // Updates one EmbeddedEntity
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async updateSkillExperience(skillName, value) { async updateSkillExperience(skillName, value) {
let skill = this.data.items.find( item => item.name == skillName); let skill = this.items.find( item => item.name == skillName);
if (skill) { if (skill) {
const update = { _id: skill.id, 'data.xp': value }; const update = { _id: skill.id, 'system.xp': value };
const updated = await this.updateEmbeddedDocuments("Item", [update]); // Updates one EmbeddedEntity const updated = await this.updateEmbeddedDocuments("Item", [update]); // Updates one EmbeddedEntity
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getApplicableConsequences( ) { getApplicableConsequences( ) {
let consequences = this.data.items.filter( item => item.type == 'consequence' && item.data.severity != 'none'); let consequences = this.items.filter( item => item.type == 'consequence' && item.system.severity != 'none');
return consequences; return consequences;
} }
@ -246,13 +246,13 @@ export class SoSActor extends Actor {
let flipData = { let flipData = {
mode: 'stat', mode: 'stat',
stat: duplicate(this.data.data.stats[statKey]), stat: foundry.utils.duplicate(this.system.stats[statKey]),
actor: this, actor: this,
modifierList: SoSUtility.fillRange(-10, +10), modifierList: SoSUtility.fillRange(-10, +10),
tnList: SoSUtility.fillRange(6, 20), tnList: SoSUtility.fillRange(6, 20),
consequencesList: duplicate( this.getApplicableConsequences() ), consequencesList: foundry.utils.duplicate( this.getApplicableConsequences() ),
weaknessList: this.data.items.filter( item => item.type == 'weakness' ), weaknessList: this.items.filter( item => item.type == 'weakness' ),
wounds: duplicate( this.data.data.wounds), wounds: foundry.utils.duplicate( this.system.wounds),
malusConsequence: 0, malusConsequence: 0,
bonusConsequence: 0, bonusConsequence: 0,
woundMalus: 0 woundMalus: 0
@ -265,12 +265,12 @@ export class SoSActor extends Actor {
async rollSkill( skill ) { async rollSkill( skill ) {
let flipData = { let flipData = {
mode: 'skill', mode: 'skill',
statList: duplicate(this.data.data.stats), statList: foundry.utils.duplicate(this.system.stats),
selectedStat: 'strength', selectedStat: 'strength',
consequencesList: duplicate( this.getApplicableConsequences() ), consequencesList: foundry.utils.duplicate( this.getApplicableConsequences() ),
wounds: duplicate( this.data.data.wounds), wounds: foundry.utils.duplicate( this.system.wounds),
skillExperienceList: this.getSkillExperience( skill.name), skillExperienceList: this.getSkillExperience( skill.name),
skill: duplicate(skill), skill: foundry.utils.duplicate(skill),
actor: this, actor: this,
modifierList: SoSUtility.fillRange(-10, +10), modifierList: SoSUtility.fillRange(-10, +10),
tnList: SoSUtility.fillRange(6, 20), tnList: SoSUtility.fillRange(6, 20),
@ -288,27 +288,27 @@ export class SoSActor extends Actor {
async rollWeapon( weapon ) { async rollWeapon( weapon ) {
let target = SoSUtility.getTarget(); let target = SoSUtility.getTarget();
let skill, selectedStatName; let skill, selectedStatName;
if ( weapon.data.data.category == 'ballistic' || weapon.data.data.category == 'laser' ) { if ( weapon.system.category == 'ballistic' || weapon.system.category == 'laser' ) {
skill = this.data.items.find( item => item.name == 'Guns'); skill = this.items.find( item => item.name == 'Guns');
selectedStatName = 'dexterity'; selectedStatName = 'dexterity';
} else if ( weapon.data.data.category == 'melee' ) { } else if ( weapon.system.category == 'melee' ) {
skill = this.data.items.find( item => item.name == 'Melee'); skill = this.items.find( item => item.name == 'Melee');
selectedStatName = 'dexterity'; selectedStatName = 'dexterity';
} else if ( weapon.data.data.category == 'grenade' ) { } else if ( weapon.system.category == 'grenade' ) {
skill = this.data.items.find( item => item.name == 'Athletics'); skill = this.items.find( item => item.name == 'Athletics');
selectedStatName = 'dexterity'; selectedStatName = 'dexterity';
} }
let flipData = { let flipData = {
mode: 'weapon', mode: 'weapon',
weapon: duplicate(weapon.data), weapon: foundry.utils.duplicate(weapon),
statList: duplicate(this.data.data.stats), statList: foundry.utils.duplicate(this.system.stats),
target: target, target: target,
selectedStat: selectedStatName, selectedStat: selectedStatName,
consequencesList: duplicate( this.getApplicableConsequences() ), consequencesList: foundry.utils.duplicate( this.getApplicableConsequences() ),
skillExperienceList: this.getSkillExperience( skill.name), skillExperienceList: this.getSkillExperience( skill.name),
wounds: duplicate( this.data.data.wounds), wounds: foundry.utils.duplicate( this.system.wounds),
skill: duplicate(skill), skill: foundry.utils.duplicate(skill),
actor: this, actor: this,
modifierList: SoSUtility.fillRange(-10, +10), modifierList: SoSUtility.fillRange(-10, +10),
tnList: SoSUtility.fillRange(6, 20), tnList: SoSUtility.fillRange(6, 20),
@ -327,21 +327,21 @@ export class SoSActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
async checkDeath( ) { async checkDeath( ) {
if ( this.data.data.scores.currentwounds.value >= this.data.data.scores.wound.value*2) { if ( this.system.scores.currentwounds.value >= this.system.scores.wound.value*2) {
let woundData = { let woundData = {
name: this.name, name: this.name,
wounds: this.data.data.wounds, wounds: this.system.wounds,
currentWounds: this.data.data.scores.currentwounds.value, currentWounds: this.system.scores.currentwounds.value,
totalWounds: this.data.data.scores.wound.value totalWounds: this.system.scores.wound.value
} }
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-character-death.html', woundData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-character-death.html', woundData );
ChatMessage.create( { content: html, whisper: [ChatMessage.getWhisperRecipients(this.name), ChatMessage.getWhisperRecipients("GM") ] } ); ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM") ) } )
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
computeCurrentWounds( ) { computeCurrentWounds( ) {
let wounds = this.data.data.wounds; let wounds = this.system.wounds;
return wounds.light + (wounds.moderate*2) + (wounds.severe*3) + (wounds.critical*4); return wounds.light + (wounds.moderate*2) + (wounds.severe*3) + (wounds.critical*4);
} }
@ -349,14 +349,14 @@ export class SoSActor extends Actor {
async applyConsequenceWound( severity, consequenceName) { async applyConsequenceWound( severity, consequenceName) {
if ( severity == 'none') return; // Nothing ! if ( severity == 'none') return; // Nothing !
let wounds = duplicate(this.data.data.wounds); let wounds = foundry.utils.duplicate(this.system.wounds);
if (severity == 'light' ) wounds.light += 1; if (severity == 'light' ) wounds.light += 1;
if (severity == 'moderate' ) wounds.moderate += 1; if (severity == 'moderate' ) wounds.moderate += 1;
if (severity == 'severe' ) wounds.severe += 1; if (severity == 'severe' ) wounds.severe += 1;
if (severity == 'critical' ) wounds.critical += 1; if (severity == 'critical' ) wounds.critical += 1;
let sumWound = wounds.light + (wounds.moderate*2) + (wounds.severe*3) + (wounds.critical*4); let sumWound = wounds.light + (wounds.moderate*2) + (wounds.severe*3) + (wounds.critical*4);
let currentWounds = duplicate(this.data.data.scores.currentwounds); let currentWounds = foundry.utils.duplicate(this.system.scores.currentwounds);
currentWounds.value = sumWound; currentWounds.value = sumWound;
await this.update( { 'data.scores.currentwounds': currentWounds, 'data.wounds': wounds } ); await this.update( { 'data.scores.currentwounds': currentWounds, 'data.wounds': wounds } );
@ -366,32 +366,32 @@ export class SoSActor extends Actor {
severity: severity, severity: severity,
wounds: wounds, wounds: wounds,
currentWounds: sumWound, currentWounds: sumWound,
totalWounds: this.data.data.scores.wound.value totalWounds: this.system.scores.wound.value
} }
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-consequence.html', woundData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-consequence.html', woundData );
ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } ); ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } )
this.checkDeath(); this.checkDeath();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async addObjectToContainer( itemId, containerId ) { async addObjectToContainer( itemId, containerId ) {
let container = this.data.items.find( item => item.id == containerId && item.type == 'container') let container = this.items.find( item => item.id == containerId && item.type == 'container')
let object = this.data.items.find( item => item.id == itemId ) let object = this.items.find( item => item.id == itemId )
console.log("Found", container, object) console.log("Found", container, object)
if ( container ) { if ( container ) {
if ( object.type == 'container') { if ( object.type == 'container') {
ui.notifications.warn("Only 1 level of container... sorry"); ui.notifications.warn("Only 1 level of container... sorry");
return return
} }
let alreadyInside = this.data.items.filter( item => item.data.data.containerid && item.data.data.containerid == containerId); let alreadyInside = this.items.filter( item => item.system.containerid && item.system.containerid == containerId);
if ( alreadyInside.length >= container.data.data.container ) { if ( alreadyInside.length >= container.system.container ) {
ui.notifications.warn("Container is already full !"); ui.notifications.warn("Container is already full !");
} else { } else {
await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'data.containerid':containerId }]); setTimeout(function() { this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':containerId }])}, 800 )
} }
} else if ( object && object.data.data.containerid) { // remove from container } else if ( object && object.system.containerid) { // remove from container
await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'data.containerid':"" }]); setTimeout(function() { this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':"" }])}, 800 )
} }
} }
@ -399,11 +399,11 @@ export class SoSActor extends Actor {
async applyWounds( flipData ) { async applyWounds( flipData ) {
if ( flipData.damageStatus == 'no_damage') { if ( flipData.damageStatus == 'no_damage') {
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-nodamage-taken.html', flipData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-nodamage-taken.html', flipData );
ChatMessage.create( { content: html, whisper: [ChatMessage.getWhisperRecipients(this.name), ChatMessage.getWhisperRecipients("GM") ] } ); ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } );
return; return;
} }
let wounds = duplicate(this.data.data.wounds); let wounds = foundry.utils.duplicate(this.system.wounds);
for (let wound of flipData.woundsList ) { for (let wound of flipData.woundsList ) {
if (wound == 'L' ) wounds.light += 1; if (wound == 'L' ) wounds.light += 1;
if (wound == 'M' ) wounds.moderate += 1; if (wound == 'M' ) wounds.moderate += 1;
@ -412,32 +412,32 @@ export class SoSActor extends Actor {
} }
// Compute total // Compute total
let sumWound = wounds.light + (wounds.moderate*2) + (wounds.severe*3) + (wounds.critical*4); let sumWound = wounds.light + (wounds.moderate*2) + (wounds.severe*3) + (wounds.critical*4);
let currentWounds = duplicate(this.data.data.scores.currentwounds); let currentWounds = foundry.utils.duplicate(this.system.scores.currentwounds);
currentWounds.value = sumWound; currentWounds.value = sumWound;
if ( sumWound >= this.data.data.scores.wound.value) { if ( sumWound >= this.system.scores.wound.value) {
let bleeding = this.data.items.find( item => item.type == 'consequence' && item.name == 'Bleeding'); let bleeding = this.items.find( item => item.type == 'consequence' && item.name == 'Bleeding');
let newSeverity = SoSUtility.increaseConsequenceSeverity( bleeding.data.severity ); let newSeverity = SoSUtility.increaseConsequenceSeverity( bleeding.system.severity );
await this.updateEmbeddedDocuments( "Item", [ { _id: bleeding.id, 'data.severity': newSeverity} ] ); await this.updateEmbeddedDocuments( "Item", [ { _id: bleeding.id, 'system.severity': newSeverity} ] );
flipData.isBleeding = newSeverity; flipData.isBleeding = newSeverity;
} }
// Stun consequence // Stun consequence
if ( flipData.nbStun > 0) { if ( flipData.nbStun > 0) {
let stun = this.data.items.find( item => item.type == 'consequence' && item.name == 'Stun'); let stun = this.items.find( item => item.type == 'consequence' && item.name == 'Stun');
let newSeverity = stun.data.severity; let newSeverity = stun.system.severity;
for(let i=0; i<flipData.nbStun; i++) { for(let i=0; i<flipData.nbStun; i++) {
newSeverity = SoSUtility.increaseConsequenceSeverity( newSeverity ); newSeverity = SoSUtility.increaseConsequenceSeverity( newSeverity );
} }
await this.updateEmbeddedDocuments( "Item", [ { _id: stun.id, 'data.severity': newSeverity} ] ); await this.updateEmbeddedDocuments( "Item", [ { _id: stun.id, 'system.severity': newSeverity} ] );
flipData.isStun = newSeverity; flipData.isStun = newSeverity;
} }
await this.update( { 'data.scores.currentwounds': currentWounds, 'data.wounds': wounds } ); await this.update( { 'data.scores.currentwounds': currentWounds, 'system.wounds': wounds } );
flipData.defenderName = this.name; flipData.defenderName = this.name;
flipData.wounds = wounds; flipData.wounds = wounds;
flipData.currentWounds = sumWound; flipData.currentWounds = sumWound;
flipData.totalWounds = this.data.data.scores.wound.value; flipData.totalWounds = this.system.scores.wound.value;
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-taken.html', flipData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-taken.html', flipData );
ChatMessage.create( { content: html, whisper: [ChatMessage.getWhisperRecipients(this.name), ChatMessage.getWhisperRecipients("GM") ] } ); ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(this.name).concat(ChatMessage.getWhisperRecipients("GM")) } );
this.checkDeath(); this.checkDeath();
} }

View File

@ -8,7 +8,7 @@ export class SoSItemSheet extends ItemSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return mergeObject(super.defaultOptions, { return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["foundryvtt-shadows-over-sol", "sheet", "item"], classes: ["foundryvtt-shadows-over-sol", "sheet", "item"],
template: "systems/foundryvtt-shadows-over-sol/templates/item-sheet.html", template: "systems/foundryvtt-shadows-over-sol/templates/item-sheet.html",
width: 550, width: 550,
@ -43,7 +43,7 @@ export class SoSItemSheet extends ItemSheet {
/* -------------------------------------------- */ /* -------------------------------------------- */
async getData() { async getData() {
const objectData = SoSUtility.data(this.object); const objectData = this.object
let formData = { let formData = {
title: this.title, title: this.title,
id: objectData.id, id: objectData.id,
@ -52,19 +52,26 @@ export class SoSItemSheet extends ItemSheet {
name: objectData.name, name: objectData.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
data: foundry.utils.deepClone(this.object.data), data: foundry.utils.deepClone(this.object.system),
effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)), effects: this.object.effects.map(e => foundry.utils.deepClone(e.system)),
limited: this.object.limited, limited: this.object.limited,
options: this.options, options: this.options,
owner: this.document.isOwner owner: this.document.isOwner,
description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
}; };
formData.isGM = game.user.isGM; formData.isGM = game.user.isGM;
if ( objectData.type == 'skillexperience') { if ( objectData.type == 'skillexperience') {
formData.skillList = await SoSUtility.loadCompendiumNames("foundryvtt-shadows-over-sol.skills"); formData.skillList = await SoSUtility.loadCompendiumNames("foundryvtt-shadows-over-sol.skills")
} }
if ( objectData.type == 'skill' && this.object.options?.actor) { if ( objectData.type == 'skill' && this.object.options?.actor) {
formData.skillExperienceList = this.object.options.actor.getSkillExperience( data.item.name ); formData.skillExperienceList = this.object.options.actor.getSkillExperience( objectData.name )
}
if ( objectData.type == 'geneline') {
formData.weakness = await TextEditor.enrichHTML(this.object.system.weakness, {async: true})
}
if ( objectData.type == 'malady') {
formData.notes = await TextEditor.enrichHTML(this.object.system.notes, {async: true})
} }
return formData; return formData;
} }

View File

@ -1,24 +0,0 @@
html.find('.item .item-name h4').click(event => this._onItemSummary(event));
/**
* Handle toggling of an item from the Actor sheet
* @private
*/
_onItemSummary(event) {
event.preventDefault();
let li = $(event.currentTarget).parents(".item"),
item = this.actor.getOwnedItem(li.data("item-id"));
// Toggle summary
if (item.data.data.description !== undefined && item.data.data.description !== null){
if ( li.hasClass("expanded") ) {
let summary = li.children(".item-summary");
summary.slideUp(200, () => summary.remove());
} else {
let div = $(`<div class="item-summary">${item.data.data.description}</div>`);
li.append(div.hide());
div.slideDown(200);
}
li.toggleClass("expanded");
}
}

View File

@ -8,7 +8,7 @@ const IDX2CARDFAMILY = ['c', 'd', 'h', 's'];
export class SoSCardDeck { export class SoSCardDeck {
/* -------------------------------------------- */ /* -------------------------------------------- */
initCardDeck(actor, savedDeck = undefined ) { async initCardDeck(actor, savedDeck = undefined ) {
this.data = {}; this.data = {};
@ -18,27 +18,28 @@ export class SoSCardDeck {
this.data.cardEdge = []; this.data.cardEdge = [];
if ( savedDeck.deck && savedDeck.deck.length > 0 ) { if ( savedDeck.deck && savedDeck.deck.length > 0 ) {
this.data.deck = duplicate(savedDeck.deck); this.data.deck = foundry.utils.duplicate(savedDeck.deck);
} }
if ( savedDeck.discard && savedDeck.discard.length > 0 ) { if ( savedDeck.discard && savedDeck.discard.length > 0 ) {
this.data.discard = duplicate(savedDeck.discard); this.data.discard = foundry.utils.duplicate(savedDeck.discard);
} }
if ( savedDeck.cardEdge && savedDeck.cardEdge.length > 0 ) { if ( savedDeck.cardEdge && savedDeck.cardEdge.length > 0 ) {
this.data.cardEdge = duplicate(savedDeck.cardEdge); this.data.cardEdge = foundry.utils.duplicate(savedDeck.cardEdge);
} }
this.data.actor = actor; this.data.actor = actor;
if ( this.data.deck.length == 0 && this.data.discard.length == 0) { if ( this.data.deck.length == 0 && this.data.discard.length == 0) {
this.shuffleDeck(); await this.shuffleDeck();
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
shuffleDeck() { async shuffleDeck() {
this.cleanCardList(); this.cleanCardList();
// Randomize deck // Randomize deck
while (this.data.deck.length != NB_POKER_CARD) { while (this.data.deck.length != NB_POKER_CARD) {
let idx = new Roll("1d54").roll( {async:false} ).total; let roll = await new Roll("1d54").roll();
let idx = roll.total;
if (!this.data.cardState[idx - 1]) { if (!this.data.cardState[idx - 1]) {
if (idx == 53) { // Red Joker if (idx == 53) { // Red Joker
this.data.deck.push( { cardName: 'jr' } ); this.data.deck.push( { cardName: 'jr' } );
@ -57,8 +58,8 @@ export class SoSCardDeck {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
resetDeck() { async resetDeck() {
let newdeck = duplicate(this.data.deck).concat( duplicate (this.data.discard) ) let newdeck = foundry.utils.duplicate(this.data.deck).concat( foundry.utils.duplicate (this.data.discard) )
this.data.discard = [] // Reinit discard pile this.data.discard = [] // Reinit discard pile
this.data.deck = [] this.data.deck = []
let decklen = newdeck.length let decklen = newdeck.length
@ -68,7 +69,8 @@ export class SoSCardDeck {
} }
// Randomize deck // Randomize deck
while (this.data.deck.length != decklen) { while (this.data.deck.length != decklen) {
let idx = new Roll("1d"+decklen).roll({async : false}).total let roll = await new Roll("1d"+decklen).roll()
let idx = roll.total
//console.log("Deck stuff", this.data.deck.length, decklen, idx) //console.log("Deck stuff", this.data.deck.length, decklen, idx)
if (!cardState[idx-1]) { if (!cardState[idx-1]) {
this.data.deck.push( newdeck[idx-1] ) this.data.deck.push( newdeck[idx-1] )
@ -247,7 +249,7 @@ export class SoSCardDeck {
if ( flipData.mode == 'stat' || flipData.mode == 'weapon' ) { if ( flipData.mode == 'stat' || flipData.mode == 'weapon' ) {
flipData.baseScore = flipData.stat.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus; flipData.baseScore = flipData.stat.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus;
} else if (flipData.mode == 'skill') { } else if (flipData.mode == 'skill') {
flipData.baseScore = Math.floor(flipData.stat.value/2) + flipData.skill.data.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus; flipData.baseScore = Math.floor(flipData.stat.value/2) + flipData.skill.system.value + flipData.malusConsequence + flipData.bonusConsequence + flipData.woundMalus;
} }
flipData.finalScore = flipData.baseScore + flipData.cardTotal + Number(flipData.modifier); flipData.finalScore = flipData.baseScore + flipData.cardTotal + Number(flipData.modifier);
flipData.magnitude = flipData.finalScore - flipData.tn; flipData.magnitude = flipData.finalScore - flipData.tn;
@ -272,10 +274,10 @@ export class SoSCardDeck {
async processWeapon( flipData ) { async processWeapon( flipData ) {
flipData.damageCardsuit = flipData.cardSlot[flipData.cardSlotIndex].cardsuit; flipData.damageCardsuit = flipData.cardSlot[flipData.cardSlotIndex].cardsuit;
let damageKey = 'damage_'+ flipData.damageCardsuit; let damageKey = 'damage_'+ flipData.damageCardsuit;
flipData.damageString = flipData.weapon.data[damageKey]; flipData.damageString = flipData.weapon.system[damageKey];
if (flipData.damageString.includes('Str') ) { if (flipData.damageString.includes('Str') ) {
let damageRegexp = flipData.damageString.match( /Str([\d])?\+?([\d])?([LMSC])/i ); let damageRegexp = flipData.damageString.match( /Str([\d])?\+?([\d])?([LMSC])/i );
flipData.damageValue = (flipData.actor.data.data.stats.strength.value * Number(damageRegexp[1]?damageRegexp[1]:1)) + Number(damageRegexp[2]?damageRegexp[2]:0); flipData.damageValue = (flipData.actor.system.stats.strength.value * Number(damageRegexp[1]?damageRegexp[1]:1)) + Number(damageRegexp[2]?damageRegexp[2]:0);
flipData.damageSeverity = damageRegexp[3]; flipData.damageSeverity = damageRegexp[3];
} else { } else {
let damageRegexp = flipData.damageString.match( /(\d*)([LMSC])/i ); let damageRegexp = flipData.damageString.match( /(\d*)([LMSC])/i );

View File

@ -8,23 +8,27 @@ export class SoSCombat extends Combat {
/* -------------------------------------------- */ /* -------------------------------------------- */
requestActions() { requestActions() {
if ( game.user.isGM && !this.actionsRequested) { if (game.user.isGM && !this.actionsRequested) {
console.log("REQUEST ACTIONS !!!"); console.log("REQUEST ACTIONS !!!")
this.actionsRequested = true; this.actionsRequested = true;
this.phaseSetup = {}; // Reset each new round/update this.phaseSetup = {}; // Reset each new round/update
for( let combatant of this.combatants) { for (let combatant of this.combatants) {
this.setInitiative(combatant._id, -1 ); // Reset init this.setInitiative(combatant.id, -1); // Reset init
let uniq = randomID(16); let uniq = foundry.utils.randomID(16)
const name = combatant.actor ? combatant.actor.data.name : combatant.name; const name = combatant.actor ? combatant.actor.name : combatant.name;
if ( combatant.players[0]) { if (combatant.players && combatant.players[0] ) {
// A player controls this combatant -> message ! // A player controls this combatant -> message !
ChatMessage.create( { content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br> ChatMessage.create({
<a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Declare actions</a>`, content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
whisper: [ combatant.players[0].data._id] } ); <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Declare actions</a>`,
whisper: [combatant.players[0].id]
});
} else { } else {
ChatMessage.create( { content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br> ChatMessage.create({
<a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Declare actions</a>`, content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
whisper: [ ChatMessage.getWhisperRecipients("GM") ] } ); <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Declare actions</a>`,
whisper: ChatMessage.getWhisperRecipients("GM"),
});
} }
} }
} }
@ -39,7 +43,7 @@ export class SoSCombat extends Combat {
/* -------------------------------------------- */ /* -------------------------------------------- */
gotoNextTurn() { gotoNextTurn() {
this.phaseNumber -= 1; this.phaseNumber -= 1;
if ( this.phaseNumber <= 0) { if (this.phaseNumber <= 0) {
this.applyConsequences(); this.applyConsequences();
this.nextRound(); // Auto-switch to next round this.nextRound(); // Auto-switch to next round
} else { } else {
@ -49,46 +53,51 @@ export class SoSCombat extends Combat {
/* -------------------------------------------- */ /* -------------------------------------------- */
async nextTurn() { async nextTurn() {
console.log("Going to phase !", this.phaseNumber ); console.log("Going to phase !", this.phaseNumber);
// Get all actions for this phase // Get all actions for this phase
let phaseIndex = this.phaseNumber - 1; let phaseIndex = this.phaseNumber - 1;
let actionList = []; let actionList = [];
let actionMsg = `<h4>Actions for phase ${this.phaseNumber}</h4>`; let actionMsg = `<h4>Actions for phase ${this.phaseNumber}</h4>`;
for (let combatantId in this.phaseSetup ) { for (let combatantId in this.phaseSetup) {
let actionData = this.phaseSetup[combatantId]; let actionData = this.phaseSetup[combatantId];
if ( actionData.phaseArray[phaseIndex].name != 'No Action' ) { if (actionData.phaseArray[phaseIndex].name != 'No Action') {
let combatant = this.combatants.find( comb => comb._id == actionData.combatantId); let combatant = this.combatants.find(comb => comb._id == actionData.combatantId);
const name = combatant.actor ? combatant.actor.data.name : combatant.name; const name = combatant.actor ? combatant.actor.name : combatant.name;
actionList.push( { combatant: combatant, actionList.push({
action: actionData.phaseArray[phaseIndex], combatant: combatant,
isDone: false action: actionData.phaseArray[phaseIndex],
}); isDone: false
});
actionMsg += `<br>${name} is going to : ${actionData.phaseArray[phaseIndex].name}`; actionMsg += `<br>${name} is going to : ${actionData.phaseArray[phaseIndex].name}`;
} }
} }
if ( actionList.length == 0) { if (actionList.length == 0) {
actionMsg += "<br>No actions for the phase !"; actionMsg += "<br>No actions for the phase !";
this.gotoNextTurn(); this.gotoNextTurn();
} }
// Display a nice message // Display a nice message
ChatMessage.create( { content: actionMsg }); ChatMessage.create({ content: actionMsg });
// Now push specific messages // Now push specific messages
for ( let action of actionList) { for (let action of actionList) {
let uniq = randomID(16); let uniq = foundry.utils.randomID(16);
action.uniqId = uniq; // Easy tracking with chat messages action.uniqId = uniq; // Easy tracking with chat messages
const name = action.combatant.actor ? action.combatant.actor.data.name : action.combatant.name; const name = action.combatant.actor ? action.combatant.actor.name : action.combatant.name;
if ( action.combatant.players[0]) { if (action.combatant.players[0]) {
// A player controls this combatant -> message ! // A player controls this combatant -> message !
ChatMessage.create( { content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action. ChatMessage.create({
content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.
When done, click on the button below to close the action. When done, click on the button below to close the action.
<a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Action is done !</a>`, <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Action is done !</a>`,
whisper: [ action.combatant.players[0].data._id] } ); whisper: [action.combatant.players[0].id]
});
} else { } else {
ChatMessage.create( { content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.<br> ChatMessage.create({
content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.<br>
When done, click on the button below to close the action. When done, click on the button below to close the action.
<a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Action is done !</a>`, <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant.id}' data-combat-id='${this.id}' data-round='${this.round}'>Action is done !</a>`,
whisper: [ ChatMessage.getWhisperRecipients("GM") ] } ); whisper: ChatMessage.getWhisperRecipients("GM")
});
} }
} }
// Save for easy access // Save for easy access
@ -96,28 +105,28 @@ export class SoSCombat extends Combat {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
applyConsequences( ) { applyConsequences() {
if (game.user.isGM ) { if (game.user.isGM) {
for( let combatant of this.combatants) { for (let combatant of this.combatants) {
if (!combatant.actor) continue; // Can't check tokens without assigned actors, Maybe print chat message about bleeding happening so that the GM can manually track this? if (!combatant.actor) continue; // Can't check tokens without assigned actors, Maybe print chat message about bleeding happening so that the GM can manually track this?
let bleeding = combatant.actor.data.items.find( item => item.type == 'consequence' && item.name == 'Bleeding'); let bleeding = combatant.actor.items.find(item => item.type == 'consequence' && item.name == 'Bleeding');
combatant.actor.applyConsequenceWound( bleeding.data.severity, "bleeding" ); combatant.actor.applyConsequenceWound(bleeding.system.severity, "bleeding");
} }
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
closeAction( uniqId) { closeAction(uniqId) {
// Delete message ! // Delete message !
const toDelete = game.messages.filter(it => it.data.content.includes( uniqId )); const toDelete = game.messages.filter(it => it.content.includes(uniqId));
toDelete.forEach(it => it.delete()); toDelete.forEach(it => it.delete())
let action = this.currentActions.find( _action => _action.uniqId == uniqId ); let action = this.currentActions.find(_action => _action.uniqId == uniqId);
if (action) { if (action) {
action.isDone = true; action.isDone = true;
let filtered = this.currentActions.filter( _action => action.isDone ); let filtered = this.currentActions.filter(_action => action.isDone);
if ( filtered.length == this.currentActions.length) { // All actions closed ! if (filtered.length == this.currentActions.length) { // All actions closed !
console.log("Going next turn !!!"); console.log("Going next turn !!!");
this.gotoNextTurn(); this.gotoNextTurn();
} }
@ -125,22 +134,22 @@ export class SoSCombat extends Combat {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getPhaseRank( actionConf) { getPhaseRank(actionConf) {
for (let i=2; i>=0; i--) { for (let i = 2; i >= 0; i--) {
let action = actionConf.phaseArray[i]; let action = actionConf.phaseArray[i];
if (action.name != "No Action") { if (action.name != "No Action") {
return i+1; return i + 1;
} }
} }
return 0; return 0;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getAPFromActor( actorId ) { getAPFromActor(actorId) {
for( let combatant of this.combatants) { for (let combatant of this.combatants) {
//console.log(combatant); //console.log(combatant);
if ( combatant.actor.data._id == actorId ) { if (combatant.actor.id == actorId) {
let phase = this.phaseSetup[combatant._id]; let phase = this.phaseSetup[combatant.id];
return phase.remainingAP; return phase.remainingAP;
} }
} }
@ -148,13 +157,13 @@ export class SoSCombat extends Combat {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
decreaseAPFromActor( actorId ) { decreaseAPFromActor(actorId) {
for( let combatant of this.combatants) { for (let combatant of this.combatants) {
//console.log(combatant); //console.log(combatant);
if ( combatant.actor.data._id == actorId ) { if (combatant.actor.id == actorId) {
let phase = this.phaseSetup[combatant._id]; let phase = this.phaseSetup[combatant.id];
phase.remainingAP -= 1; phase.remainingAP -= 1;
if ( phase.remainingAP < 0 ) phase.remainingAP = 0; if (phase.remainingAP < 0) phase.remainingAP = 0;
} }
} }
} }
@ -164,26 +173,27 @@ export class SoSCombat extends Combat {
console.log("Setting combat for phase : ", actionConf, actionConf.uniqId); console.log("Setting combat for phase : ", actionConf, actionConf.uniqId);
// Delete message ! // Delete message !
const toDelete = game.messages.filter(it => it.data.content.includes( actionConf.uniqId )); const toDelete = game.messages.filter(it => it.content.includes(actionConf.uniqId));
console.log("MESSAGE : ", toDelete);
toDelete.forEach(it => it.delete()); toDelete.forEach(it => it.delete());
if ( !this.phaseSetup) this.phaseSetup = {}; // Opportunistic init if (!this.phaseSetup) this.phaseSetup = {}; // Opportunistic init
// Keep track // Keep track
this.phaseSetup[actionConf.combatantId] = actionConf; this.phaseSetup[actionConf.combatantId] = actionConf;
console.log( this.combatants ); console.log(this.combatants);
//let combatant = this.combatants.find( comb => comb._id == actionConf.combatantId); //let combatant = this.combatants.find( comb => comb._id == actionConf.combatantId);
await this.setInitiative( actionConf.combatantId, this.getPhaseRank( actionConf ) ); await this.setInitiative(actionConf.combatantId, this.getPhaseRank(actionConf));
let actionsDone = true let actionsDone = true
for( let combatant of this.combatants) { for (let combatant of this.combatants) {
if ( combatant.initiative == -1 ) actionsDone = false; if (combatant.initiative == -1) actionsDone = false;
} }
if ( actionsDone ) { if (actionsDone) {
this.actionsRequested = false; this.actionsRequested = false;
ChatMessage.create( { content: `Action declaration has been completed ! Now proceeding with actions.`, ChatMessage.create({
whisper: [ ChatMessage.getWhisperRecipients("GM") ] } ); content: `Action declaration has been completed ! Now proceeding with actions.`,
whisper: ChatMessage.getWhisperRecipients("GM")
})
this.phaseNumber = 3; this.phaseNumber = 3;
this.nextTurn(); this.nextTurn();
} }

View File

@ -12,7 +12,7 @@ export class SoSDialogCombatActions extends Dialog {
actionPoints: SoSUtility.fillRange(0, 6), actionPoints: SoSUtility.fillRange(0, 6),
combatId: combatId, combatId: combatId,
combatantId: combatantId, combatantId: combatantId,
combatantsList: combat.data.combatants, combatantsList: combat.combatants,
uniqId: uniqId, uniqId: uniqId,
round: round round: round
} }
@ -53,11 +53,11 @@ export class SoSDialogCombatActions extends Dialog {
super.close(); super.close();
let action3Index = $('#action3').val(); let action3Index = $('#action3').val();
let action3 = duplicate(this.combatActions.actionsList[action3Index]); let action3 = foundry.utils.duplicate(this.combatActions.actionsList[action3Index]);
let action2Index = $('#action2').val(); let action2Index = $('#action2').val();
let action2 = duplicate(this.combatActions.actionsList[action2Index]); let action2 = foundry.utils.duplicate(this.combatActions.actionsList[action2Index]);
let action1Index = $('#action1').val(); let action1Index = $('#action1').val();
let action1 = duplicate(this.combatActions.actionsList[action1Index]); let action1 = foundry.utils.duplicate(this.combatActions.actionsList[action1Index]);
let combatant3Id = $('#combatant3').val(); let combatant3Id = $('#combatant3').val();
let combatant2Id = $('#combatant2').val(); let combatant2Id = $('#combatant2').val();

View File

@ -29,8 +29,8 @@ export class SoSFlipDialog extends Dialog {
let scoreBase = 0; let scoreBase = 0;
if ( this.flipData.mode == 'skill' || this.flipData.mode == 'weapon' ) { if ( this.flipData.mode == 'skill' || this.flipData.mode == 'weapon' ) {
let statKey = $('#statSelect').val(); let statKey = $('#statSelect').val();
this.flipData.stat = duplicate( this.flipData.statList[ statKey ] ); this.flipData.stat = foundry.utils.duplicate( this.flipData.statList[ statKey ] );
scoreBase = Math.floor(this.flipData.statList[ statKey ].value / 2) + this.flipData.skill.data.value; scoreBase = Math.floor(this.flipData.statList[ statKey ].value / 2) + this.flipData.skill.system.value
} else { //Stat mode } else { //Stat mode
let statKey = $('#statSelect').val(); let statKey = $('#statSelect').val();
scoreBase = this.flipData.stat.value; scoreBase = this.flipData.stat.value;
@ -52,25 +52,25 @@ export class SoSFlipDialog extends Dialog {
async updateFlip( flipData ) { async updateFlip( flipData ) {
//console.log("UPDATE !!!", flipData); //console.log("UPDATE !!!", flipData);
$('.view-deck').remove(); $('.view-deck').remove();
$("#view-deck").append(await flipData.actor.cardDeck.getDeckHTML()); $("#view-deck").append(await flipData.actor.system.cardDeck.getDeckHTML());
$('.view-edge').remove(); $('.view-edge').remove();
$("#view-edge").append(await flipData.actor.cardDeck.getEdgeHTMLForFlip()); $("#view-edge").append(await flipData.actor.system.cardDeck.getEdgeHTMLForFlip());
this.updateScoreBase(); this.updateScoreBase();
$('.edge-card').click((event) => { $('.edge-card').click((event) => {
let flipData = this.flipData; let flipData = this.flipData;
flipData.modifier = $('#modifier').val(); flipData.modifier = $('#modifier').val();
flipData.tn = (flipData.target) ? flipData.target.actor.data.data.scores.defense.value : $('#tn').val(); flipData.tn = (flipData.target) ? flipData.target.actor.system.scores.defense.value : $('#tn').val();
flipData.edgeName = event.currentTarget.attributes['data-edge-card'].value; flipData.edgeName = event.currentTarget.attributes['data-edge-card'].value;
flipData.edgeLuck = $('#edge-luck').is(":checked"); flipData.edgeLuck = $('#edge-luck').is(":checked");
flipData.cardOrigin = "Edge"; flipData.cardOrigin = "Edge";
if ( flipData.mode == 'skill' || flipData.mode == 'weapon') { if ( flipData.mode == 'skill' || flipData.mode == 'weapon') {
flipData.stat = duplicate( flipData.statList[ $('#statSelect').val() ] ); flipData.stat = foundry.utils.duplicate( flipData.statList[ $('#statSelect').val() ] );
} }
console.log("CLICK:", flipData); console.log("CLICK:", flipData);
this.flipData.actor.cardDeck.doFlipFromDeckOrEdge(flipData); this.flipData.actor.system.cardDeck.doFlipFromDeckOrEdge(flipData);
this.onFlipClose(); this.onFlipClose();
}); });
@ -94,7 +94,7 @@ export class SoSFlipDialog extends Dialog {
for (let consequenceId of this.flipData.consequencesSelected) { for (let consequenceId of this.flipData.consequencesSelected) {
let consequence = this.flipData.consequencesList.find( item => item._id == consequenceId); let consequence = this.flipData.consequencesList.find( item => item._id == consequenceId);
console.log(consequence, consequenceId); console.log(consequence, consequenceId);
malusConsequence += SoSUtility.getConsequenceMalus( consequence.data.severity ); malusConsequence += SoSUtility.getConsequenceMalus( consequence.system.severity );
} }
$('#consequence-malus').text(malusConsequence); $('#consequence-malus').text(malusConsequence);
this.flipData.malusConsequence = malusConsequence; this.flipData.malusConsequence = malusConsequence;
@ -108,7 +108,7 @@ export class SoSFlipDialog extends Dialog {
for (let consequenceId of this.flipData.consequencesSelected) { for (let consequenceId of this.flipData.consequencesSelected) {
let consequence = this.flipData.consequencesList.find( item => item._id == consequenceId); let consequence = this.flipData.consequencesList.find( item => item._id == consequenceId);
console.log(consequence, consequenceId); console.log(consequence, consequenceId);
bonusConsequence += SoSUtility.getConsequenceBonus( consequence.data.severity ); bonusConsequence += SoSUtility.getConsequenceBonus( consequence.system.severity );
} }
$('#consequence-bonus').text(bonusConsequence); $('#consequence-bonus').text(bonusConsequence);
this.flipData.bonusConsequence = bonusConsequence; this.flipData.bonusConsequence = bonusConsequence;
@ -161,11 +161,11 @@ export class SoSFlipDialog extends Dialog {
flipData.modifier = html.find('#modifier').val(); flipData.modifier = html.find('#modifier').val();
if ( flipData.mode == 'skill' || flipData.mode == 'weapon') { if ( flipData.mode == 'skill' || flipData.mode == 'weapon') {
let statKey = $('#statSelect').val(); let statKey = $('#statSelect').val();
flipData.stat = duplicate( flipData.statList[ statKey ] ); flipData.stat = foundry.utils.duplicate( flipData.statList[ statKey ] );
} }
flipData.cardOrigin = "Deck"; flipData.cardOrigin = "Deck";
flipData.tn = (flipData.target) ? flipData.target.actor.data.data.scores.defense.value : $('#tn').val(); flipData.tn = (flipData.target) ? flipData.target.actor.system.scores.defense.value : $('#tn').val();
dialog.flipData.actor.cardDeck.doFlipFromDeckOrEdge(flipData); dialog.flipData.actor.system.cardDeck.doFlipFromDeckOrEdge(flipData);
dialog.onFlipClose(); dialog.onFlipClose();
}); });

View File

@ -35,9 +35,9 @@ export class SoSGMDeck extends Dialog {
/* -------------------------------------------- */ /* -------------------------------------------- */
saveDeck( ) { saveDeck( ) {
let deck = { let deck = {
deck: duplicate(this.GMdeck.data.deck), deck: foundry.utils.duplicate(this.GMdeck.data.deck),
discard: duplicate(this.GMdeck.data.discard), discard: foundry.utils.duplicate(this.GMdeck.data.discard),
cardEdge: duplicate(this.GMdeck.data.cardEdge) cardEdge: foundry.utils.duplicate(this.GMdeck.data.cardEdge)
} }
game.settings.set("foundryvtt-shadows-over-sol", "gmDeck", deck ); game.settings.set("foundryvtt-shadows-over-sol", "gmDeck", deck );
} }
@ -60,7 +60,7 @@ export class SoSGMDeck extends Dialog {
let cardPath = `systems/foundryvtt-shadows-over-sol/img/cards/${card.cardName}.webp`; let cardPath = `systems/foundryvtt-shadows-over-sol/img/cards/${card.cardName}.webp`;
let cardData = { card: card, cardPath: cardPath }; let cardData = { card: card, cardPath: cardPath };
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-card.html', cardData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-card.html', cardData );
ChatMessage.create( { content: html, whisper: [ ChatMessage.getWhisperRecipients("GM") ] }); ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients("GM") } );
//dialog.onFlipClose(); //dialog.onFlipClose();
} }

View File

@ -15,6 +15,7 @@ import { SoSUtility } from "./sos-utility.js";
import { SoSCombat } from "./sos-combat.js"; import { SoSCombat } from "./sos-combat.js";
import { gearConverter } from "./gears_convert.js"; import { gearConverter } from "./gears_convert.js";
import { SoSGMDeck } from "./sos-gm-deck.js"; import { SoSGMDeck } from "./sos-gm-deck.js";
import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Foundry VTT Initialization */ /* Foundry VTT Initialization */
@ -89,29 +90,6 @@ function welcomeMessage() {
` }); ` });
} }
/* -------------------------------------------- */
// Register world usage statistics
function registerUsageCount( registerKey ) {
if ( game.user.isGM ) {
game.settings.register(registerKey, "world-key", {
name: "Unique world key",
scope: "world",
config: false,
type: String
});
let worldKey = game.settings.get(registerKey, "world-key")
if ( worldKey == undefined || worldKey == "" ) {
worldKey = randomID(32)
game.settings.set(registerKey, "world-key", worldKey )
}
// Simple API counter
let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.data.version}"`
$.ajax(regURL)
/* -------------------------------------------- */
}
}
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Foundry VTT Initialization */ /* Foundry VTT Initialization */
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -125,7 +103,8 @@ Hooks.once("ready", function () {
user: game.user._id user: game.user._id
}); });
} }
registerUsageCount("foundryvtt-shadows-over-sol") ClassCounter.registerUsageCount()
SoSUtility.ready()
welcomeMessage(); welcomeMessage();

View File

@ -3,12 +3,12 @@ import { SoSCombat } from "./sos-combat.js";
import { SoSDialogCombatActions } from "./sos-dialog-combat-actions.js"; import { SoSDialogCombatActions } from "./sos-dialog-combat-actions.js";
/* -------------------------------------------- */ /* -------------------------------------------- */
const severity2malus = { "none": 0, "light": -1, "moderate": -2, "severe": -3, "critical": -4}; const severity2malus = { "none": 0, "light": -1, "moderate": -2, "severe": -3, "critical": -4 };
/* -------------------------------------------- */ /* -------------------------------------------- */
const severity2bonus = { "none": 0, "light": 1, "moderate": 2, "severe": 3, "critical": 4}; const severity2bonus = { "none": 0, "light": 1, "moderate": 2, "severe": 3, "critical": 4 };
/* -------------------------------------------- */ /* -------------------------------------------- */
export class SoSUtility { export class SoSUtility {
/* -------------------------------------------- */ /* -------------------------------------------- */
static async preloadHandlebarsTemplates() { static async preloadHandlebarsTemplates() {
@ -31,44 +31,40 @@ export class SoSUtility {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static fillRange (start, end) { static ready() {
Handlebars.registerHelper('select', function (selected, options) {
const escapedValue = RegExp.escape(Handlebars.escapeExpression(selected));
const rgx = new RegExp(' value=[\"\']' + escapedValue + '[\"\']');
const html = options.fn(this);
return html.replace(rgx, "$& selected");
});
}
/* -------------------------------------------- */
static fillRange(start, end) {
return Array(end - start + 1).fill().map((item, index) => start + index); return Array(end - start + 1).fill().map((item, index) => start + index);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static onSocketMesssage( msg ) { static onSocketMesssage(msg) {
if( !game.user.isGM ) return; // Only GM if (!game.user.isGM) return; // Only GM
if (msg.name == 'msg_declare_actions' ) { if (msg.name == 'msg_declare_actions') {
let combat = game.combats.get( msg.data.combatId); // Get the associated combat let combat = game.combats.get(msg.data.combatId); // Get the associated combat
combat.setupActorActions( msg.data ); combat.setupActorActions(msg.data);
} else if (msg.name == 'msg_close_action') { } else if (msg.name == 'msg_close_action') {
game.combat.closeAction( msg.data.uniqId ); game.combat.closeAction(msg.data.uniqId);
} else if (msg.name == 'msg_request_defense') { } else if (msg.name == 'msg_request_defense') {
SoSUtility.applyDamage( msg.data ); SoSUtility.applyDamage(msg.data);
} else if (msg.name == 'msg_reaction_cover') { } else if (msg.name == 'msg_reaction_cover') {
SoSUtility.reactionCover( msg.data.uniqId ); SoSUtility.reactionCover(msg.data.uniqId);
} else if (msg.name == 'msg_reaction_melee') { } else if (msg.name == 'msg_reaction_melee') {
SoSUtility.reactionMelee( msg.data.uniqId ); SoSUtility.reactionMelee(msg.data.uniqId);
} else if (msg.name == 'msg_reaction_hit') { } else if (msg.name == 'msg_reaction_hit') {
SoSUtility.reactionHit( msg.data.uniqId ); SoSUtility.reactionHit(msg.data.uniqId);
} }
} }
/* -------------------------------------------- */
static data(it) {
if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
return it.data;
}
return it;
}
/* -------------------------------------------- */
static templateData(it) {
return SoSUtility.data(it)?.data ?? {}
}
/* -------------------------------------------- */ /* -------------------------------------------- */
static async loadCompendiumData(compendium) { static async loadCompendiumData(compendium) {
const pack = game.packs.get(compendium); const pack = game.packs.get(compendium);
@ -89,36 +85,19 @@ export class SoSUtility {
return competences; return competences;
} }
/* -------------------------------------------- */
/*static async loadCompendium(compendium, filter = item => true) {
let compendiumItems = await SoSUtility.loadCompendiumNames(compendium);
const pack = game.packs.get(compendium);
let list = [];
for (let compendiumItem of compendiumItems) {
await pack.getEntity(compendiumItem.id).then(it => {
const item = it.data;
if (filter(item)) {
list.push(item);
}
});
};
return list;
}*/
/* -------------------------------------------- */ /* -------------------------------------------- */
static updateCombat(combat, round, diff, id) { static updateCombat(combat, round, diff, id) {
combat.requestActions(); combat.requestActions();
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static async openDeclareActions( event) { static async openDeclareActions(event) {
event.preventDefault(); event.preventDefault();
let round = event.currentTarget.attributes['data-round'].value; let round = event.currentTarget.attributes['data-round'].value;
let combatantId = event.currentTarget.attributes['data-combatant-id'].value; let combatantId = event.currentTarget.attributes['data-combatant-id'].value;
let combatId = event.currentTarget.attributes['data-combat-id'].value; let combatId = event.currentTarget.attributes['data-combat-id'].value;
let uniqId = event.currentTarget.attributes['data-uniq-id'].value; let uniqId = event.currentTarget.attributes['data-uniq-id'].value;
let d = await SoSDialogCombatActions.create( combatId, combatantId, round, uniqId ); let d = await SoSDialogCombatActions.create(combatId, combatantId, round, uniqId);
d.render(true); d.render(true);
} }
@ -132,11 +111,11 @@ export class SoSUtility {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static computeEncumbrance( items) { static computeEncumbrance(items) {
let trappings = items.filter( item => item.type == 'gear' || item.type == 'armor' || item.type == 'weapon' ); let trappings = items.filter(item => item.type == 'gear' || item.type == 'armor' || item.type == 'weapon');
let sumEnc = 0; let sumEnc = 0;
for (let object of trappings) { for (let object of trappings) {
if ( (!object.data.worn) && (!object.data.neg) && (!object.data.software) && (!object.data.implant) && (!object.data.containerid || object.data.containerid == "") ) { if ((!object.system.worn) && (!object.system.neg) && (!object.system.software) && (!object.system.implant) && (!object.system.containerid || object.system.containerid == "")) {
sumEnc += (object.big > 0) ? object.big : 1; sumEnc += (object.big > 0) ? object.big : 1;
} }
} }
@ -147,46 +126,47 @@ export class SoSUtility {
static closeAction(event) { static closeAction(event) {
let uniqId = event.currentTarget.attributes['data-uniq-id'].value; let uniqId = event.currentTarget.attributes['data-uniq-id'].value;
if ( game.user.isGM ) { if (game.user.isGM) {
game.combat.closeAction( uniqId ); game.combat.closeAction(uniqId);
} else { } else {
game.socket.emit("system.foundryvtt-shadows-over-sol", { game.socket.emit("system.foundryvtt-shadows-over-sol", {
name: "msg_close_action", data: { uniqId: uniqId} } ); name: "msg_close_action", data: { uniqId: uniqId }
});
} }
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static async registerChatCallbacks(html) { static async registerChatCallbacks(html) {
html.on("click", '#button-declare-actions', event => { html.on("click", '#button-declare-actions', event => {
SoSUtility.openDeclareActions( event ); SoSUtility.openDeclareActions(event);
}); });
html.on("click", '#button-end-action', event => { html.on("click", '#button-end-action', event => {
SoSUtility.closeAction( event ); SoSUtility.closeAction(event);
}); });
html.on("click", '#button-reaction-cover', event => { html.on("click", '#button-reaction-cover', event => {
let uniqId = event.currentTarget.attributes['data-uniq-id'].value; let uniqId = event.currentTarget.attributes['data-uniq-id'].value;
if ( game.user.isGM ) { if (game.user.isGM) {
SoSUtility.reactionCover( uniqId ); SoSUtility.reactionCover(uniqId);
} else { } else {
game.socket.emit("system.foundryvtt-shadows-over-sol", { name: "msg_reaction_cover", data: { uniqId: uniqId} } ); game.socket.emit("system.foundryvtt-shadows-over-sol", { name: "msg_reaction_cover", data: { uniqId: uniqId } });
} }
}); });
html.on("click", '#button-reaction-melee', event => { html.on("click", '#button-reaction-melee', event => {
let uniqId = event.currentTarget.attributes['data-uniq-id'].value; let uniqId = event.currentTarget.attributes['data-uniq-id'].value;
if ( game.user.isGM ) { if (game.user.isGM) {
SoSUtility.reactionMelee( uniqId ); SoSUtility.reactionMelee(uniqId);
} else { } else {
game.socket.emit("system.foundryvtt-shadows-over-sol", { name: "msg_reaction_melee", data: { uniqId: uniqId} } ); game.socket.emit("system.foundryvtt-shadows-over-sol", { name: "msg_reaction_melee", data: { uniqId: uniqId } });
} }
}); });
html.on("click", '#button-reaction-hit', event => { html.on("click", '#button-reaction-hit', event => {
let uniqId = event.currentTarget.attributes['data-uniq-id'].value; let uniqId = event.currentTarget.attributes['data-uniq-id'].value;
if ( game.user.isGM ) { if (game.user.isGM) {
SoSUtility.reactionHit( uniqId ); SoSUtility.reactionHit(uniqId);
} else { } else {
game.socket.emit("system.foundryvtt-shadows-over-sol", { name: "msg_reaction_hit", data: { uniqId: uniqId} } ); game.socket.emit("system.foundryvtt-shadows-over-sol", { name: "msg_reaction_hit", data: { uniqId: uniqId } });
} }
}); });
} }
@ -202,46 +182,46 @@ export class SoSUtility {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static increaseConsequenceSeverity( severity ) { static increaseConsequenceSeverity(severity) {
if ( severity == 'none') return 'light'; if (severity == 'none') return 'light';
if ( severity == 'light') return 'moderate'; if (severity == 'light') return 'moderate';
if ( severity == 'moderate') return 'severe'; if (severity == 'moderate') return 'severe';
if ( severity == 'severe') return 'critical'; if (severity == 'severe') return 'critical';
return 'critical'; return 'critical';
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static getConsequenceSeverityLevel( severity) { static getConsequenceSeverityLevel(severity) {
if ( severity == 'none') return 0; if (severity == 'none') return 0;
if ( severity == 'light') return 1; if (severity == 'light') return 1;
if ( severity == 'moderate') return 2; if (severity == 'moderate') return 2;
if ( severity == 'severe') return 3; if (severity == 'severe') return 3;
if ( severity == 'critical') return 4; if (severity == 'critical') return 4;
return 0; return 0;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static increaseSeverity( severity ) { static increaseSeverity(severity) {
if ( severity == 'L') return 'M'; if (severity == 'L') return 'M';
if ( severity == 'M') return 'S'; if (severity == 'M') return 'S';
if ( severity == 'S') return 'C'; if (severity == 'S') return 'C';
if ( severity == 'C') return 'F'; if (severity == 'C') return 'F';
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static decreaseSeverity( severity ) { static decreaseSeverity(severity) {
if ( severity == 'C') return 'S'; if (severity == 'C') return 'S';
if ( severity == 'S') return 'M'; if (severity == 'S') return 'M';
if ( severity == 'M') return 'L'; if (severity == 'M') return 'L';
if ( severity == 'L') return 'N'; if (severity == 'L') return 'N';
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static getSeverityLevel( severity) { static getSeverityLevel(severity) {
if ( severity == 'C') return 4; if (severity == 'C') return 4;
if ( severity == 'S') return 3; if (severity == 'S') return 3;
if ( severity == 'M') return 2; if (severity == 'M') return 2;
if ( severity == 'L') return 1; if (severity == 'L') return 1;
return 0; return 0;
} }
@ -252,70 +232,70 @@ export class SoSUtility {
let msgTxt = "<p>Are you sure to delete this item ?"; let msgTxt = "<p>Are you sure to delete this item ?";
let buttons = { let buttons = {
delete: { delete: {
icon: '<i class="fas fa-check"></i>', icon: '<i class="fas fa-check"></i>',
label: "Yes, delete it", label: "Yes, delete it",
callback: () => { callback: () => {
console.log("Delete : ", itemId); console.log("Delete : ", itemId);
actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]); actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
li.slideUp(200, () => actorSheet.render(false)); li.slideUp(200, () => actorSheet.render(false));
}
},
cancel: {
icon: '<i class="fas fa-times"></i>',
label: "Cancel"
} }
},
cancel: {
icon: '<i class="fas fa-times"></i>',
label: "Cancel"
} }
msgTxt += "</p>";
let d = new Dialog({
title: "Confirm deletion",
content: msgTxt,
buttons: buttons,
default: "cancel"
});
d.render(true);
} }
msgTxt += "</p>";
let d = new Dialog({
title: "Confirm deletion",
content: msgTxt,
buttons: buttons,
default: "cancel"
});
d.render(true);
}
/* -------------------------------------------- */ /* -------------------------------------------- */
static async applyDamage( flipData ) { static async applyDamage(flipData) {
if (!this.registry) this.registry = {}; if (!this.registry) this.registry = {};
if ( flipData.isReaction) { // Check again resut in case of reaction ! if (flipData.isReaction) { // Check again resut in case of reaction !
flipData.magnitude = flipData.finalScore - flipData.tn; // Update magnitude flipData.magnitude = flipData.finalScore - flipData.tn; // Update magnitude
if ( flipData.magnitude < 0 ) { if (flipData.magnitude < 0) {
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-reaction-result.html', flipData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-reaction-result.html', flipData);
ChatMessage.create( { content: html }); ChatMessage.create({ content: html });
return; return;
} }
} }
// DR management // DR management
let armor = flipData.target.actor.data.items.find( item => item.type == 'armor' && item.data.worn); let armor = flipData.target.actor.system.items.find(item => item.type == 'armor' && item.system.worn);
flipData.armorDR = armor ? armor.data.dr : 0; flipData.armorDR = armor ? armor.system.dr : 0;
flipData.armorGel = armor ?armor.data.gel : 0; flipData.armorGel = armor ? armor.system.gel : 0;
flipData.armorReflect = armor ? armor.data.reflect : 0; flipData.armorReflect = armor ? armor.system.reflect : 0;
let dr = flipData.target.actor.data.data.scores.dr.value + flipData.armorDR; let dr = flipData.target.actor.system.scores.dr.value + flipData.armorDR;
if (flipData.weapon.data.category == 'ballistic') { if (flipData.weapon.system.category == 'ballistic') {
dr += flipData.armorGel; dr += flipData.armorGel;
} }
if (flipData.weapon.data.category == 'laser') { if (flipData.weapon.system.category == 'laser') {
dr += flipData.armorReflect; dr += flipData.armorReflect;
} }
let shock = flipData.target.actor.data.data.scores.shock.value || 1; let shock = flipData.target.actor.system.scores.shock.value || 1;
let defenseCritical = flipData.target.actor.data.data.scores.defense.critical; let defenseCritical = flipData.target.actor.system.scores.defense.critical;
flipData.damageStatus = 'apply_damage'; flipData.damageStatus = 'apply_damage';
flipData.targetShock = shock; flipData.targetShock = shock;
flipData.targetDR = dr; flipData.targetDR = dr;
flipData.targetCritical = defenseCritical; flipData.targetCritical = defenseCritical;
// DR management // DR management
if ( flipData.damageValue < dr) { if (flipData.damageValue < dr) {
if (flipData.damageValue < dr / 2) { if (flipData.damageValue < dr / 2) {
flipData.damageStatus = "no_damage"; flipData.damageStatus = "no_damage";
flipData.damageReason = "Damage are lesser than DR/2"; flipData.damageReason = "Damage are lesser than DR/2";
} else { } else {
flipData.damageSeverity = this.decreaseSeverity(flipData.damageSeverity ); flipData.damageSeverity = this.decreaseSeverity(flipData.damageSeverity);
if ( flipData.damageSeverity == 'N') { if (flipData.damageSeverity == 'N') {
flipData.damageStatus = "no_damage"; flipData.damageStatus = "no_damage";
flipData.damageReason = "Severity decreased to nothing"; flipData.damageReason = "Severity decreased to nothing";
} }
@ -325,99 +305,100 @@ export class SoSUtility {
// Shock management // Shock management
flipData.woundsList = []; flipData.woundsList = [];
flipData.nbStun = 0; flipData.nbStun = 0;
if ( flipData.weapon.stun ) { // Stun weapon case if (flipData.weapon.stun) { // Stun weapon case
if ( flipData.damageValue >= shock ) { if (flipData.damageValue >= shock) {
flipData.nbStun = Math.floor(flipData.damageValue / shock); flipData.nbStun = Math.floor(flipData.damageValue / shock);
} }
} else { } else {
if ( flipData.damageValue >= shock ) { if (flipData.damageValue >= shock) {
let incSeverity = Math.floor(flipData.damageValue / shock); let incSeverity = Math.floor(flipData.damageValue / shock);
for (let i=0; i<incSeverity; i++) { for (let i = 0; i < incSeverity; i++) {
if ( flipData.damageSeverity == 'C') { if (flipData.damageSeverity == 'C') {
flipData.woundsList.push( flipData.damageSeverity ); flipData.woundsList.push(flipData.damageSeverity);
flipData.damageSeverity = 'L'; flipData.damageSeverity = 'L';
} else { } else {
flipData.nbStun++; flipData.nbStun++;
flipData.damageSeverity = this.increaseSeverity( flipData.damageSeverity ); flipData.damageSeverity = this.increaseSeverity(flipData.damageSeverity);
flipData.damageReason = "Severity increased"; flipData.damageReason = "Severity increased";
} }
} }
} }
} }
flipData.woundsList.push( flipData.damageSeverity ); flipData.woundsList.push(flipData.damageSeverity);
flipData.nbWounds = flipData.woundsList.length; flipData.nbWounds = flipData.woundsList.length;
// Critical management // Critical management
flipData.isCritical = ( flipData.cardTotal >= defenseCritical); flipData.isCritical = (flipData.cardTotal >= defenseCritical);
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-target.html', flipData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-target.html', flipData);
ChatMessage.create( { content: html }); ChatMessage.create({ content: html });
// Is target able to dodge ?? // Is target able to dodge ??
let defender = game.actors.get( flipData.target.actor._id); let defender = game.actors.get(flipData.target.actor._id);
flipData.coverConsequence = defender.data.items.find( item => item.type == 'consequence' && item.name == 'Cover'); flipData.coverConsequence = defender.items.find(item => item.type == 'consequence' && item.name == 'Cover');
flipData.APavailable = game.combat.getAPFromActor( defender.data._id ); flipData.APavailable = game.combat.getAPFromActor(defender._id);
console.log("FLIPDATE : ", flipData); console.log("FLIPDATE : ", flipData);
if ( !flipData.isReaction && flipData.APavailable > 0) { if (!flipData.isReaction && flipData.APavailable > 0) {
if ( (flipData.weapon.data.category == 'melee' ) || ( (flipData.weapon.data.category == 'laser' || flipData.weapon.data.category == 'ballistic') && if ((flipData.weapon.system.category == 'melee') || ((flipData.weapon.system.category == 'laser' || flipData.weapon.system.category == 'ballistic') &&
flipData.coverConsequence.data.severity != 'none') ) { flipData.coverConsequence.system.severity != 'none')) {
flipData.coverSeverityLevel = this.getConsequenceSeverityLevel( flipData.coverConsequence.data.severity ) * 2; flipData.coverSeverityLevel = this.getConsequenceSeverityLevel(flipData.coverConsequence.system.severity) * 2;
flipData.coverSeverityFlag = (flipData.coverSeverityLevel > 0); flipData.coverSeverityFlag = (flipData.coverSeverityLevel > 0);
flipData.isMelee = (flipData.weapon.data.category == 'melee' ); flipData.isMelee = (flipData.weapon.system.category == 'melee');
let melee = defender.data.items.find( item => item.type == 'skill' && item.name == 'Melee'); let melee = defender.items.find(item => item.type == 'skill' && item.name == 'Melee');
flipData.defenderMelee = melee.data.value; flipData.defenderMelee = melee.system.value;
flipData.uniqId = randomID(16); flipData.uniqId = foundry.utils.randomID(16);
this.registry[flipData.uniqId] = flipData; this.registry[flipData.uniqId] = flipData;
let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-request-dodge.html', flipData ); let html = await renderTemplate('systems/foundryvtt-shadows-over-sol/templates/chat-damage-request-dodge.html', flipData);
ChatMessage.create( { content: html, whisper: ChatMessage.getWhisperRecipients(flipData.target.actor.name).concat(ChatMessage.getWhisperRecipients("GM")) } ); ChatMessage.create({ content: html, whisper: ChatMessage.getWhisperRecipients(flipData.target.actor.name).concat(ChatMessage.getWhisperRecipients("GM")) });
return; // Wait message response return; // Wait message response
} }
} }
flipData.isReaction = false; flipData.isReaction = false;
this.takeWounds( flipData); this.takeWounds(flipData);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static reactionCover( uniqId) { static reactionCover(uniqId) {
let flipData = this.registry[uniqId]; let flipData = this.registry[uniqId];
flipData.tn += flipData.coverSeverityLevel; flipData.tn += flipData.coverSeverityLevel;
flipData.isReaction = true; flipData.isReaction = true;
game.combat.decreaseAPFromActor( flipData.target.actor._id ); game.combat.decreaseAPFromActor(flipData.target.actor._id);
SoSUtility.applyDamage( flipData); SoSUtility.applyDamage(flipData);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static reactionMelee( uniqId) { static reactionMelee(uniqId) {
let flipData = this.registry[uniqId]; let flipData = this.registry[uniqId];
flipData.tn += flipData.defenderMelee; flipData.tn += flipData.defenderMelee;
flipData.isReaction = true; flipData.isReaction = true;
game.combat.decreaseAPFromActor( flipData.target.actor._id ); game.combat.decreaseAPFromActor(flipData.target.actor._id);
SoSUtility.applyDamage( flipData); SoSUtility.applyDamage(flipData);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static reactionHit( uniqId) { static reactionHit(uniqId) {
let flipData = this.registry[uniqId]; let flipData = this.registry[uniqId];
flipData.isReaction = true; flipData.isReaction = true;
SoSUtility.takeWounds( flipData); SoSUtility.takeWounds(flipData);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static takeWounds( flipData ) { static takeWounds(flipData) {
let defender = game.actors.get( flipData.target.actor._id); let defender = game.actors.get(flipData.target.actor._id);
defender.applyWounds( flipData ); defender.applyWounds(flipData);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static async processItemDropEvent(actorSheet, event) { static async processItemDropEvent(actorSheet, event) {
let dragData = JSON.parse(event.dataTransfer.getData("text/plain")); let dragData = JSON.parse(event.dataTransfer.getData("text/plain"));
let dropID = $(event.target).parents(".item").attr("data-item-id"); // Only relevant if container drop const item = fromUuidSync(dragData.uuid)
let objectID = dragData.id || dragData.data._id; let dropId = $(event.target).parents(".item").attr("data-item-id"); // Only relevant if container drop
//console.log("drag/drop", dragData, actorSheet.actor._id, dropID, objectID); let objectId = item.id
if (dragData.type == 'Item' && dropID) { console.log("ID", dragData, dropId, objectId)
actorSheet.actor.addObjectToContainer(objectID, dropID ); if (dragData.type == 'Item' && dropId) {
actorSheet.actor.addObjectToContainer(objectId, dropId);
} }
return true; return true
} }
} }

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000007

View File

13
packs/combat-actions/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.244518 7f20a6a006c0 Recovering log #6
2024/05/31-12:37:50.292179 7f20a6a006c0 Delete type=0 #6
2024/05/31-12:37:50.292229 7f20a6a006c0 Delete type=3 #4
2024/05/31-12:57:42.325821 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.325873 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.332227 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.355930 7f20a5a006c0 Manual compaction at level-0 from '!items!06L0cwm4CIuCFetU' @ 72057594037927935 : 1 .. '!items!uSQw858IiBrWkeSj' @ 0 : 0; will stop at '!items!uSQw858IiBrWkeSj' @ 20 : 1
2024/05/31-12:57:42.355939 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.359540 7f20a5a006c0 Generated table #11@0: 20 keys, 15155 bytes
2024/05/31-12:57:42.359578 7f20a5a006c0 Compacted 1@0 + 0@1 files => 15155 bytes
2024/05/31-12:57:42.365779 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.365873 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.386374 7f20a5a006c0 Manual compaction at level-0 from '!items!uSQw858IiBrWkeSj' @ 20 : 1 .. '!items!uSQw858IiBrWkeSj' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,5 @@
2024/05/31-12:37:00.345049 7f04c4c006c0 Recovering log #3
2024/05/31-12:37:00.345498 7f04c4c006c0 Level-0 table #5: started
2024/05/31-12:37:00.358604 7f04c4c006c0 Level-0 table #5: 22912 bytes OK
2024/05/31-12:37:00.406080 7f04c4c006c0 Delete type=0 #3
2024/05/31-12:37:00.406202 7f04c4c006c0 Delete type=3 #2

Binary file not shown.

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/consequences/LOCK Normal file
View File

13
packs/consequences/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:49.951711 7f20a74006c0 Recovering log #6
2024/05/31-12:37:50.022164 7f20a74006c0 Delete type=0 #6
2024/05/31-12:37:50.022219 7f20a74006c0 Delete type=3 #4
2024/05/31-12:57:42.253682 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.253739 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.260074 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.279344 7f20a5a006c0 Manual compaction at level-0 from '!items!3GB0NAetYAVHIzmu' @ 72057594037927935 : 1 .. '!items!vHcRT3kQVWPHSz38' @ 0 : 0; will stop at '!items!vHcRT3kQVWPHSz38' @ 13 : 1
2024/05/31-12:57:42.279371 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.282723 7f20a5a006c0 Generated table #11@0: 13 keys, 7666 bytes
2024/05/31-12:57:42.282737 7f20a5a006c0 Compacted 1@0 + 0@1 files => 7666 bytes
2024/05/31-12:57:42.288596 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.288688 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.318921 7f20a5a006c0 Manual compaction at level-0 from '!items!vHcRT3kQVWPHSz38' @ 13 : 1 .. '!items!vHcRT3kQVWPHSz38' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,5 @@
2024/05/31-12:36:59.630199 7f04bf4006c0 Recovering log #3
2024/05/31-12:36:59.631365 7f04bf4006c0 Level-0 table #5: started
2024/05/31-12:36:59.641960 7f04bf4006c0 Level-0 table #5: 10948 bytes OK
2024/05/31-12:36:59.690838 7f04bf4006c0 Delete type=0 #3
2024/05/31-12:36:59.690928 7f04bf4006c0 Delete type=3 #2

Binary file not shown.

0
packs/gears/000009.log Normal file
View File

BIN
packs/gears/000011.ldb Normal file

Binary file not shown.

1
packs/gears/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/gears/LOCK Normal file
View File

13
packs/gears/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.024957 7f20a6a006c0 Recovering log #6
2024/05/31-12:37:50.068244 7f20a6a006c0 Delete type=0 #6
2024/05/31-12:37:50.068393 7f20a6a006c0 Delete type=3 #4
2024/05/31-12:57:42.272250 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.272277 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.279124 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.308486 7f20a5a006c0 Manual compaction at level-0 from '!items!1Gj3ATIVykyAQ5fD' @ 72057594037927935 : 1 .. '!items!zMiaz2HLsddO22H3' @ 0 : 0; will stop at '!items!zMiaz2HLsddO22H3' @ 99 : 1
2024/05/31-12:57:42.308494 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.312365 7f20a5a006c0 Generated table #11@0: 99 keys, 58930 bytes
2024/05/31-12:57:42.312382 7f20a5a006c0 Compacted 1@0 + 0@1 files => 58930 bytes
2024/05/31-12:57:42.318551 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.318708 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.318989 7f20a5a006c0 Manual compaction at level-0 from '!items!zMiaz2HLsddO22H3' @ 99 : 1 .. '!items!zMiaz2HLsddO22H3' @ 0 : 0; will stop at (end)

5
packs/gears/LOG.old Normal file
View File

@ -0,0 +1,5 @@
2024/05/31-12:36:59.694104 7f04c4c006c0 Recovering log #3
2024/05/31-12:36:59.695341 7f04c4c006c0 Level-0 table #5: started
2024/05/31-12:37:00.103755 7f04c4c006c0 Level-0 table #5: 87512 bytes OK
2024/05/31-12:37:00.158532 7f04c4c006c0 Delete type=0 #3
2024/05/31-12:37:00.158786 7f04c4c006c0 Delete type=3 #2

BIN
packs/gears/MANIFEST-000007 Normal file

Binary file not shown.

View File

BIN
packs/genelines/000011.ldb Normal file

Binary file not shown.

1
packs/genelines/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/genelines/LOCK Normal file
View File

13
packs/genelines/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.295525 7f20a7e006c0 Recovering log #6
2024/05/31-12:37:50.344755 7f20a7e006c0 Delete type=0 #6
2024/05/31-12:37:50.344847 7f20a7e006c0 Delete type=3 #4
2024/05/31-12:57:42.332388 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.332415 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.338850 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.365997 7f20a5a006c0 Manual compaction at level-0 from '!items!3o49zG4Xtc1I29j2' @ 72057594037927935 : 1 .. '!items!vDOAmovqE53dQzlh' @ 0 : 0; will stop at '!items!vDOAmovqE53dQzlh' @ 8 : 1
2024/05/31-12:57:42.366005 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.369253 7f20a5a006c0 Generated table #11@0: 8 keys, 7865 bytes
2024/05/31-12:57:42.369293 7f20a5a006c0 Compacted 1@0 + 0@1 files => 7865 bytes
2024/05/31-12:57:42.376725 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.376841 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.386385 7f20a5a006c0 Manual compaction at level-0 from '!items!vDOAmovqE53dQzlh' @ 8 : 1 .. '!items!vDOAmovqE53dQzlh' @ 0 : 0; will stop at (end)

5
packs/genelines/LOG.old Normal file
View File

@ -0,0 +1,5 @@
2024/05/31-12:37:00.409789 7f04bfe006c0 Recovering log #3
2024/05/31-12:37:00.410672 7f04bfe006c0 Level-0 table #5: started
2024/05/31-12:37:00.432255 7f04bfe006c0 Level-0 table #5: 11820 bytes OK
2024/05/31-12:37:00.469946 7f04bfe006c0 Delete type=0 #3
2024/05/31-12:37:00.470035 7f04bfe006c0 Delete type=3 #2

Binary file not shown.

View File

BIN
packs/injuries/000011.ldb Normal file

Binary file not shown.

1
packs/injuries/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/injuries/LOCK Normal file
View File

13
packs/injuries/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.071905 7f20a7e006c0 Recovering log #6
2024/05/31-12:37:50.130041 7f20a7e006c0 Delete type=0 #6
2024/05/31-12:37:50.130137 7f20a7e006c0 Delete type=3 #4
2024/05/31-12:57:42.260202 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.260227 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.266171 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.288778 7f20a5a006c0 Manual compaction at level-0 from '!items!2ZUnK7mjIeizobUM' @ 72057594037927935 : 1 .. '!items!xZL7aO0xOOZvB2cs' @ 0 : 0; will stop at '!items!xZL7aO0xOOZvB2cs' @ 53 : 1
2024/05/31-12:57:42.288786 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.292530 7f20a5a006c0 Generated table #11@0: 53 keys, 14817 bytes
2024/05/31-12:57:42.292553 7f20a5a006c0 Compacted 1@0 + 0@1 files => 14817 bytes
2024/05/31-12:57:42.298878 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.298975 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.318947 7f20a5a006c0 Manual compaction at level-0 from '!items!xZL7aO0xOOZvB2cs' @ 53 : 1 .. '!items!xZL7aO0xOOZvB2cs' @ 0 : 0; will stop at (end)

5
packs/injuries/LOG.old Normal file
View File

@ -0,0 +1,5 @@
2024/05/31-12:37:00.162792 7f04c56006c0 Recovering log #3
2024/05/31-12:37:00.163468 7f04c56006c0 Level-0 table #5: started
2024/05/31-12:37:00.172845 7f04c56006c0 Level-0 table #5: 21537 bytes OK
2024/05/31-12:37:00.220464 7f04c56006c0 Delete type=0 #3
2024/05/31-12:37:00.220541 7f04c56006c0 Delete type=3 #2

Binary file not shown.

View File

BIN
packs/languages/000011.ldb Normal file

Binary file not shown.

1
packs/languages/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/languages/LOCK Normal file
View File

13
packs/languages/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.189585 7f20a74006c0 Recovering log #6
2024/05/31-12:37:50.241798 7f20a74006c0 Delete type=0 #6
2024/05/31-12:37:50.241887 7f20a74006c0 Delete type=3 #4
2024/05/31-12:57:42.339058 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.339101 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.345459 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.376981 7f20a5a006c0 Manual compaction at level-0 from '!items!0OaXJm1iih3gYI6P' @ 72057594037927935 : 1 .. '!items!xbpEhhdqx4o5KUJA' @ 0 : 0; will stop at '!items!xbpEhhdqx4o5KUJA' @ 15 : 1
2024/05/31-12:57:42.376991 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.380150 7f20a5a006c0 Generated table #11@0: 15 keys, 1725 bytes
2024/05/31-12:57:42.380181 7f20a5a006c0 Compacted 1@0 + 0@1 files => 1725 bytes
2024/05/31-12:57:42.386148 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.386245 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.386396 7f20a5a006c0 Manual compaction at level-0 from '!items!xbpEhhdqx4o5KUJA' @ 15 : 1 .. '!items!xbpEhhdqx4o5KUJA' @ 0 : 0; will stop at (end)

5
packs/languages/LOG.old Normal file
View File

@ -0,0 +1,5 @@
2024/05/31-12:37:00.283664 7f04bf4006c0 Recovering log #3
2024/05/31-12:37:00.285227 7f04bf4006c0 Level-0 table #5: started
2024/05/31-12:37:00.295941 7f04bf4006c0 Level-0 table #5: 2524 bytes OK
2024/05/31-12:37:00.342228 7f04bf4006c0 Delete type=0 #3
2024/05/31-12:37:00.342291 7f04bf4006c0 Delete type=3 #2

Binary file not shown.

0
packs/skills/000009.log Normal file
View File

BIN
packs/skills/000011.ldb Normal file

Binary file not shown.

1
packs/skills/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/skills/LOCK Normal file
View File

13
packs/skills/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:49.885012 7f20acc006c0 Recovering log #6
2024/05/31-12:37:49.948288 7f20acc006c0 Delete type=0 #6
2024/05/31-12:37:49.948350 7f20acc006c0 Delete type=3 #4
2024/05/31-12:57:42.266276 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.266304 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.272138 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.299102 7f20a5a006c0 Manual compaction at level-0 from '!items!0xlCQMyGIQJWPBM1' @ 72057594037927935 : 1 .. '!items!ukWyqxOnKGRp7Owm' @ 0 : 0; will stop at '!items!ukWyqxOnKGRp7Owm' @ 25 : 1
2024/05/31-12:57:42.299113 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.302367 7f20a5a006c0 Generated table #11@0: 25 keys, 11402 bytes
2024/05/31-12:57:42.302389 7f20a5a006c0 Compacted 1@0 + 0@1 files => 11402 bytes
2024/05/31-12:57:42.308292 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.308373 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.318969 7f20a5a006c0 Manual compaction at level-0 from '!items!ukWyqxOnKGRp7Owm' @ 25 : 1 .. '!items!ukWyqxOnKGRp7Owm' @ 0 : 0; will stop at (end)

5
packs/skills/LOG.old Normal file
View File

@ -0,0 +1,5 @@
2024/05/31-12:36:59.552707 7f04bfe006c0 Recovering log #3
2024/05/31-12:36:59.558358 7f04bfe006c0 Level-0 table #5: started
2024/05/31-12:36:59.579826 7f04bfe006c0 Level-0 table #5: 15330 bytes OK
2024/05/31-12:36:59.626405 7f04bfe006c0 Delete type=0 #3
2024/05/31-12:36:59.626466 7f04bfe006c0 Delete type=3 #2

Binary file not shown.

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/subcultures/LOCK Normal file
View File

13
packs/subcultures/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.347603 7f20acc006c0 Recovering log #6
2024/05/31-12:37:50.403306 7f20acc006c0 Delete type=0 #6
2024/05/31-12:37:50.403397 7f20acc006c0 Delete type=3 #4
2024/05/31-12:57:42.397507 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.397541 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.403638 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.419891 7f20a5a006c0 Manual compaction at level-0 from '!items!0xmW2R5sieo5k4d9' @ 72057594037927935 : 1 .. '!items!xaHXF4xCPb598RYA' @ 0 : 0; will stop at '!items!xaHXF4xCPb598RYA' @ 8 : 1
2024/05/31-12:57:42.419910 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.423850 7f20a5a006c0 Generated table #11@0: 8 keys, 4158 bytes
2024/05/31-12:57:42.423886 7f20a5a006c0 Compacted 1@0 + 0@1 files => 4158 bytes
2024/05/31-12:57:42.430495 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.430590 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.436970 7f20a5a006c0 Manual compaction at level-0 from '!items!xaHXF4xCPb598RYA' @ 8 : 1 .. '!items!xaHXF4xCPb598RYA' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,5 @@
2024/05/31-12:37:00.473437 7f04bf4006c0 Recovering log #3
2024/05/31-12:37:00.473817 7f04bf4006c0 Level-0 table #5: started
2024/05/31-12:37:00.494156 7f04bf4006c0 Level-0 table #5: 6179 bytes OK
2024/05/31-12:37:00.530987 7f04bf4006c0 Delete type=0 #3
2024/05/31-12:37:00.531064 7f04bf4006c0 Delete type=3 #2

Binary file not shown.

View File

BIN
packs/weaknesses/000011.ldb Normal file

Binary file not shown.

1
packs/weaknesses/CURRENT Normal file
View File

@ -0,0 +1 @@
MANIFEST-000007

0
packs/weaknesses/LOCK Normal file
View File

13
packs/weaknesses/LOG Normal file
View File

@ -0,0 +1,13 @@
2024/05/31-12:37:50.133633 7f20acc006c0 Recovering log #6
2024/05/31-12:37:50.185827 7f20acc006c0 Delete type=0 #6
2024/05/31-12:37:50.185917 7f20acc006c0 Delete type=3 #4
2024/05/31-12:57:42.319061 7f20a5a006c0 Level-0 table #10: started
2024/05/31-12:57:42.319098 7f20a5a006c0 Level-0 table #10: 0 bytes OK
2024/05/31-12:57:42.325607 7f20a5a006c0 Delete type=0 #8
2024/05/31-12:57:42.345684 7f20a5a006c0 Manual compaction at level-0 from '!items!FxCIbJm3T44kC0sG' @ 72057594037927935 : 1 .. '!items!VDYXsT8AZ6krv93p' @ 0 : 0; will stop at '!items!VDYXsT8AZ6krv93p' @ 4 : 1
2024/05/31-12:57:42.345699 7f20a5a006c0 Compacting 1@0 + 0@1 files
2024/05/31-12:57:42.349053 7f20a5a006c0 Generated table #11@0: 4 keys, 837 bytes
2024/05/31-12:57:42.349088 7f20a5a006c0 Compacted 1@0 + 0@1 files => 837 bytes
2024/05/31-12:57:42.355720 7f20a5a006c0 compacted to: files[ 0 1 0 0 0 0 0 ]
2024/05/31-12:57:42.355816 7f20a5a006c0 Delete type=2 #5
2024/05/31-12:57:42.386362 7f20a5a006c0 Manual compaction at level-0 from '!items!VDYXsT8AZ6krv93p' @ 4 : 1 .. '!items!VDYXsT8AZ6krv93p' @ 0 : 0; will stop at (end)

5
packs/weaknesses/LOG.old Normal file
View File

@ -0,0 +1,5 @@
2024/05/31-12:37:00.223304 7f04bfe006c0 Recovering log #3
2024/05/31-12:37:00.223338 7f04bfe006c0 Level-0 table #5: started
2024/05/31-12:37:00.234424 7f04bfe006c0 Level-0 table #5: 965 bytes OK
2024/05/31-12:37:00.281050 7f04bfe006c0 Delete type=0 #3
2024/05/31-12:37:00.281171 7f04bfe006c0 Delete type=3 #2

Binary file not shown.

View File

@ -1,16 +1,14 @@
{ {
"name": "foundryvtt-shadows-over-sol", "id": "foundryvtt-shadows-over-sol",
"title": "Shadows over Sol", "title": "Shadows over Sol",
"description": "Shadows over Sol for FoundryVTT", "description": "Shadows over Sol for FoundryVTT",
"author": "LeRatierBretonnien",
"authors": [],
"url": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/", "url": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/",
"license": "LICENSE.txt", "license": "LICENSE.txt",
"flags": {}, "version": "12.0.0",
"version": "2.0.6", "compatibility": {
"minimumCoreVersion": "0.8.0", "minimum": "11",
"compatibleCoreVersion": "9", "verified": "12"
"scripts": [], },
"esmodules": [ "esmodules": [
"module/sos-main.js" "module/sos-main.js"
], ],
@ -21,89 +19,98 @@
{ {
"lang": "en", "lang": "en",
"name": "English", "name": "English",
"path": "lang/en.json" "path": "lang/en.json",
"flags": {}
} }
], ],
"packs": [ "packs": [
{ {
"name": "skills", "name": "skills",
"label": "Skills", "label": "Skills",
"path": "./packs/skills.db", "path": "packs/skills.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "consequences", "name": "consequences",
"label": "Consequences", "label": "Consequences",
"path": "./packs/consequences.db", "path": "packs/consequences.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "gears", "name": "gears",
"label": "Gears", "label": "Gears",
"path": "./packs/gears.db", "path": "packs/gears.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "injuries", "name": "injuries",
"label": "Injuries", "label": "Injuries",
"path": "./packs/injuries.db", "path": "packs/injuries.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "weaknesses", "name": "weaknesses",
"label": "Weaknesses", "label": "Weaknesses",
"path": "./packs/weaknesses.db", "path": "packs/weaknesses.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "languages", "name": "languages",
"label": "Languages", "label": "Languages",
"path": "./packs/languages.db", "path": "packs/languages.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "combat-actions", "name": "combat-actions",
"label": "Combat Actions", "label": "Combat Actions",
"path": "./packs/combat-actions.db", "path": "packs/combat-actions.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "genelines", "name": "genelines",
"label": "Genelines", "label": "Genelines",
"path": "./packs/genelines.db", "path": "packs/genelines.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
}, },
{ {
"name": "subcultures", "name": "subcultures",
"label": "Subcultures", "label": "Subcultures",
"path": "./packs/subcultures.db", "path": "packs/subcultures.db",
"type": "Item", "type": "Item",
"system": "foundryvtt-shadows-over-sol", "system": "foundryvtt-shadows-over-sol",
"private": false "private": false,
"flags": {}
} }
], ],
"system": [],
"dependencies": [],
"socket": true, "socket": true,
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/raw/branch/master/system.json", "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/raw/branch/v10/system.json",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/archive/foundryvtt-shadows-over-sol-2.0.6.zip", "download": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/archive/foundryvtt-shadows-over-sol-12.0.0.zip",
"protected": false, "grid": {
"gridDistance": 5, "distance": 5,
"gridUnits": "ft" "units": "ft"
}
} }

View File

@ -5,8 +5,8 @@
<header class="sheet-header"> <header class="sheet-header">
<div class="header-fields"> <div class="header-fields">
<div class="flexrow"> <div class="flexrow">
<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{data.name}}" /> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</div> </div>
</header> </header>
@ -37,23 +37,23 @@
<span class="stat-label flexrow tooltip tooltip-nobottom" name="statlabel">XP</span> <span class="stat-label flexrow tooltip tooltip-nobottom" name="statlabel">XP</span>
</li> </li>
{{#each data.data.stats as |stat key|}} {{#each data.stats as |stat key|}}
{{#if stat.isLevelUp}} {{#if stat.isLevelUp}}
<li class="stat flexrow xp-level-up" data-attribute="{{key}}"> <li class="stat flexrow xp-level-up" data-attribute="{{key}}">
<span class="stat-label flexrow tooltip tooltip-nobottom" name="data.stats.{{key}}.label"> <span class="stat-label flexrow tooltip tooltip-nobottom" name="system.stats.{{key}}.label">
<span class="tooltiptext ttt-xp"> <span class="tooltiptext ttt-xp">
{{localize 'STAT.levelUp'}} {{localize 'STAT.levelUp'}}
</span> </span>
{{else}} {{else}}
<li class="stat flexrow list-item" data-attribute="{{key}}"> <li class="stat flexrow list-item" data-attribute="{{key}}">
{{/if}} {{/if}}
<span class="stat-label flexrow tooltip tooltip-nobottom" name="data.stat.{{key}}.label"><a name={{key}}>{{localize stat.label}}</a></span> <span class="stat-label flexrow tooltip tooltip-nobottom" name="system.stat.{{key}}.label"><a name={{key}}>{{localize stat.label}}</a></span>
<select class="stat-value flexrow" type="text" name="data.stats.{{key}}.value" value="{{stat.value}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}}> <select class="stat-value flexrow" type="text" name="system.stats.{{key}}.value" value="{{stat.value}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}}>
{{#select stat.value}} {{#select stat.value}}
{{>"systems/foundryvtt-shadows-over-sol/templates/stat-option-list.html"}} {{>"systems/foundryvtt-shadows-over-sol/templates/stat-option-list.html"}}
{{/select}} {{/select}}
</select> </select>
<input class="stat-xp flexrow" type="text" name="data.stats.{{key}}.xp" value="{{stat.xp}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} /> <input class="stat-xp flexrow" type="text" name="system.stats.{{key}}.xp" value="{{stat.xp}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} />
<span class="flexrow"><img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/{{stat.cardsuit}}.webp" /></span> <span class="flexrow"><img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/{{stat.cardsuit}}.webp" /></span>
</li> </li>
{{/each}} {{/each}}
@ -66,14 +66,14 @@
<span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Value</span> <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Value</span>
<span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Bonus/Malus</span> <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Bonus/Malus</span>
</li> </li>
{{#each data.data.scores as |score key|}} {{#each data.scores as |score key|}}
<li class="stat flexrow list-item" data-attribute="{{key}}"> <li class="stat flexrow list-item" data-attribute="{{key}}">
<span class="generic-label flexrow tooltip tooltip-nobottom" name="data.scores.{{key}}.label">{{localize score.label}}</span> <span class="generic-label flexrow tooltip tooltip-nobottom" name="system.scores.{{key}}.label">{{localize score.label}}</span>
<input class="stat-value flexrow" type="text" name="data.scores.{{key}}.value" value="{{score.value}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} /> <input class="stat-value flexrow" type="text" name="system.scores.{{key}}.value" value="{{score.value}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} />
{{#if (eq key 'defense')}} {{#if (eq key 'defense')}}
<input class="stat-value flexrow" type="text" name="data.scores.{{key}}.critical" value="{{score.critical}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} /> <input class="stat-value flexrow" type="text" name="system.scores.{{key}}.critical" value="{{score.critical}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} />
{{/if}} {{/if}}
<input class="stat-value flexrow" type="text" name="data.scores.{{key}}.bonusmalus" value="{{score.bonusmalus}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} /> <input class="stat-value flexrow" type="text" name="system.scores.{{key}}.bonusmalus" value="{{score.bonusmalus}}" data-dtype="Number" {{#unless @root.editStatSkill}}disabled{{/unless}} />
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
@ -116,13 +116,13 @@
<div class="flex-group-left flexcol skill-column"> <div class="flex-group-left flexcol skill-column">
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
{{#each skill1 as |skill key|}} {{#each skill1 as |skill key|}}
{{#if skill.data.isLevelUp}} {{#if skill.system.isLevelUp}}
<li class="item flexrow xp-level-up" data-item-id="{{skill.id}}"> <li class="item flexrow xp-level-up" data-item-id="{{skill.id}}">
{{else}} {{else}}
<li class="item flexrow list-item" data-item-id="{{skill.id}}"> <li class="item flexrow list-item" data-item-id="{{skill.id}}">
{{/if}} {{/if}}
<img class="sheet-skill-img" src="{{skill.img}}"/> <img class="sheet-skill-img" src="{{skill.img}}"/>
{{#if skill.data.isLevelUp}} {{#if skill.system.isLevelUp}}
<span class="skill-label tooltip tooltip-nobottom"> <span class="skill-label tooltip tooltip-nobottom">
<span class="tooltiptext ttt-xp"> <span class="tooltiptext ttt-xp">
</span> </span>
@ -130,8 +130,8 @@
{{else}} {{else}}
<span class="skill-label"><a>{{skill.name}}</a></span> <span class="skill-label"><a>{{skill.name}}</a></span>
{{/if}} {{/if}}
<input class="skill-value" type="text" skillname="{{skill.name}}" value="{{numberFormat skill.data.data.value decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="skill-value" type="text" skillname="{{skill.name}}" value="{{numberFormat skill.system.value decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
<input class="skill-xp" type="text" skillname="{{skill.name}}" value="{{skill.data.data.xp}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="skill-xp" type="text" skillname="{{skill.name}}" value="{{skill.system.xp}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
<div class="item-controls"> <div class="item-controls">
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a> <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@ -144,13 +144,13 @@
<div class="flex-group-left flexcol skill-column"> <div class="flex-group-left flexcol skill-column">
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
{{#each skill2 as |skill key|}} {{#each skill2 as |skill key|}}
{{#if skill.data.isLevelUp}} {{#if skill.system.isLevelUp}}
<li class="item flexrow xp-level-up" data-item-id="{{skill.id}}"> <li class="item flexrow xp-level-up" data-item-id="{{skill.id}}">
{{else}} {{else}}
<li class="item flexrow list-item" data-item-id="{{skill.id}}"> <li class="item flexrow list-item" data-item-id="{{skill.id}}">
{{/if}} {{/if}}
<img class="sheet-skill-img" src="{{skill.img}}"/> <img class="sheet-skill-img" src="{{skill.img}}"/>
{{#if skill.data.isLevelUp}} {{#if skill.system.isLevelUp}}
<span class="skill-label tooltip tooltip-nobottom"> <span class="skill-label tooltip tooltip-nobottom">
<span class="tooltiptext ttt-xp"> <span class="tooltiptext ttt-xp">
</span> </span>
@ -158,8 +158,8 @@
{{else}} {{else}}
<span class="skill-label"><a>{{skill.name}}</a></span> <span class="skill-label"><a>{{skill.name}}</a></span>
{{/if}} {{/if}}
<input class="skill-value" type="text" skillname="{{skill.name}}" value="{{numberFormat skill.data.data.value decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="skill-value" type="text" skillname="{{skill.name}}" value="{{numberFormat skill.system.value decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
<input class="skill-xp" type="text" skillname="{{skill.name}}" value="{{skill.data.data.xp}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="skill-xp" type="text" skillname="{{skill.name}}" value="{{skill.system.xp}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
<div class="item-controls"> <div class="item-controls">
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a> <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@ -182,16 +182,16 @@
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
<li class="item flexrow list-item" data-wound-name="light"><h4>Wounds : </h4></li> <li class="item flexrow list-item" data-wound-name="light"><h4>Wounds : </h4></li>
<li class="item flexrow list-item" data-wound-name="light"><span class="skill-label">Light :</span> <li class="item flexrow list-item" data-wound-name="light"><span class="skill-label">Light :</span>
<input class="wound-value" type="text" woundname="light" value="{{numberFormat data.data.wounds.light decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="wound-value" type="text" woundname="light" value="{{numberFormat data.wounds.light decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
</li> </li>
<li class="item flexrow list-item" data-wound-name="moderate"><span class="skill-label">Moderate :</span> <li class="item flexrow list-item" data-wound-name="moderate"><span class="skill-label">Moderate :</span>
<input class="wound-value" type="text" woundname="moderate" value="{{numberFormat data.data.wounds.moderate decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="wound-value" type="text" woundname="moderate" value="{{numberFormat data.wounds.moderate decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
</li> </li>
<li class="item flexrow list-item" data-wound-name="severe"><span class="skill-label">Severe :</span> <li class="item flexrow list-item" data-wound-name="severe"><span class="skill-label">Severe :</span>
<input class="wound-value" type="text" woundname="severe" value="{{numberFormat data.data.wounds.severe decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="wound-value" type="text" woundname="severe" value="{{numberFormat data.wounds.severe decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
</li> </li>
<li class="item flexrow list-item" data-wound-name="critical"><span class="skill-label">Critical :</span> <li class="item flexrow list-item" data-wound-name="critical"><span class="skill-label">Critical :</span>
<input class="wound-value" type="text" woundname="critical" value="{{numberFormat data.data.wounds.critical decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/> <input class="wound-value" type="text" woundname="critical" value="{{numberFormat data.wounds.critical decimals=0}}" data-dtype="number" {{#unless @root.editStatSkill}}disabled{{/unless}}/>
</li> </li>
<li class="item flexrow list-item" data-wound-name="critical"><span class="skill-label">Total :</span> <li class="item flexrow list-item" data-wound-name="critical"><span class="skill-label">Total :</span>
<span class="skill-label">{{data.currentWounds}} / {{data.totalWounds}}</span> <span class="skill-label">{{data.currentWounds}} / {{data.totalWounds}}</span>
@ -204,8 +204,8 @@
<li class="item flexrow list-item" data-item-id="{{conseq.id}}"> <li class="item flexrow list-item" data-item-id="{{conseq.id}}">
<img class="sheet-skill-img" src="{{conseq.img}}"/> <img class="sheet-skill-img" src="{{conseq.img}}"/>
<span class="conseq-label">{{conseq.name}}</span> <span class="conseq-label">{{conseq.name}}</span>
<select class="consequence-severity" type="text" name="conseq.data.data.severity" value="{{conseq.data.data.severity}}" data-dtype="String"> <select class="consequence-severity" type="text" name="conseq.system.severity" value="{{conseq.system.severity}}" data-dtype="String">
{{#select conseq.data.data.severity}} {{#select conseq.system.severity}}
<option value="none">None</option> <option value="none">None</option>
<option value="light">Light</option> <option value="light">Light</option>
<option value="moderate">Moderate</option> <option value="moderate">Moderate</option>
@ -236,7 +236,7 @@
<img class="sheet-skill-img" src="{{weapon.img}}"/> <img class="sheet-skill-img" src="{{weapon.img}}"/>
<span class="weapon-label"><a>{{weapon.name}}</a></span> <span class="weapon-label"><a>{{weapon.name}}</a></span>
<div class="item-controls"> <div class="item-controls">
<a class="item-control item-equip" title="Equipped">{{#if weapon.data.data.equiped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a> <a class="item-control item-equip" title="Equipped">{{#if weapon.system.equiped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a> <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div> </div>
@ -248,9 +248,9 @@
{{#each armors as |armor key|}} {{#each armors as |armor key|}}
<li class="item flexrow list-item" data-item-id="{{armor.id}}"> <li class="item flexrow list-item" data-item-id="{{armor.id}}">
<img class="sheet-skill-img" src="{{armor.img}}"/> <img class="sheet-skill-img" src="{{armor.img}}"/>
<span class="armor-label">{{armor.data.name}}</span> <span class="armor-label">{{armor.name}}</span>
<div class="item-controls"> <div class="item-controls">
<a class="item-control item-worn" title="Worn">{{#if armor.data.data.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a> <a class="item-control item-worn" title="Worn">{{#if armor.system.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a> <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div> </div>
@ -262,9 +262,9 @@
{{#each gearsRoot as |gear key|}} {{#each gearsRoot as |gear key|}}
<li class="item flexrow list-item" data-item-id="{{gear.id}}"> <li class="item flexrow list-item" data-item-id="{{gear.id}}">
<img class="sheet-skill-img" src="{{gear.img}}"/> <img class="sheet-skill-img" src="{{gear.img}}"/>
<span class="conseq-label">{{gear.data.name}}</span> <span class="conseq-label">{{gear.name}}</span>
<div class="item-controls"> <div class="item-controls">
<a class="item-control item-equip" title="Worn">{{#if gear.data.data.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a> <a class="item-control item-equip" title="Worn">{{#if gear.system.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a> <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div> </div>
@ -273,9 +273,9 @@
{{#each data.contains as |subgear key|}} {{#each data.contains as |subgear key|}}
<li class="item flexrow list-item" data-item-id="{{subgear.id}}"> <li class="item flexrow list-item" data-item-id="{{subgear.id}}">
<img class="sheet-skill-img" src="{{subgear.img}}"/> <img class="sheet-skill-img" src="{{subgear.img}}"/>
<span class="conseq-label">{{subgear.data.name}}</span> <span class="conseq-label">{{subgear.name}}</span>
<div class="item-controls"> <div class="item-controls">
<a class="item-control item-equip" title="Worn">{{#if subgear.data.data.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a> <a class="item-control item-equip" title="Worn">{{#if subgear.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a> <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div> </div>
@ -292,11 +292,11 @@
<ul class="item-list alternate-list"> <ul class="item-list alternate-list">
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label generic-label">Geneline : </label> <label class="description-label generic-label">Geneline : </label>
<label class="description-label generic-label item-link"><a data-item-id="{{data.geneline.id}}">{{data.geneline.name}}</a></label> <label class="description-label generic-label item-link"><a data-item-id="{{system.geneline.id}}">{{data.geneline.name}}</a></label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label generic-label">Main Subculture :</label> <label class="description-label generic-label">Main Subculture :</label>
<select class="stat-value flexrow" type="text" name="data.subculture" value="{{data.subculture}}" data-dtype="String"> <select class="stat-value flexrow" type="text" name="system.subculture" value="{{system.subculture}}" data-dtype="String">
{{#select subculture}} {{#select subculture}}
{{#each subcultureList as |subculture key|}} {{#each subcultureList as |subculture key|}}
<option value="{{subculture.name}}">{{subculture.name}}</option> <option value="{{subculture.name}}">{{subculture.name}}</option>
@ -306,29 +306,29 @@
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label stat-label">Genre : </label> <label class="description-label stat-label">Genre : </label>
<input class="description-value flexrow" type="text" name="data.sex" value="{{data.sex}}" data-dtype="String"/> <input class="description-value flexrow" type="text" name="system.sex" value="{{data.sex}}" data-dtype="String"/>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label stat-label">Weight : </label> <label class="description-label stat-label">Weight : </label>
<input class="description-value flexrow" type="text" name="data.weight" value="{{data.weight}}" data-dtype="String"/> <input class="description-value flexrow" type="text" name="system.weight" value="{{data.weight}}" data-dtype="String"/>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label stat-label">Size : </label> <label class="description-label stat-label">Size : </label>
<input class="description-value flexrow" type="text" name="data.taille" value="{{data.taille}}" data-dtype="String"/> <input class="description-value flexrow" type="text" name="system.taille" value="{{data.taille}}" data-dtype="String"/>
</li> </li>
</ul> </ul>
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label stat-label">Hair : </label> <label class="description-label stat-label">Hair : </label>
<input class="description-value flexrow" type="text" name="data.hair" value="{{data.hair}}" data-dtype="String"/> <input class="description-value flexrow" type="text" name="system.hair" value="{{data.hair}}" data-dtype="String"/>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label stat-label">Eyes : </label> <label class="description-label stat-label">Eyes : </label>
<input class="description-value flexrow" type="text" name="data.eyes" value="{{data.eyes}}" data-dtype="String"/> <input class="description-value flexrow" type="text" name="system.eyes" value="{{data.eyes}}" data-dtype="String"/>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label stat-label">Age : </label> <label class="description-label stat-label">Age : </label>
<input class="description-value flexrow" type="text" name="data.age" value="{{data.age}}" data-dtype="String"/> <input class="description-value flexrow" type="text" name="system.age" value="{{data.age}}" data-dtype="String"/>
</li> </li>
</ul> </ul>
</article> </article>
@ -390,12 +390,12 @@
<hr> <hr>
<h3>Biography : </h3> <h3>Biography : </h3>
<div class="form-group editor"> <div class="form-group editor">
{{editor content=data.data.history target="data.history" button=true owner=owner editable=editable}} {{editor history target="system.history" button=true owner=owner editable=editable}}
</div> </div>
<hr> <hr>
<h3>Notes : </h3> <h3>Notes : </h3>
<div class="form-group editor"> <div class="form-group editor">
{{editor content=data.data.notes target="data.notes" button=true owner=owner editable=editable}} {{editor notes target="system.notes" button=true owner=owner editable=editable}}
</div> </div>
<hr> <hr>
{{>"systems/foundryvtt-shadows-over-sol/templates/editor-notes-gm.html"}} {{>"systems/foundryvtt-shadows-over-sol/templates/editor-notes-gm.html"}}

View File

@ -53,7 +53,7 @@
<select name="combatant2" class='action-select' id="combatant2" data-dtype="String"> <select name="combatant2" class='action-select' id="combatant2" data-dtype="String">
{{#select combatant2}} {{#select combatant2}}
{{#each combatantsList as |combatant key|}} {{#each combatantsList as |combatant key|}}
<option value={{combatant._id}}>{{combatant.actor.data.name}}</option> <option value={{combatant._id}}>{{combatant.actor.name}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
@ -74,7 +74,7 @@
<select name="combatant1" class='action-select' id="combatant1" data-dtype="String"> <select name="combatant1" class='action-select' id="combatant1" data-dtype="String">
{{#select combatant1}} {{#select combatant1}}
{{#each combatantsList as |combatant key|}} {{#each combatantsList as |combatant key|}}
<option value={{combatant._id}}>{{combatant.actor.data.name}}</option> <option value={{combatant._id}}>{{combatant.actor.name}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>

View File

@ -22,7 +22,7 @@
{{/select}} {{/select}}
</select> </select>
<span> <span>
<h3 class="dialog-label" id="flipSubTitle">Skill Flip : {{skill.name}} ({{skill.data.value}}) </h3> <h3 class="dialog-label" id="flipSubTitle">Skill Flip : {{skill.name}} ({{skill.system.value}}) </h3>
<h3 class="dialog-label" id="flipSubTitle">Final Score : <span id='score-base'>0</span> </h3> <h3 class="dialog-label" id="flipSubTitle">Final Score : <span id='score-base'>0</span> </h3>
</span> </span>
{{/if}} {{/if}}
@ -44,7 +44,7 @@
<select name="consequenceSelect" id="consequenceSelectMalus" data-dtype="String" multiple size="5" width="200"> <select name="consequenceSelect" id="consequenceSelectMalus" data-dtype="String" multiple size="5" width="200">
{{#select consequencesList}} {{#select consequencesList}}
{{#each consequencesList as |consequence key|}} {{#each consequencesList as |consequence key|}}
<option value={{consequence._id}}>{{localize consequence.name}} - {{consequence.data.severity}}</option> <option value={{consequence._id}}>{{localize consequence.name}} - {{consequence.system.severity}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
@ -56,7 +56,7 @@
<select name="consequenceSelect" id="consequenceSelectBonus" data-dtype="String" multiple size="5" width="200"> <select name="consequenceSelect" id="consequenceSelectBonus" data-dtype="String" multiple size="5" width="200">
{{#select consequencesList}} {{#select consequencesList}}
{{#each consequencesList as |consequence key|}} {{#each consequencesList as |consequence key|}}
<option value={{consequence._id}}>{{localize consequence.name}} - {{consequence.data.severity}}</option> <option value={{consequence._id}}>{{localize consequence.name}} - {{consequence.system.severity}}</option>
{{/each}} {{/each}}
{{/select}} {{/select}}
</select> </select>
@ -66,7 +66,7 @@
<div class="flexcol"> <div class="flexcol">
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
{{#each weaknessList as |weakness key|}} {{#each weaknessList as |weakness key|}}
<span class="dialog-label">{{localize weakness.name}} - {{weakness.data.category}}</span> <span class="dialog-label">{{localize weakness.name}} - {{weakness.system.category}}</span>
{{/each}} {{/each}}
</div> </div>
</div> </div>
@ -90,7 +90,7 @@
<hr> <hr>
{{#if target}} {{#if target}}
<div> <div>
<h4>Target : {{target.actor.name}} - Defense : {{target.actor.data.data.scores.defense.value}}/{{target.actor.data.data.scores.defense.critical}}</h4> <h4>Target : {{target.actor.name}} - Defense : {{target.actor.system.scores.defense.value}}/{{target.actor.system.scores.defense.critical}}</h4>
</div> </div>
{{/if}} {{/if}}
@ -99,7 +99,7 @@
<div class="flexrow"> <div class="flexrow">
<label for="categorie" class="dialog-label">Target Number (TN) : </label> <label for="categorie" class="dialog-label">Target Number (TN) : </label>
{{#if target}} {{#if target}}
<label for="categorie" class="dialog-label"> {{target.actor.data.data.scores.defense.value}} </label> <label for="categorie" class="dialog-label"> {{target.actor.system.scores.defense.value}} </label>
{{else}} {{else}}
<select name="tn" id="tn" data-dtype="number"> <select name="tn" id="tn" data-dtype="number">
{{#select tn}} {{#select tn}}

View File

@ -1,6 +1,6 @@
{{#if data.isGM}} {{#if data.isGM}}
<h3>GM Notes : </h3> <h3>GM Notes : </h3>
<div class="form-group editor"> <div class="form-group editor">
{{editor content=data.gmnotes target="data.gmnotes" button=true owner=owner editable=editable}} {{editor gmnotes target="system.gmnotes" button=true owner=owner editable=editable}}
</div> </div>
{{/if}} {{/if}}

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
@ -13,7 +13,7 @@
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Type</label> <label class="generic-label">Type</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<select class="stat-value flexrow" type="text" name="data.type" value="{{data.type}}" data-dtype="String"> <select class="stat-value flexrow" type="text" name="system.type" value="{{data.type}}" data-dtype="String">
{{#select data.type}} {{#select data.type}}
<option value="reaction">Reaction</option> <option value="reaction">Reaction</option>
<option value="move">Move</option> <option value="move">Move</option>
@ -27,16 +27,16 @@
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Minimum Action Point cost</label> <label class="generic-label">Minimum Action Point cost</label>
<input type="text" name="data.minap" value="{{data.minap}}" data-dtype="Number"/> <input type="text" name="system.minap" value="{{data.minap}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Target needed ?</label> <label class="generic-label">Target needed ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.targetneeded" {{checked data.targetneeded}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.targetneeded" {{checked data.targetneeded}}/></label>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,42 +1,40 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Bulky</label> <label class="generic-label">Bulky</label>
<input type="text" name="data.bulky" value="{{data.bulky}}" data-dtype="Number"/> <input type="text" name="system.bulky" value="{{data.bulky}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">DR</label> <label class="generic-label">DR</label>
<input type="text" name="data.dr" value="{{data.dr}}" data-dtype="Number"/> <input type="text" name="system.dr" value="{{data.dr}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Gel</label> <label class="generic-label">Gel</label>
<input type="text" name="data.gel" value="{{data.gel}}" data-dtype="Number"/> <input type="text" name="system.gel" value="{{data.gel}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Reflect</label> <label class="generic-label">Reflect</label>
<input type="text" name="data.reflect" value="{{data.reflect}}" data-dtype="Number"/> <input type="text" name="system.reflect" value="{{data.reflect}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Strength Bonus</label> <label class="generic-label">Strength Bonus</label>
<input type="text" name="data.str" value="{{data.str}}" data-dtype="Number"/> <input type="text" name="system.str" value="{{data.str}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Is VAC ?</label> <label class="generic-label">Is VAC ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.vac" {{checked data.vac}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.vac" {{checked data.vac}}/></label>
</div> </div>
{{/with}}
{{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}} {{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}}
</div> </div>

View File

@ -1,53 +1,51 @@
{{#with data}}
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Big</label> <label class="generic-label">Big</label>
<input type="text" name="data.big" value="{{data.big}}" data-dtype="Number"/> <input type="text" name="system.big" value="{{data.big}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Cost rating </label> <label class="generic-label">Cost rating </label>
<input type="text" name="data.costrating" value="{{data.costrating}}" data-dtype="Number"/> <input type="text" name="system.costrating" value="{{data.costrating}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Defensive </label> <label class="generic-label">Defensive </label>
<input type="text" name="data.defensive" value="{{data.defensive}}" data-dtype="Number"/> <input type="text" name="system.defensive" value="{{data.defensive}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Quantity </label> <label class="generic-label">Quantity </label>
<input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/> <input type="text" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Computer</label> <label class="generic-label">Computer</label>
<input type="text" name="data.computer" value="{{data.computer}}" data-dtype="Number"/> <input type="text" name="system.computer" value="{{data.computer}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Software</label> <label class="generic-label">Software</label>
<input type="text" name="data.software" value="{{data.software}}" data-dtype="Number"/> <input type="text" name="system.software" value="{{data.software}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Conceal</label> <label class="generic-label">Conceal</label>
<input type="text" name="data.conceal" value="{{data.conceal}}" data-dtype="Number"/> <input type="text" name="system.conceal" value="{{data.conceal}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Implant</label> <label class="generic-label">Implant</label>
<input type="text" name="data.implant" value="{{data.implant}}" data-dtype="Number"/> <input type="text" name="system.implant" value="{{data.implant}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Negligeable ?</label> <label class="generic-label">Negligeable ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.neg" {{checked data.neg}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.neg" {{checked data.neg}}/></label>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Military ?</label> <label class="generic-label">Military ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.mil" {{checked data.mil}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.mil" {{checked data.mil}}/></label>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Worn ?</label> <label class="generic-label">Worn ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.worn" {{checked data.worn}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.worn" {{checked data.worn}}/></label>
</div> </div>
{{/with}}
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
@ -13,8 +13,8 @@
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Severity</label> <label class="generic-label">Severity</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<select class="stat-value flexrow" type="text" name="data.severity" value="{{data.data.severity}}" data-dtype="String"> <select class="stat-value flexrow" type="text" name="system.severity" value="{{data.severity}}" data-dtype="String">
{{#select data.data.severity}} {{#select data.severity}}
<option value="none">None</option> <option value="none">None</option>
<option value="light">Light</option> <option value="light">Light</option>
<option value="moderate">Moderate</option> <option value="moderate">Moderate</option>
@ -27,7 +27,7 @@
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
@ -13,7 +13,7 @@
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Container</label> <label class="generic-label">Container</label>
<input type="text" name="data.container" value="{{data.data.container}}" data-dtype="Number"/> <input type="text" name="system.container" value="{{data.container}}" data-dtype="Number"/>
</div> </div>
{{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}} {{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}}
</div> </div>

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>

View File

@ -1,42 +1,40 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Experiences</label> <label class="generic-label">Experiences</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<input type="text" name="data.experiences" value="{{data.experiences}}" data-dtype="String"/> <input type="text" name="system.experiences" value="{{data.experiences}}" data-dtype="String"/>
</div> </div>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Edge</label> <label class="generic-label">Edge</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<input type="text" name="data.edge" value="{{data.edge}}" data-dtype="String"/> <input type="text" name="system.edge" value="{{data.edge}}" data-dtype="String"/>
</div> </div>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Weakness</label> <label class="generic-label">Weakness</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
{{editor content=data.weakness target="data.weakness" button=true owner=owner editable=editable}} {{editor weakness target="system.weakness" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>
{{/with}}
</section> </section>
</form> </form>

View File

@ -1,27 +1,26 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Card</label> <label class="generic-label">Card</label>
<input type="text" name="data.card" value="{{data.card}}" data-dtype="String"/> <input type="text" name="system.card" value="{{data.card}}" data-dtype="String"/>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>
{{/with}}
</section> </section>
</form> </form>

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
@ -13,7 +13,7 @@
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.ata.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,33 +1,32 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Vector</label> <label class="generic-label">Vector</label>
<input type="text" name="data.vector" value="{{data.vector}}" data-dtype="String"/> <input type="text" name="system.vector" value="{{data.vector}}" data-dtype="String"/>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Action</label> <label class="generic-label">Action</label>
<input type="text" name="data.action" value="{{data.action}}" data-dtype="String"/> <input type="text" name="system.action" value="{{data.action}}" data-dtype="String"/>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Effect</label> <label class="generic-label">Effect</label>
<input type="text" name="data.effect" value="{{data.effect}}" data-dtype="String"/> <input type="text" name="system.effect" value="{{data.effect}}" data-dtype="String"/>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Notes</label> <label class="generic-label">Notes</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}} {{editor notes target="system.notes" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>
{{/with}}
</section> </section>
</form> </form>

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
@ -11,7 +11,7 @@
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<ul> <ul>
<li class="flexrow"><label class="generic-label">Value</label><input type="text" name="data.data.value" value="{{data.data.value}}" data-dtype="Number"/></li> <li class="flexrow"><label class="generic-label">Value</label><input type="text" name="system.value" value="{{data.value}}" data-dtype="Number"/></li>
<ul class="stat-list alternate-list"> <ul class="stat-list alternate-list">
<li class="stat flexrow list-item" data-attribute="{{key}}"> <li class="stat flexrow list-item" data-attribute="{{key}}">
<span class="generic-label flexrow tooltip tooltip-nobottom" name="">Experiences list : </span> <span class="generic-label flexrow tooltip tooltip-nobottom" name="">Experiences list : </span>
@ -27,7 +27,7 @@
{{/each}} {{/each}}
</ul> </ul>
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
{{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</section> </section>

View File

@ -1,19 +1,19 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Type</label> <label class="generic-label">Type</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<select class="stat-value flexrow" type="text" name="data.skill" value="{{data.skill}}" data-dtype="String"> <select class="stat-value flexrow" type="text" name="system.skill" value="{{data.skill}}" data-dtype="String">
{{#select data.skill}} {{#select data.skill}}
{{#each skillList as |skill key|}} {{#each skillList as |skill key|}}
<option value="{{skill.name}}">{{skill.name}}</option> <option value="{{skill.name}}">{{skill.name}}</option>
@ -25,11 +25,10 @@
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>
{{/with}}
</section> </section>
</form> </form>

View File

@ -1,30 +1,28 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Experiences</label> <label class="generic-label">Experiences</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<input type="text" name="data.experiences" value="{{data.experiences}}" data-dtype="String"/> <input type="text" name="system.experiences" value="{{data.experiences}}" data-dtype="String"/>
</div> </div>
</div> </div>
</div> </div>
{{/with}}
</section> </section>
</form> </form>

View File

@ -1,8 +1,8 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
@ -10,32 +10,30 @@
<section class="sheet-body"> <section class="sheet-body">
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
{{#with data}}
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Cruise</label> <label class="generic-label">Cruise</label>
<input type="text" name="data.cruise" value="{{data.cruise}}" data-dtype="Number"/> <input type="text" name="system.cruise" value="{{data.cruise}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Defense</label> <label class="generic-label">Defense</label>
<input type="text" name="data.defense" value="{{data.defense}}" data-dtype="Number"/> <input type="text" name="system.defense" value="{{data.defense}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">DR</label> <label class="generic-label">DR</label>
<input type="text" name="data.dr" value="{{data.dr}}" data-dtype="Number"/> <input type="text" name="system.dr" value="{{data.dr}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Handling</label> <label class="generic-label">Handling</label>
<input type="text" name="data.handling" value="{{data.handling}}" data-dtype="Number"/> <input type="text" name="system.handling" value="{{data.handling}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Shock</label> <label class="generic-label">Shock</label>
<input type="text" name="data.shock" value="{{data.shock}}" data-dtype="Number"/> <input type="text" name="system.shock" value="{{data.shock}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Structure</label> <label class="generic-label">Structure</label>
<input type="text" name="data.structure" value="{{data.structure}}" data-dtype="Number"/> <input type="text" name="system.structure" value="{{data.structure}}" data-dtype="Number"/>
</div> </div>
{{/with}}
{{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}} {{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}}
</div> </div>

View File

@ -1,20 +1,19 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Type</label> <label class="generic-label">Type</label>
<div class="form-group small-editor"> <div class="form-group small-editor">
<select class="stat-value flexrow" type="text" name="data.category" value="{{data.category}}" data-dtype="String"> <select class="stat-value flexrow" type="text" name="system.category" value="{{data.category}}" data-dtype="String">
{{#select data.category}} {{#select data.category}}
<option value="impairment">Impairment</option> <option value="impairment">Impairment</option>
<option value="disability">Disablity</option> <option value="disability">Disablity</option>
@ -27,11 +26,10 @@
<div class="flexcol"> <div class="flexcol">
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
<div class="form-group medium-editor"> <div class="form-group medium-editor">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>
{{/with}}
</section> </section>
</form> </form>

View File

@ -1,20 +1,19 @@
<form class="{{cssClass}}" autocomplete="off"> <form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1> <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{#with data}}
<div class="tab" data-group="primary"> <div class="tab" data-group="primary">
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Category</label> <label class="generic-label">Category</label>
<select class="stat-value flexrow" type="text" name="data.category" value="{{data.category}}" data-dtype="String"> <select class="stat-value flexrow" type="text" name="system.category" value="{{data.category}}" data-dtype="String">
{{#select data.category}} {{#select data.category}}
<option value="ballistic">Ballistic</option> <option value="ballistic">Ballistic</option>
<option value="laser">Laser</option> <option value="laser">Laser</option>
@ -27,63 +26,62 @@
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Damage : </label> <label class="generic-label">Damage : </label>
<img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/spade.webp" /> <img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/spade.webp" />
<input type="text" name="data.damage_spade" value="{{data.damage_spade}}" data-dtype="String"/> <input type="text" name="system.damage_spade" value="{{data.damage_spade}}" data-dtype="String"/>
<img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/hearts.webp" /> <img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/hearts.webp" />
<input type="text" name="data.damage_hearts" value="{{data.damage_hearts}}" data-dtype="String"/> <input type="text" name="system.damage_hearts" value="{{data.damage_hearts}}" data-dtype="String"/>
<img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/diamond.webp" /> <img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/diamond.webp" />
<input type="text" name="data.damage_diamond" value="{{data.damage_diamond}}" data-dtype="String"/> <input type="text" name="system.damage_diamond" value="{{data.damage_diamond}}" data-dtype="String"/>
<img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/club.webp" /> <img class="cardsuit-img" src="systems/foundryvtt-shadows-over-sol/img/cards/club.webp" />
<input type="text" name="data.damage_club" value="{{data.damage_club}}" data-dtype="String"/> <input type="text" name="system.damage_club" value="{{data.damage_club}}" data-dtype="String"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Range</label> <label class="generic-label">Range</label>
<input type="text" name="data.range" value="{{data.range}}" data-dtype="Number"/> <input type="text" name="system.range" value="{{data.range}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Area</label> <label class="generic-label">Area</label>
<input type="text" name="data.area" value="{{data.area}}" data-dtype="Number"/> <input type="text" name="system.area" value="{{data.area}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Shots</label> <label class="generic-label">Shots</label>
<input type="text" name="data.shots" value="{{data.shots}}" data-dtype="Number"/> <input type="text" name="system.shots" value="{{data.shots}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Autofire</label> <label class="generic-label">Autofire</label>
<input type="text" name="data.autofire" value="{{data.autofire}}" data-dtype="Number"/> <input type="text" name="system.autofire" value="{{data.autofire}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Hands needed</label> <label class="generic-label">Hands needed</label>
<input type="text" name="data.hands" value="{{data.hands}}" data-dtype="Number"/> <input type="text" name="system.hands" value="{{data.hands}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Pierce</label> <label class="generic-label">Pierce</label>
<input type="text" name="data.pierce" value="{{data.pierce}}" data-dtype="Number"/> <input type="text" name="system.pierce" value="{{data.pierce}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Reload</label> <label class="generic-label">Reload</label>
<input type="text" name="data.reload" value="{{data.reload}}" data-dtype="Number"/> <input type="text" name="system.reload" value="{{data.reload}}" data-dtype="Number"/>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Stun ?</label> <label class="generic-label">Stun ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.stun" {{checked data.stun}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.stun" {{checked data.stun}}/></label>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Thrown ?</label> <label class="generic-label">Thrown ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.thrown" {{checked data.thrown}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.thrown" {{checked data.thrown}}/></label>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Reach ?</label> <label class="generic-label">Reach ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.reach" {{checked data.reach}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.reach" {{checked data.reach}}/></label>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Shallow ?</label> <label class="generic-label">Shallow ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.shallow" {{checked data.shallow}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.shallow" {{checked data.shallow}}/></label>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<label class="generic-label">Spread ?</label> <label class="generic-label">Spread ?</label>
<label class="attribute-value checkbox"><input type="checkbox" name="data.spread" {{checked data.spread}}/></label> <label class="attribute-value checkbox"><input type="checkbox" name="system.spread" {{checked data.spread}}/></label>
</div> </div>
{{/with}}
{{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}} {{>"systems/foundryvtt-shadows-over-sol/templates/item-commongear-sheet.html"}}
</div> </div>