MidgardVTT-Entwicklung
/
foundry-vtt-system-midgard5
7
0
Fork 0
Code Issues 16 Pull Requests Actions Projects 1 Releases 8 Wiki Activity

Zusammenführung-von-Fertigkeiten,-Waffen-und-Rüstungen-im-Kampf-Tab-#15 #48

Merged
oskaloq merged 5 commits from Zusammenführung-von-Fertigkeiten,-Waffen-und-Rüstungen-im-Kampf-Tab-#15 into develop 2024-01-16 11:25:41 +01:00
Conversation 0 Commits 5 Files Changed 17 +385 -329
10 changed files with 385 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 674e7fca92 - Show all commits

19
lang/de.json
View File

@ -29,7 +29,16 @@
"midgard5.label": "Bezeichnung", "midgard5.label": "Bezeichnung",
"midgard5.description": "Beschreibung", "midgard5.description": "Beschreibung",
"midgard5.attribute": "Leiteigenschaft", "midgard5.Characteristic": "Merkmal",
"midgard5.characteristics": "Merkmale",
"midgard5.background": "Hintergrund",
"midgard5.attribute": "Eigenschaft",
"midgard5.attributes": "Eigenschaften",
"midgard5.derived-attribute": "Abgeleitete Eigenschaft",
"midgard5.derived-attributes": "Abgeleitete Eigenschaften",
"midgard5.calculated-value": "Berechneter Wert",
"midgard5.calculated-values": "Berechnete Werte",
"midgard5.skill": "Fertigkeit", "midgard5.skill": "Fertigkeit",
"midgard5.skill-value": "Fertigkeitswert", "midgard5.skill-value": "Fertigkeitswert",
"midgard5.fw": "FW", "midgard5.fw": "FW",
@ -80,6 +89,8 @@
"midgard5.spells": "Zauber", "midgard5.spells": "Zauber",
"midgard5.effects": "Aktive Effekte", "midgard5.effects": "Aktive Effekte",
"midgard5.kampfkuenste": "Kampfkünste", "midgard5.kampfkuenste": "Kampfkünste",
"midgard5.combat": "Kampf",
"midgard5.actor-name": "Figur", "midgard5.actor-name": "Figur",
"midgard5.level": "Grad", "midgard5.level": "Grad",
@ -221,10 +232,14 @@
"midgard5.new-skill": "Neue Fertigkeit", "midgard5.new-skill": "Neue Fertigkeit",
"midgard5.special": "Spezial", "midgard5.special": "Spezial",
"midgard5.learned-skill": "Gelernte Fertigkeit", "midgard5.learned-skill": "Gelernte Fertigkeit",
"midgard5.learned-skills": "Gelernte Fertigkeiten",
"midgard5.language": "Sprache", "midgard5.language": "Sprache",
"midgard5.languages": "Sprachen",
"midgard5.weapon-skill": "Waffenfertigkeit", "midgard5.weapon-skill": "Waffenfertigkeit",
"midgard5.unlearned-skill": "Ungelernte Fertigkeit", "midgard5.unlearned-skill": "Ungelernte Fertigkeit",
"midgard5.innate-ability": "Angeborene Fähigkeit", "midgard5.unlearned-skills": "Ungelernte Fertigkeiten",
"midgard5.innate-ability": "Angeborene/Besondere Fertigkeit",
"midgard5.innate-abilities": "Angeborene/Besondere Fertigkeit",
"midgard5.base-damage": "Grundschaden", "midgard5.base-damage": "Grundschaden",
"midgard5.defensive-weapon": "Verteidigungswaffe", "midgard5.defensive-weapon": "Verteidigungswaffe",

3
source/PreloadTemplates.ts
View File

