Compare commits

..

11 Commits

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
88 changed files with 456 additions and 324 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,7 +22,7 @@ export class SoSActorSheet extends ActorSheet {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getData() { async getData() {
const objectData = this.object const objectData = this.object
let formData = { let formData = {
title: this.title, title: this.title,
@ -34,6 +34,9 @@ export class SoSActorSheet extends ActorSheet {
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
data: foundry.utils.deepClone(this.object.system), 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
@ -61,12 +64,12 @@ export class SoSActorSheet extends ActorSheet {
formData.gearsRoot = formData.gears.filter(item => item.system.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.system.containerid == container.id) { if ( gear.system.containerid == container.id) {
container.data.contains.push( gear ) container.system.contains.push( gear )
if ( !gear.system.neg && !gear.system.software ) { if ( !gear.system.neg && !gear.system.software ) {
container.system.containerEnc += (gear.system.big > 0) ? gear.system.big : 1; container.system.containerEnc += (gear.system.big > 0) ? gear.system.big : 1;
} }
@ -78,7 +81,7 @@ export class SoSActorSheet extends ActorSheet {
formData.weapons = this.actor.items.filter( item => item.type == 'weapon'); formData.weapons = this.actor.items.filter( item => item.type == 'weapon');
formData.armors = this.actor.items.filter( item => item.type == 'armor'); formData.armors = this.actor.items.filter( item => item.type == 'armor');
formData.totalEncumbrance = SoSUtility.computeEncumbrance(this.actor.items); formData.totalEncumbrance = SoSUtility.computeEncumbrance(this.actor.items);
formData.wounds = duplicate(this.actor.system.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.system.scores.wound.value; formData.totalWounds = this.actor.system.scores.wound.value;

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.system.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.system.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 );
} }
@ -213,7 +213,7 @@ export class SoSActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
async updateWound(woundName, value) { async updateWound(woundName, value) {
let wounds = duplicate(this.system.wounds) let wounds = foundry.utils.duplicate(this.system.wounds)
wounds[woundName] = value; wounds[woundName] = value;
await this.update( { 'system.wounds': wounds } ); await this.update( { 'system.wounds': wounds } );
} }
@ -246,13 +246,13 @@ export class SoSActor extends Actor {
let flipData = { let flipData = {
mode: 'stat', mode: 'stat',
stat: duplicate(this.system.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.items.filter( item => item.type == 'weakness' ), weaknessList: this.items.filter( item => item.type == 'weakness' ),
wounds: duplicate( this.system.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.system.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.system.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),
@ -301,14 +301,14 @@ export class SoSActor extends Actor {
let flipData = { let flipData = {
mode: 'weapon', mode: 'weapon',
weapon: duplicate(weapon), weapon: foundry.utils.duplicate(weapon),
statList: duplicate(this.system.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.system.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),
@ -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.system.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.system.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 } );
@ -388,10 +388,10 @@ export class SoSActor extends Actor {
if ( alreadyInside.length >= container.system.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, 'system.containerid':containerId }]); setTimeout(function() { this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':containerId }])}, 800 )
} }
} else if ( object && object.system.containerid) { // remove from container } else if ( object && object.system.containerid) { // remove from container
await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':"" }]); setTimeout(function() { this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'system.containerid':"" }])}, 800 )
} }
} }
@ -403,7 +403,7 @@ export class SoSActor extends Actor {
return; return;
} }
let wounds = duplicate(this.system.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,7 +412,7 @@ 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.system.scores.currentwounds); let currentWounds = foundry.utils.duplicate(this.system.scores.currentwounds);
currentWounds.value = sumWound; currentWounds.value = sumWound;
if ( sumWound >= this.system.scores.wound.value) { if ( sumWound >= this.system.scores.wound.value) {
let bleeding = this.items.find( item => item.type == 'consequence' && item.name == 'Bleeding'); let bleeding = this.items.find( item => item.type == 'consequence' && item.name == 'Bleeding');

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,
@ -56,7 +56,8 @@ export class SoSItemSheet extends ItemSheet {
effects: this.object.effects.map(e => foundry.utils.deepClone(e.system)), 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;
@ -66,6 +67,12 @@ export class SoSItemSheet extends ItemSheet {
if ( objectData.type == 'skill' && this.object.options?.actor) { if ( objectData.type == 'skill' && this.object.options?.actor) {
formData.skillExperienceList = this.object.options.actor.getSkillExperience( objectData.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

@ -14,7 +14,7 @@ export class SoSCombat extends Combat {
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.name : combatant.name; const name = combatant.actor ? combatant.actor.name : combatant.name;
if (combatant.players && combatant.players[0] ) { if (combatant.players && combatant.players[0] ) {
// A player controls this combatant -> message ! // A player controls this combatant -> message !
@ -80,7 +80,7 @@ export class SoSCombat extends Combat {
// 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.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]) {

View File

@ -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,7 +29,7 @@ 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.system.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();
@ -52,10 +52,10 @@ 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();
@ -67,10 +67,10 @@ export class SoSFlipDialog extends Dialog {
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();
}); });
@ -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.system.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 );
} }

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,30 +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,
default: "XXX",
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.version}"`
$.ajax(regURL)
/* -------------------------------------------- */
}
}
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Foundry VTT Initialization */ /* Foundry VTT Initialization */
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -126,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

@ -30,6 +30,16 @@ export class SoSUtility {
return loadTemplates(templatePaths); return loadTemplates(templatePaths);
} }
/* -------------------------------------------- */
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) { 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);
@ -75,23 +85,6 @@ 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();
@ -122,7 +115,7 @@ export class SoSUtility {
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;
} }
} }
@ -137,7 +130,8 @@ export class SoSUtility {
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 }
});
} }
} }
@ -275,20 +269,20 @@ export class SoSUtility {
} }
// 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;
@ -341,18 +335,18 @@ export class SoSUtility {
// 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")) });

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

@ -4,11 +4,10 @@
"description": "Shadows over Sol for FoundryVTT", "description": "Shadows over Sol for FoundryVTT",
"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",
"version": "10.0.6", "version": "12.0.0",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "11",
"verified": "10.285", "verified": "12"
"maximum": "10"
}, },
"esmodules": [ "esmodules": [
"module/sos-main.js" "module/sos-main.js"
@ -109,7 +108,9 @@
], ],
"socket": true, "socket": true,
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/raw/branch/v10/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-10.0.6.zip", "download": "https://www.uberwald.me/gitea/public/foundryvtt-shadows-over-sol/archive/foundryvtt-shadows-over-sol-12.0.0.zip",
"gridDistance": 5, "grid": {
"gridUnits": "ft" "distance": 5,
"units": "ft"
}
} }

