Merge branch 'refs/heads/main' into feature/xml-import
# Conflicts: # src/main.mjs # src/module/data/character.mjspull/13/head
Jendrik
commit
c758fcc3e4
|
|
@ -0,0 +1,8 @@
|
|||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -16,6 +16,7 @@
|
|||
"@foundryvtt/foundryvtt-cli": "^3.0.0",
|
||||
"cb": "^0.1.1",
|
||||
"del": "^8.0.1",
|
||||
"fvtt-types": "npm:@league-of-foundry-developers/foundry-vtt-types@^13.346.0-beta.20250812191140",
|
||||
"gulp": "^5.0.1",
|
||||
"gulp-replace": "^1.1.4",
|
||||
"gulp-sass": "^6.0.1",
|
||||
|
|
|
|||
15
src/main.mjs
15
src/main.mjs
|
|
@ -1,10 +1,10 @@
|
|||
import {PlayerCharacterDataModel} from "./module/data/character.mjs";
|
||||
import { SkillSheet } from "./module/sheets/skillSheet.mjs";
|
||||
import { SpellSheet } from "./module/sheets/spellSheet.mjs";
|
||||
import { SkillDataModel } from "./module/data/skill.mjs";
|
||||
import { SpellDataModel } from "./module/data/spell.mjs";
|
||||
import { Character } from "./module/documents/character.mjs";
|
||||
import {PlayerCharacterDataModel} from "./module/data/character.mjs";
|
||||
import {CharacterSheet} from "./module/Sheet/CharacterSheet.mjs";
|
||||
import { CharacterSheet } from "./module/sheets/characterSheet.mjs";
|
||||
|
||||
Hooks.once("init", () => {
|
||||
|
||||
|
|
@ -21,13 +21,14 @@ Hooks.once("init", () => {
|
|||
spell: SpellDataModel
|
||||
}
|
||||
|
||||
foundry.documents.collections.Actors.registerSheet("dsa41.character", CharacterSheet, {
|
||||
types: ["character"],
|
||||
makeDefault: true
|
||||
});
|
||||
|
||||
console.log("DSA 4.1 is ready for development!")
|
||||
|
||||
Actors.registerSheet('dsa41.character', CharacterSheet, {
|
||||
types: ["character"],
|
||||
makeDefault: true,
|
||||
label: 'DSA41.CharacterLabels.Item'
|
||||
})
|
||||
|
||||
// Register sheet application classes
|
||||
Items.registerSheet('dsa41.skill', SkillSheet, {
|
||||
types: ["Skill"],
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import { Skill } from "./Items/skill.mjs";
|
||||
import { Spell } from "./Items/spell.mjs";
|
||||
import {SkillDataModel} from "./skill.mjs";
|
||||
import {SpellDataModel} from "./spell.mjs";
|
||||
|
||||
const {
|
||||
SchemaField, NumberField, StringField, ArrayField, BooleanField, EmbeddedCollectionField,
|
||||
SchemaField, NumberField, StringField, ArrayField, BooleanField, ForeignDocumentField
|
||||
} = foundry.data.fields;
|
||||
|
||||
export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel {
|
||||
|
|
@ -113,8 +113,9 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel {
|
|||
name: new StringField(),
|
||||
auswahlen: new ArrayField(new StringField()),
|
||||
})),
|
||||
talente: new EmbeddedCollectionField( { model: Skill }),
|
||||
zauber: new EmbeddedCollectionField( { model: Spell }),
|
||||
|
||||
talente: new ArrayField ( new ForeignDocumentField(Item) ),
|
||||
zauber: new ArrayField ( new ForeignDocumentField(Item) ),
|
||||
liturgien: new ArrayField(new SchemaField({
|
||||
name: new StringField(),
|
||||
})),
|
||||
|
|
@ -126,8 +127,12 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel {
|
|||
notizen: new ArrayField(new SchemaField({
|
||||
key: new StringField(),
|
||||
notiz: new StringField(),
|
||||
}))
|
||||
})),
|
||||
}
|
||||
}
|
||||
|
||||
_initialize(options) {
|
||||
super._initialize(options);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
export class Character extends Item {
|
||||
export class Character extends Actor {
|
||||
/**
|
||||
* Augment the basic Item data model with additional dynamic data.
|
||||
*/
|
||||
prepareData() {
|
||||
super.prepareData();
|
||||
this.prepareEmbeddedDocuments();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
export class CharacterSheet extends ActorSheet {
|
||||
/**@override */
|
||||
static get defaultOptions() {
|
||||
return foundry.utils.mergeObject(super.defaultOptions, {
|
||||
classes: ['dsa41', 'sheet', 'actor', 'character'],
|
||||
width: 520,
|
||||
height: 480,
|
||||
tabs: [
|
||||
{
|
||||
navSelector: '.sheet-tabs',
|
||||
contentSelector: '.sheet-body',
|
||||
initial: 'description',
|
||||
},
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
/** @override */
|
||||
get template() {
|
||||
return `systems/DSA_4-1/templates/actor/actor-character-sheet.hbs`;
|
||||
}
|
||||
|
||||
/** @override */
|
||||
getData() {
|
||||
// Retrieve the data structure from the base sheet. You can inspect or log
|
||||
// the context variable to see the structure, but some key properties for
|
||||
// sheets are the actor object, the data object, whether or not it's
|
||||
// editable, the items array, and the effects array.
|
||||
const context = super.getData();
|
||||
|
||||
// Use a safe clone of the actor data for further operations.
|
||||
const actorData = context.data;
|
||||
|
||||
// Add the actor's data to context.data for easier access, as well as flags.
|
||||
context.system = actorData.system;
|
||||
context.flags = actorData.flags;
|
||||
context.skills = [];
|
||||
if ( context.system.talente?.length >= 0) {
|
||||
context.system.talente.forEach(talent => {
|
||||
const tempTalent = talent();
|
||||
console.log(tempTalent.system.probe);
|
||||
context.skills.push({
|
||||
talentName: tempTalent.name,
|
||||
probe: `ROLLDATA(${Object.values(tempTalent.system.probe).join("/")})`
|
||||
});
|
||||
|
||||
})
|
||||
}
|
||||
console.log(context);
|
||||
|
||||
return context;
|
||||
}
|
||||
|
||||
activateListeners(html) {
|
||||
super.activateListeners(html);
|
||||
|
||||
// Everything below here is only needed if the sheet is editable
|
||||
if (!this.isEditable) return;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -73,7 +73,21 @@
|
|||
],
|
||||
"documentTypes": {
|
||||
"Actor": {
|
||||
"character": {}
|
||||
"character": {
|
||||
"numberFields": [
|
||||
"groesse", "alter", "gewicht"
|
||||
],
|
||||
"stringFields": [
|
||||
"name"
|
||||
],
|
||||
"schemaFields": [
|
||||
"attribute", "meta"
|
||||
],
|
||||
"arrayFields": [
|
||||
"talente",
|
||||
"zauber"
|
||||
]
|
||||
}
|
||||
},
|
||||
"Item": {
|
||||
"Skill": {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
<form class="{{cssClass}} {{actor.type}} flexcol" autocomplete="off">
|
||||
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
{{!-- Header stuff goes here --}}
|
||||
<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100"/>
|
||||
<div class="header-fields">
|
||||
<h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name"/></h1>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{{!-- Sheet Tab Navigation --}}
|
||||
<nav class="sheet-tabs tabs" data-group="primary">
|
||||
<a class="item" data-tab="overview">Übersicht</a>
|
||||
<a class="item" data-tab="skills">Talente</a>
|
||||
</nav>
|
||||
|
||||
{{!-- Sheet Body --}}
|
||||
<section class="sheet-body">
|
||||
<div class="tab description" data-group="primary" data-tab="description">
|
||||
<div><label>Spezies
|
||||
<input type="text" name="system.meta.spezies.value" value="{{system.meta.spezies}}"/>
|
||||
</label>
|
||||
</div>
|
||||
<div><label>Kultur<input type="text" name="system.meta.kultur.value" value="{{system.meta.kultur}}"/></label>
|
||||
</div>
|
||||
<div><label>Profession<input type="text" name="system.meta.profession.value"
|
||||
value="{{system.meta.profession}}"/></label>
|
||||
</div>
|
||||
<div><label>Geschlecht<input type="text" name="system.meta.geschlecht.value"
|
||||
value="{{system.meta.geschlecht}}"/></label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab skills" data-group="primary" data-tab="skills">
|
||||
<ul>
|
||||
{{#each skills}}
|
||||
<li><div>
|
||||
<b>{{this.talentName}}</b>
|
||||
{{this.probe}}
|
||||
</div></li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
</section>
|
||||
</form>
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<form class="{{cssClass}} {{actor.type}} flexcol" autocomplete="off">
|
||||
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
{{!-- Header stuff goes here --}}
|
||||
<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100"/>
|
||||
<div class="header-fields">
|
||||
<h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name"/></h1>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{{!-- Sheet Tab Navigation --}}
|
||||
<nav class="sheet-tabs tabs" data-group="primary">
|
||||
<a class="item" data-tab="overview">Übersicht</a>
|
||||
<a class="item" data-tab="skills">Talente</a>
|
||||
</nav>
|
||||
|
||||
{{!-- Sheet Body --}}
|
||||
<section class="sheet-body">
|
||||
<div class="tab description" data-group="primary" data-tab="description">
|
||||
<input type="text" name="system.meta.spezies.value" value="{{system.meta.spezies.value}}" />
|
||||
<input type="text" name="system.meta.kultur.value" value="{{system.meta.kultur.value}}" />
|
||||
<input type="text" name="system.meta.profession.value" value="{{system.meta.profession.value}}" />
|
||||
<input type="text" name="system.meta.geschlecht.value" value="{{system.meta.geschlecht.value}}" />
|
||||
</div>
|
||||
</section>
|
||||
</form>
|
||||
Loading…
Reference in New Issue