@ -6,13 +6,14 @@ const preloadTemplates = async (): Promise<Handlebars.TemplateDelegate<any>[]> =
// const templates = [ rootPath + "actor/actor-sheet.hbs" ] // const templates = [ rootPath + "actor/actor-sheet.hbs" ]
// This would map to our local folder of /Assets/Templates/Actor/actor-sheet.hbs // This would map to our local folder of /Assets/Templates/Actor/actor-sheet.hbs
const templates: Array<string> = [ const templates: Array<string> = [
"sheets/character/description.hbs",
"sheets/character/attribute.hbs", "sheets/character/attribute.hbs",
"sheets/character/base_values.hbs", "sheets/character/base_values.hbs",
"sheets/character/main.hbs", "sheets/character/main.hbs",
"sheets/character/skills.hbs", "sheets/character/skills.hbs",
"sheets/character/gear.hbs", "sheets/character/gear.hbs",
"sheets/character/spells.hbs", "sheets/character/spells.hbs",
"sheets/character/kampfkuenste.hbs", "sheets/character/combat.hbs",
"sheets/character/effects.hbs", "sheets/character/effects.hbs",
"sheets/partial/mod.hbs", "sheets/partial/mod.hbs",
"sheets/item/rolls.hbs", "sheets/item/rolls.hbs",

27
source/style/Character-sheet.less
View File

@ -197,13 +197,9 @@
font-style: italic; font-style: italic;
background: rgba(0, 0, 0, 0.3); background: rgba(0, 0, 0, 0.3);
color: rgba(255, 255, 255); color: rgba(255, 255, 255);
button {
background: rgba(255, 255, 255, 0.5);
}
} }
button.roll-button { .roll-button {
background: url(/icons/svg/d20-black.svg) no-repeat; background: url(/icons/svg/d20-black.svg) no-repeat;
background-size: 1rem 1rem; background-size: 1rem 1rem;
border: #000000 solid 0px; border: #000000 solid 0px;
@ -211,6 +207,17 @@
height: 1rem; height: 1rem;
} }
.learn-button {
padding: 0;
margin: 0;
height: 1rem;
width: 4rem;
background: rgba(255, 255, 255, 0.5);
font-size: smaller;
text-align: center;
line-height: 0.8rem;
}
span.spell-process { span.spell-process {
color: rgb(93, 93, 93); color: rgb(93, 93, 93);
font-style: italic; font-style: italic;
@ -261,15 +268,23 @@
} }
} }
.biography {
margin: 0.5rem 0.5rem 0.5rem 0.5rem;
height: 180px;
background-color: #eaead7;
}
.attributes { .attributes {
padding: 0.5rem 0.5rem 0.5rem 0.5rem; padding: 0.5rem 0.5rem 0.5rem 0.5rem;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
background-color: beige; background-color: beige;
flex-wrap: wrap;
justify-content: center;
.attribute { .attribute {
flex: 0 0 7rem; flex: 0 0 6rem;
margin: 0; margin: 0;
border: 1px solid @attributeBorderColor; border: 1px solid @attributeBorderColor;
//border-bottom: none; //border-bottom: none;

3
source/template.json
View File

@ -5,6 +5,7 @@
"characterDescription": { "characterDescription": {
"info": { "info": {
"description": "", "description": "",
"background": "",
"class": "", "class": "",
"race": "", "race": "",
"magicUsing": false, "magicUsing": false,
@ -203,7 +204,7 @@
}, },
"equippable": { "equippable": {
"equippable": false, "equippable": false,
"equipped": true "equipped": false
}, },
"valuable": { "valuable": {
"valuable": false, "valuable": false,

285
templates/sheets/character/base_values.hbs
View File

@ -1,168 +1,121 @@
<div class="flexbox">
<div class="flexpart">
<div class="flexpart-header"><img src="icons/skills/melee/maneuver-sword-katana-yellow.webp" class="flexpart-icon">{{localize "midgard5.attributes"}}</div>
<br>
<div class="attributes">
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="st" attribute=data.attributes.st calc=data.calc.attributes.st}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gs" attribute=data.attributes.gs calc=data.calc.attributes.gs}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gw" attribute=data.attributes.gw calc=data.calc.attributes.gw}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="ko" attribute=data.attributes.ko calc=data.calc.attributes.ko}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="in" attribute=data.attributes.in calc=data.calc.attributes.in}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="zt" attribute=data.attributes.zt calc=data.calc.attributes.zt}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="au" attribute=data.attributes.au calc=data.calc.attributes.au}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="pa" attribute=data.attributes.pa calc=data.calc.attributes.pa}}
<div class="filler"></div>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="wk" attribute=data.attributes.wk calc=data.calc.attributes.wk}}
<div class="filler"></div>
</div>
</div>
<table> <div class="flexcolumn-2">
<thead> <div class="flexpart">
<tr> <div class="flexpart-header"><img src="icons/magic/unholy/strike-body-explode-disintegrate.webp" class="flexpart-icon">{{localize "midgard5.derived-attributes"}}</div>
<th class="title" colspan="4">Eigenschaften</th> <table>
</tr> <tbody>
</thead> <tr height = 10px></tr>
<tbody> <tr>
<tr height = 10px></tr> <td>{{localize "midgard5.magicUsing"}}</td>
<tr> <td><input id="data.info.magicUsing" type="checkbox" name="data.info.magicUsing" {{checked data.info.magicUsing}}></td>
<td>{{localize "midgard5.magicUsing"}}</td> <td>&nbsp;</td>
<td><input id="data.info.magicUsing" type="checkbox" name="data.info.magicUsing" {{checked data.info.magicUsing}}></td> <td>&nbsp;</td>
<td>&nbsp;</td> </tr>
<td>&nbsp;</td> <tr>
</tr> <td>{{localize "midgard5.grace"}}</td>
<tr> <td><input name="data.gg" type="text" value="{{data.gg}}" data-dtype="Number" /></td>
<td>{{localize "midgard5.grace"}}</td> <td>{{localize "midgard5.exp-overall"}}</td>
<td><input name="data.gg" type="text" value="{{data.gg}}" data-dtype="Number" /></td> <td><input name="data.es" type="text" value="{{data.es}}" data-dtype="Number" /></td>
<td>{{localize "midgard5.exp-overall"}}</td> </tr>
<td><input name="data.es" type="text" value="{{data.es}}" data-dtype="Number" /></td> <tr>
</tr> <td>{{localize "midgard5.destiny"}}</td>
<tr> <td><input name="data.sg" type="text" value="{{data.sg}}" data-dtype="Number" /></td>
<td>{{localize "midgard5.destiny"}}</td> <td>{{localize "midgard5.exp-available"}}</td>
<td><input name="data.sg" type="text" value="{{data.sg}}" data-dtype="Number" /></td> <td><input name="data.ep" type="text" value="{{data.ep}}" data-dtype="Number" /></td>
<td>{{localize "midgard5.exp-available"}}</td> </tr>
<td><input name="data.ep" type="text" value="{{data.ep}}" data-dtype="Number" /></td> <tr>
</tr> <td>{{localize "midgard5.luckPoints"}}</td>
<tr> <td><input name="data.gp" type="text" value="{{data.gp}}" data-dtype="Number" /></td>
<td>{{localize "midgard5.luckPoints"}}</td> <td>{{localize "midgard5.movementRange"}}</td>
<td><input name="data.gp" type="text" value="{{data.gp}}" data-dtype="Number" /></td> <td><input name="data.movement" type="text" value="{{data.movement}}" data-dtype="Number" /></td>
<td>{{localize "midgard5.movementRange"}}</td> </tr>
<td><input name="data.movement" type="text" value="{{data.movement}}" data-dtype="Number" /></td> <tr height = 10px></tr>
</tr> </tbody>
<tr height = 10px></tr> </table>
</tbody> </div>
</table> </div>
<table style="background-color: beige;"> <div class="flexcolumn-2">
<thead> <div class="flexpart">
<tr> <div class="flexpart-header"><img src="icons/magic/time/arrows-circling-pink.webp" class="flexpart-icon">{{localize "midgard5.calculated-values"}}</div>
<th class="title">Leiteigenschaften</th> <table>
</tr> <tbody>
</thead> <tr height = 10px></tr>
<tbody> <tr>
<tr> <td>{{localize "midgard5.brawl"}}</td>
<td><div class="attributes"> <td class="fixed-value">{{data.calc.stats.brawl.value}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="st" attribute=data.attributes.st calc=data.calc.attributes.st}} <td>{{localize "midgard5.enduranceBonus"}}</td>
<div class="filler"></div> <td class="fixed-value">{{data.calc.stats.enduranceBonus}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gs" attribute=data.attributes.gs calc=data.calc.attributes.gs}} </tr>
<div class="filler"></div> <tr>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gw" attribute=data.attributes.gw calc=data.calc.attributes.gw}} <td>{{localize "midgard5.defense"}}</td>
<div class="filler"></div> <td class="fixed-value">{{data.calc.stats.defense.value}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="ko" attribute=data.attributes.ko calc=data.calc.attributes.ko}} <td>{{localize "midgard5.defenseBonus"}}</td>
<div class="filler"></div> <td class="fixed-value">{{data.calc.stats.defenseBonus.value}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="in" attribute=data.attributes.in calc=data.calc.attributes.in}} </tr>
</div></td> <tr>
</tr> <td>{{localize "midgard5.damageBonus"}}</td>
<tr> <td class="fixed-value">{{data.calc.stats.damageBonus.value}}</td>
<td><div class="attributes"> <td>{{localize "midgard5.attackBonus"}}</td>
<div class="filler"></div> <td class="fixed-value">{{data.calc.stats.attackBonus.value}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="zt" attribute=data.attributes.zt calc=data.calc.attributes.zt}} </tr>
<div class="attribute-filler-fixed"></div> <tr>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="au" attribute=data.attributes.au calc=data.calc.attributes.au}} <td>{{localize "midgard5.spellCasting"}}</td>
<div class="attribute-filler-fixed"></div> <td class="fixed-value">{{data.calc.stats.spellCasting.value}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="pa" attribute=data.attributes.pa calc=data.calc.attributes.pa}} <td>{{localize "midgard5.poisonResistance"}}</td>
<div class="attribute-filler-fixed"></div> <td class="fixed-value">{{data.calc.stats.poisonResistance.value}}</td>
{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="wk" attribute=data.attributes.wk calc=data.calc.attributes.wk}} </tr>
<div class="filler"></div> <tr>
</div></td> <td>{{localize "midgard5.resistanceMind"}}</td>
</tr> <td class="fixed-value">{{data.calc.stats.resistanceMind.value}}</td>
</tbody> <td>{{localize "midgard5.resistanceBody"}}</td>
</table> <td class="fixed-value">{{data.calc.stats.resistanceBody.value}}</td>
</tr>
<table> <tr>
<thead> <td>{{localize "midgard5.movementRange"}}</td>
<tr> <td class="fixed-value">{{data.calc.stats.movement.value}}</td>
<th class="title" colspan="4">Berechnete Werte</th> {{#if (eq data.info.race "Zwerg")}}
</tr> <td>{{localize "midgard5.hoard"}}</td>
</thead> <td class="fixed-value">{{data.calc.stats.hoard}}</td>
<tbody> {{/if}}
<tr height = 10px></tr> </tr>
<tr> <tr>
<td>{{localize "midgard5.brawl"}}</td> {{#if (eq data.info.race "Zwerg")}}
<td class="fixed-value">{{data.calc.stats.brawl.value}}</td> <td>{{localize "midgard5.hoardMin"}}</td>
<td>{{localize "midgard5.enduranceBonus"}}</td> <td class="fixed-value">{{data.calc.stats.hoardMin}}</td>
<td class="fixed-value">{{data.calc.stats.enduranceBonus}}</td> <td>{{localize "midgard5.hoard-next"}}</td>
</tr> <td class="fixed-value">{{data.calc.stats.hoardNext}}</td>
<tr> {{/if}}
<td>{{localize "midgard5.defense"}}</td> </tr>
<td class="fixed-value">{{data.calc.stats.defense.value}}</td> <tr height = 10px></tr>
<td>{{localize "midgard5.defenseBonus"}}</td> </tbody>
<td class="fixed-value">{{data.calc.stats.defenseBonus.value}}</td> </table>
</tr> </div>
<tr> </div>
<td>{{localize "midgard5.damageBonus"}}</td> </div>
<td class="fixed-value">{{data.calc.stats.damageBonus.value}}</td>
<td>{{localize "midgard5.attackBonus"}}</td>
<td class="fixed-value">{{data.calc.stats.attackBonus.value}}</td>
</tr>
<tr>
<td>{{localize "midgard5.spellCasting"}}</td>
<td class="fixed-value">{{data.calc.stats.spellCasting.value}}</td>
<td>{{localize "midgard5.poisonResistance"}}</td>
<td class="fixed-value">{{data.calc.stats.poisonResistance.value}}</td>
</tr>
<tr>
<td>{{localize "midgard5.resistanceMind"}}</td>
<td class="fixed-value">{{data.calc.stats.resistanceMind.value}}</td>
<td>{{localize "midgard5.resistanceBody"}}</td>
<td class="fixed-value">{{data.calc.stats.resistanceBody.value}}</td>
</tr>
<tr>
<td>{{localize "midgard5.movementRange"}}</td>
<td class="fixed-value">{{data.calc.stats.movement.value}}</td>
{{#if (eq data.info.race "Zwerg")}}
<td>{{localize "midgard5.hoard"}}</td>
<td class="fixed-value">{{data.calc.stats.hoard}}</td>
{{/if}}
</tr>
<tr>
{{#if (eq data.info.race "Zwerg")}}
<td>{{localize "midgard5.hoardMin"}}</td>
<td class="fixed-value">{{data.calc.stats.hoardMin}}</td>
<td>{{localize "midgard5.hoard-next"}}</td>
<td class="fixed-value">{{data.calc.stats.hoardNext}}</td>
{{/if}}
</tr>
<tr height = 10px></tr>
</tbody>
</table>
<table>
<thead>
<tr>
<th class="title" colspan="4">Beschreibung</th>
</tr>
</thead>
<tbody>
<tr height = 10px></tr>
<tr>
<td>{{localize "midgard5.origin"}}</td>
<td><input name="data.info.origin" type="text" value="{{data.info.origin}}" data-dtype="String" /></td>
<td>{{localize "midgard5.gender"}}</td>
<td><input name="data.info.gender" type="text" value="{{data.info.gender}}" data-dtype="String" /></td>
</tr>
<tr>
<td>{{localize "midgard5.weight"}}</td>
<td><input name="data.info.weight" type="text" value="{{data.info.weight}}" data-dtype="String" /></td>
<td>{{localize "midgard5.height"}}</td>
<td><input name="data.info.height" type="text" value="{{data.info.height}}" data-dtype="String" /></td>
</tr>
<tr>
<td>{{localize "midgard5.shape"}}</td>
<td><input name="data.info.shape" type="text" value="{{data.info.shape}}" data-dtype="String" /></td>
<td>{{localize "midgard5.age"}}</td>
<td><input name="data.info.age" type="text" value="{{data.info.age}}" data-dtype="String" /></td>
</tr>
<tr>
<td>{{localize "midgard5.caste"}}</td>
<td><input name="data.info.caste" type="text" value="{{data.info.caste}}" data-dtype="String" /></td>
<td>{{localize "midgard5.faith"}}</td>
<td><input name="data.info.faith" type="text" value="{{data.info.faith}}" data-dtype="String" /></td>
</tr>
<tr height = 10px></tr>
</tbody>
</table>
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}

29
templates/sheets/character/kampfkuenste.hbs → templates/sheets/character/combat.hbs
View File

@ -133,4 +133,31 @@
</tr> </tr>
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
<table>
<thead>
<tr>
<th class="title">{{localize "midgard5.weapon-skill"}}</th>
<th class="title">{{localize "midgard5.fw"}}</th>
<th class="title">{{localize "midgard5.bonus"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th>
<th class="title">{{localize "midgard5.pp-short"}}</th>
<th class="title"></th>
<th class="title"></th>
</tr>
</thead>
<tbody>
{{#each data.calc.skills.combat as |skill skillId|}}
<tr data-item="{{skillId}}">
<td class="padding edit-item">{{skill.label}}</td>
<td class="fixed-value">{{skill.fw}}</td>
<td class="fixed-value">{{skill.calc.bonus}}</td>
<td class="fixed-value">{{skill.calc.ew}}</td>
<td class="fixed-value">{{skill.pp}}</td>
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td>
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
</tr>
{{/each}}
</tbody>
</table>

50
templates/sheets/character/description.hbs Normal file
View File

@ -0,0 +1,50 @@
<div class="flexbox">
<div class="flexcolumn-1">
<div class="flexpart">
<div class="flexpart-header"><img src="icons/commodities/cloth/thread-spindle-white-needle.webp" class="flexpart-icon">{{localize "midgard5.characteristics"}}</div>
<table>
<tbody>
<tr height = 10px></tr>
<tr>
<td>{{localize "midgard5.origin"}}</td>
<td><input name="data.info.origin" type="text" value="{{data.info.origin}}" data-dtype="String" /></td>
<td>{{localize "midgard5.gender"}}</td>
<td><input name="data.info.gender" type="text" value="{{data.info.gender}}" data-dtype="String" /></td>
<td>{{localize "midgard5.shape"}}</td>
<td><input name="data.info.shape" type="text" value="{{data.info.shape}}" data-dtype="String" /></td>
<td>{{localize "midgard5.age"}}</td>
<td><input name="data.info.age" type="text" value="{{data.info.age}}" data-dtype="String" /></td>
</tr>
<tr>
<td>{{localize "midgard5.weight"}}</td>
<td><input name="data.info.weight" type="text" value="{{data.info.weight}}" data-dtype="String" /></td>
<td>{{localize "midgard5.height"}}</td>
<td><input name="data.info.height" type="text" value="{{data.info.height}}" data-dtype="String" /></td>
<td>{{localize "midgard5.caste"}}</td>
<td><input name="data.info.caste" type="text" value="{{data.info.caste}}" data-dtype="String" /></td>
<td>{{localize "midgard5.faith"}}</td>
<td><input name="data.info.faith" type="text" value="{{data.info.faith}}" data-dtype="String" /></td>
</tr>
<tr height = 10px></tr>
</tbody>
</table>
</div>
</div>
<div class="flexcolumn-1">
<div class="flexpart" style="height: 250px;">
<div class="flexpart-header"><img src="icons/environment/wilderness/mine-interior-dungeon-door.webp" class="flexpart-icon">{{localize "midgard5.description"}}</div>
<br>
<div class="biography">{{editor characterDescription target="data.info.description"}}</div>
</div>
</div>
<div class="flexcolumn-1">
<div class="flexpart" style="height: 250px;">
<div class="flexpart-header"><img src="icons/environment/people/group.webp" class="flexpart-icon">{{localize "midgard5.background"}}</div>
<br>
<div class="biography">{{editor characterBackground target="data.info.background"}}</div>
</div>
</div>
</div>

2
templates/sheets/character/gear.hbs
View File

@ -2,7 +2,7 @@
<div class="flexcolumn-2"> <div class="flexcolumn-2">
<div class="flexpart"> <div class="flexpart">
<div class="flexpart-header"><img src="icons/commodities/currency/coins-assorted-mix-copper-silver-gold.webp" class="flexpart-icon">Geld</div> <div class="flexpart-header"><img src="icons/commodities/currency/coins-assorted-mix-copper-silver-gold.webp" class="flexpart-icon">{{localize "midgard5.currency"}}</div>
<table> <table>
<thead class="theader"> <thead class="theader">
<tr> <tr>

11
templates/sheets/character/main.hbs
View File

@ -115,18 +115,23 @@
{{!-- Character Sheet Navigation --}} {{!-- Character Sheet Navigation --}}
<nav class="sheet-navigation tabs" data-group="primary"> <nav class="sheet-navigation tabs" data-group="primary">
<a class="item" data-tab="description">{{ localize "midgard5.description" }}</a>
<a class="item active" data-tab="base_values">{{ localize "midgard5.base_values" }}</a> <a class="item active" data-tab="base_values">{{ localize "midgard5.base_values" }}</a>
<a class="item" data-tab="skills">{{ localize "midgard5.skills" }}</a> <a class="item" data-tab="skills">{{ localize "midgard5.skills" }}</a>
<a class="item" data-tab="gear">{{ localize "midgard5.gear" }}</a> <a class="item" data-tab="gear">{{ localize "midgard5.gear" }}</a>
{{#if actor.system.info.magicUsing }} {{#if actor.system.info.magicUsing }}
<a class="item" data-tab="spells">{{ localize "midgard5.spells" }}</a> <a class="item" data-tab="spells">{{ localize "midgard5.spells" }}</a>
{{/if}} {{/if}}
<a class="item" data-tab="kampfkuenste">{{ localize "midgard5.kampfkuenste" }}</a> <a class="item" data-tab="combat">{{ localize "midgard5.combat" }}</a>
<a class="item" data-tab="effects">{{ localize "midgard5.effects" }}</a> <a class="item" data-tab="effects">{{ localize "midgard5.effects" }}</a>
</nav> </nav>
<section class="sheet-content"> <section class="sheet-content">
<div class="tab base_values flexcol" data-group="primary" data-tab="description">
Byroks marked this conversation as resolved Outdated
Byroks commented 2024-01-15 15:48:18 +01:00
Outdated
Review
Copy Link

Beschreibung sollte am ende der Liste stehen, finde es verwirrend das es ganz vorne ist

Beschreibung sollte am ende der Liste stehen, finde es verwirrend das es ganz vorne ist
oskaloq commented 2024-01-15 16:58:50 +01:00
Outdated
Review
Copy Link

Changed + commit

Changed + commit
{{> "systems/midgard5/templates/sheets/character/description.hbs"}}
</div>
<div class="tab base_values flexcol" data-group="primary" data-tab="base_values"> <div class="tab base_values flexcol" data-group="primary" data-tab="base_values">
{{> "systems/midgard5/templates/sheets/character/base_values.hbs"}} {{> "systems/midgard5/templates/sheets/character/base_values.hbs"}}
</div> </div>
@ -143,8 +148,8 @@
{{> "systems/midgard5/templates/sheets/character/spells.hbs"}} {{> "systems/midgard5/templates/sheets/character/spells.hbs"}}
</div> </div>
<div class="tab base_values flexcol" data-group="primary" data-tab="kampfkuenste"> <div class="tab base_values flexcol" data-group="primary" data-tab="combat">
{{> "systems/midgard5/templates/sheets/character/kampfkuenste.hbs"}} {{> "systems/midgard5/templates/sheets/character/combat.hbs"}}
</div> </div>
<div class="tab base_values flexcol" data-group="primary" data-tab="effects"> <div class="tab base_values flexcol" data-group="primary" data-tab="effects">

285
templates/sheets/character/skills.hbs
View File

@ -1,153 +1,142 @@
<table> <div class="flexbox">
<thead> <div class="flexcolumn-2">
<tr>
<th class="title">{{localize "midgard5.learned-skill"}}</th>
<th class="title">{{localize "midgard5.fw"}}</th>
<th class="title">{{localize "midgard5.bonus"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th>
<th class="title">{{localize "midgard5.pp-short"}}</th>
<th class="title"></th>
<th class="title"></th>
</tr>
</thead>
<tbody>
{{#each data.calc.skills.general as |skill skillId|}}
<tr data-item="{{skillId}}">
<td class="padding edit-item">{{skill.label}}</td>
<td class="fixed-value">{{skill.fw}}</td>
<td class="fixed-value">{{skill.calc.bonus}}</td>
<td class="fixed-value">{{skill.calc.ew}}</td>
<td class="fixed-value">{{skill.pp}}</td>
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td>
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
</tr>
{{/each}}
</tbody>
</table>
<table> <div class="flexpart">
<thead> <div class="flexpart-header"><img src="icons/skills/trades/construction-mason-stonecutter-sculpture.webp" class="flexpart-icon">{{localize "midgard5.learned-skills"}}</div>
<tr> <table>
<th class="title">{{localize "midgard5.language"}}</th> <thead>
<th class="title">{{localize "midgard5.fw"}}</th> <tr>
<th class="title">{{localize "midgard5.bonus"}}</th> <th class="title">{{localize "midgard5.learned-skill"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th> <th class="title">{{localize "midgard5.fw"}}</th>
<th class="title">{{localize "midgard5.pp-short"}}</th> <th class="title">{{localize "midgard5.bonus"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.ew"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.pp-short"}}</th>
</tr> <th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
</thead> <th class="title"></th>
<tbody> </tr>
{{#each data.calc.skills.language as |skill skillId|}} </thead>
<tr data-item="{{skillId}}"> <tbody>
<td class="padding edit-item">{{skill.label}}</td> {{#each data.calc.skills.general as |skill skillId|}}
<td class="fixed-value">{{skill.fw}}</td> <tr data-item="{{skillId}}">
<td class="fixed-value">{{skill.calc.bonus}}</td> <td class="padding edit-item">{{skill.label}}</td>
<td class="fixed-value">{{skill.calc.ew}}</td> <td class="fixed-value">{{skill.fw}}</td>
<td class="fixed-value">{{skill.pp}}</td> <td class="fixed-value">{{skill.calc.bonus}}</td>
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td> <td class="fixed-value">{{skill.calc.ew}}</td>
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td> <td class="fixed-value"><input name="data.skills.general.{{key}}.pp" type="text" value="{{skill.pp}}" data-dtype="Number" /></td>
</tr> <td><button class="roll-button roll-learned-button"></button></td>
{{/each}} <td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
</tbody> </tr>
</table> {{/each}}
</tbody>
</table>
</div>
<table> <div class="flexpart">
<thead> <div class="flexpart-header"><img src="icons/creatures/eyes/human-single-brown.webp" class="flexpart-icon">{{localize "midgard5.innate-abilities"}}</div>
<tr> <table>
<th class="title">{{localize "midgard5.innate-ability"}}</th> <thead>
<th class="title">{{localize "midgard5.fw"}}</th> <tr>
<th class="title">{{localize "midgard5.bonus"}}</th> <th class="title">{{localize "midgard5.innate-ability"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th> <th class="title">{{localize "midgard5.fw"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.bonus"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.ew"}}</th>
</tr> <th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
</thead> <th class="title"></th>
<tbody> </tr>
{{#each data.calc.skills.innate as |skill skillId|}} </thead>
<tr data-item="{{skillId}}"> <tbody>
<td class="padding edit-item">{{skill.label}}</td> {{#each data.calc.skills.innate as |skill skillId|}}
<td class="fixed-value">{{skill.fw}}</td> <tr data-item="{{skillId}}">
<td class="fixed-value">{{skill.calc.bonus}}</td> <td class="padding edit-item">{{skill.label}}</td>
<td class="fixed-value">{{skill.calc.ew}}</td> <td class="fixed-value">{{skill.fw}}</td>
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td> <td class="fixed-value">{{skill.calc.bonus}}</td>
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td> <td class="fixed-value">{{skill.calc.ew}}</td>
</tr> <td><button class="roll-button roll-learned-button"></button></td>
{{/each}} <td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
<tr data-item="{{itemId}}"> </tr>
<td class="padding edit-item">{{localize "midgard5.perception"}}</td> {{/each}}
<td class="fixed-value">{{data.calc.stats.perceptionFW}}</td> <tr data-item="{{itemId}}">
<td class="fixed-value">{{data.calc.stats.perception.value}}</td> <td class="padding edit-item">{{localize "midgard5.perception"}}</td>
<td class="fixed-value">{{add data.calc.stats.perception.value data.calc.stats.perceptionFW}}</td> <td class="fixed-value">{{data.calc.stats.perceptionFW}}</td>
<td class="fixed-value"><button class="roll-button roll-perception-button"></button></td> <td class="fixed-value">{{data.calc.stats.perception.value}}</td>
<td class="fixed-value"></td> <td class="fixed-value">{{add data.calc.stats.perception.value data.calc.stats.perceptionFW}}</td>
</tr> <td><button class="roll-button roll-perception-button"></button></td>
<td class="fixed-value"></td>
</tr>
<tr data-item="{{itemId}}"> <tr data-item="{{itemId}}">
<td class="padding edit-item">{{localize "midgard5.drinking"}}</td> <td class="padding edit-item">{{localize "midgard5.drinking"}}</td>
<td class="fixed-value">{{data.calc.stats.drinkingFW}}</td> <td class="fixed-value">{{data.calc.stats.drinkingFW}}</td>
<td class="fixed-value">{{data.calc.stats.drinking.value}}</td> <td class="fixed-value">{{data.calc.stats.drinking.value}}</td>
<td class="fixed-value">{{add data.calc.stats.drinking.value data.calc.stats.drinkingFW}}</td> <td class="fixed-value">{{add data.calc.stats.drinking.value data.calc.stats.drinkingFW}}</td>
<td class="fixed-value"><button class="roll-button roll-drinking-button"></button></td> <td><button class="roll-button roll-drinking-button"></button></td>
<td class="fixed-value"></td> <td class="fixed-value"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
<table> <div class="flexpart">
<thead> <div class="flexpart-header"><img src="icons/sundries/scrolls/scroll-runed-worn-tan.webp" class="flexpart-icon">{{localize "midgard5.languages"}}</div>
<tr> <table>
<th class="title">{{localize "midgard5.weapon-skill"}}</th> <thead>
<th class="title">{{localize "midgard5.fw"}}</th> <tr>
<th class="title">{{localize "midgard5.bonus"}}</th> <th class="title">{{localize "midgard5.language"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th> <th class="title">{{localize "midgard5.fw"}}</th>
<th class="title">{{localize "midgard5.pp-short"}}</th> <th class="title">{{localize "midgard5.bonus"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.ew"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.pp-short"}}</th>
</tr> <th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
</thead> <th class="title"></th>
<tbody> </tr>
{{#each data.calc.skills.combat as |skill skillId|}} </thead>
<tr data-item="{{skillId}}"> <tbody>
<td class="padding edit-item">{{skill.label}}</td> {{#each data.calc.skills.language as |skill skillId|}}
<td class="fixed-value">{{skill.fw}}</td> <tr data-item="{{skillId}}">
<td class="fixed-value">{{skill.calc.bonus}}</td> <td class="padding edit-item">{{skill.label}}</td>
<td class="fixed-value">{{skill.calc.ew}}</td> <td class="fixed-value">{{skill.fw}}</td>
<td class="fixed-value">{{skill.pp}}</td> <td class="fixed-value">{{skill.calc.bonus}}</td>
<td class="fixed-value"><button class="roll-button roll-learned-button"></button></td> <td class="fixed-value">{{skill.calc.ew}}</td>
<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td> <td class="fixed-value">{{skill.pp}}</td>
</tr> <td><button class="roll-button roll-learned-button"></button></td>
{{/each}} <td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
</tbody> </tr>
</table> {{/each}}
</tbody>
</table>
</div>
</div>
<table> <div class="flexcolumn-2">
<thead>
<tr> <div class="flexpart">
<th class="title"></th> <div class="flexpart-header"><img src="icons/sundries/gaming/dice-pair-white-green.webp" class="flexpart-icon">{{localize "midgard5.unlearned-skills"}}</div>
<th class="title">{{localize "midgard5.unlearned-skill"}}</th> <table>
<th class="title">{{localize "midgard5.fw"}}</th> <thead>
<th class="title">{{localize "midgard5.bonus"}}</th> <tr>
<th class="title">{{localize "midgard5.ew"}}</th> <th class="title"></th>
<th class="title">{{localize "midgard5.pp-short"}}</th> <th class="title">{{localize "midgard5.unlearned-skill"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.fw"}}</th>
<th class="title"></th> <th class="title">{{localize "midgard5.bonus"}}</th>
</tr> <th class="title">{{localize "midgard5.ew"}}</th>
</thead> <th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
<tbody> </tr>
{{#each data.skills.general as |skill key|}} </thead>
{{#unless (isSkillInList (localizeMidgard key) ../actor.system.calc.skills.general) }} <tbody>
<tr data-skill="{{key}}"> {{#each data.skills.general as |skill key|}}
<td><button class="learn-button">{{localize "midgard5.learn"}}</button></td> {{#unless (isSkillInList (localizeMidgard key) ../actor.system.calc.skills.general) }}
<td class="padding">{{localizeMidgard key}}</td> <tr data-skill="{{key}}">
<td class="fixed-value">{{skill.fw}}</td> <td><button class="learn-button">{{localize "midgard5.learn"}}</button></td>
<td class="fixed-value">{{skillBonus ../actor._id skill}}</td> <td class="padding" style="font-style: italic;">{{localizeMidgard key}}</td>
<td class="fixed-value">{{skillEw ../actor._id skill}}</td> <td class="fixed-value">{{skill.fw}}</td>
<td class="fixed-value"><input name="data.skills.general.{{key}}.pp" type="text" value="{{skill.pp}}" data-dtype="Number" /></td> <td class="fixed-value">{{skillBonus ../actor._id skill}}</td>
<td class="fixed-value"><button class="roll-button roll-general-button"></button></td> <td class="fixed-value">{{skillEw ../actor._id skill}}</td>
<td class="fixed-value"></td> <td><button class="roll-button roll-general-button"></button></td>
</tr> </tr>
{{/unless}} {{/unless}}
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
</div>
</div>
</div>