View File

@ -390,12 +390,12 @@
<hr> <hr>
<h3>Biography : </h3> <h3>Biography : </h3>
<div class="form-group editor"> <div class="form-group editor">
{{editor data.history target="system.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 data.notes target="system.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

@ -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 data.gmnotes target="system.gmnotes" button=true owner=owner editable=editable}} {{editor gmnotes target="system.gmnotes" button=true owner=owner editable=editable}}
</div> </div>
{{/if}} {{/if}}

View File

@ -36,7 +36,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 data.description target="system.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

@ -46,6 +46,6 @@
<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 data.description target="system.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>

View File

@ -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 data.description target="system.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

@ -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 data.description target="system.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">
@ -31,7 +31,7 @@
<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 data.weakness target="system.weakness" button=true owner=owner editable=editable}} {{editor weakness target="system.weakness" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>

View File

@ -17,7 +17,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 data.description target="system.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

@ -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 data.description target="system.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

@ -24,7 +24,7 @@
<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 data.notes target="system.notes" button=true owner=owner editable=editable}} {{editor notes target="system.notes" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>

View File

@ -27,7 +27,7 @@
{{/each}} {{/each}}
</ul> </ul>
<label class="generic-label">Description</label> <label class="generic-label">Description</label>
{{editor data.description target="system.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</section> </section>

View File

@ -25,7 +25,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 data.description target="system.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

@ -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 data.description target="system.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">

View File

@ -26,7 +26,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 data.description target="system.description" button=true owner=owner editable=editable}} {{editor description target="system.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>
</div> </div>