This commit is contained in:
LeRatierBretonnien 2023-03-09 13:53:19 +01:00
parent 7827e07e1c
commit bfad3d1e5f
7 changed files with 33 additions and 16 deletions

View File

@ -58,6 +58,7 @@
"WH.conf.yes": "Yes", "WH.conf.yes": "Yes",
"WH.conf.no": "No", "WH.conf.no": "No",
"WH.conf.notapplicable": "Not applicable", "WH.conf.notapplicable": "Not applicable",
"WH.conf.undefined": "Not applicable",
"WH.ui.level": "Level", "WH.ui.level": "Level",
"WH.ui.notes": "Notes", "WH.ui.notes": "Notes",

View File

@ -57,7 +57,7 @@ export class WarheroActorSheet extends ActorSheet {
subActors: duplicate(this.actor.getSubActors()), subActors: duplicate(this.actor.getSubActors()),
competency: this.actor.getCompetency(), competency: this.actor.getCompetency(),
race: duplicate(race), race: duplicate(race),
class: duplicate(this.actor.getClass()), classes: duplicate(this.actor.getClasses()),
totalMoney: this.actor.computeTotalMoney(), totalMoney: this.actor.computeTotalMoney(),
//moneys: duplicate(this.actor.getMoneys()), //moneys: duplicate(this.actor.getMoneys()),
description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),

View File

@ -162,6 +162,11 @@ export class WarheroActor extends Actor {
let classWH = this.items.filter(item => item.type == 'class') let classWH = this.items.filter(item => item.type == 'class')
return classWH[0] ?? []; return classWH[0] ?? [];
} }
getClasses() {
let comp = duplicate(this.items.filter(item => item.type == "class") || []);
WarheroUtility.sortArrayObjectsByName(comp)
return comp;
}
/* -------------------------------------------- */ /* -------------------------------------------- */
checkAndPrepareEquipment(item) { checkAndPrepareEquipment(item) {
} }
@ -254,7 +259,7 @@ export class WarheroActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getNormalSkills() { getNormalSkills() {
let comp = this.items.filter(it => it.type == "skill" && !it.system.classskill) let comp = this.items.filter(it => it.type == "skill" && !it.system.classskill && !it.system.raceskill)
WarheroUtility.sortArrayObjectsByName(comp) WarheroUtility.sortArrayObjectsByName(comp)
return comp return comp
} }

View File

@ -1491,6 +1491,11 @@ li {
max-width: 22rem; max-width: 22rem;
min-width: 22rem; min-width: 22rem;
} }
.item-name-label-long3 {
flex-grow: 2;
max-width: 32rem;
min-width: 32rem;
}
.item-name-label-level2 { .item-name-label-level2 {
flex-grow: 2; flex-grow: 2;
max-width: 9rem; max-width: 9rem;

View File

@ -107,7 +107,7 @@
"styles": [ "styles": [
"styles/simple.css" "styles/simple.css"
], ],
"version": "10.0.36", "version": "10.0.37",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "10",
"verified": "10", "verified": "10",
@ -115,7 +115,7 @@
}, },
"title": "Warhero RPG", "title": "Warhero RPG",
"manifest": "https://www.uberwald.me/gitea/public/fvtt-warhero/raw/branch/master/system.json", "manifest": "https://www.uberwald.me/gitea/public/fvtt-warhero/raw/branch/master/system.json",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.36.zip", "download": "https://www.uberwald.me/gitea/uberwald/fvtt-warhero/archive/fvtt-warhero-10.0.37.zip",
"url": "https://www.uberwald.me/gitea/public/fvtt-warhero", "url": "https://www.uberwald.me/gitea/public/fvtt-warhero",
"background": "images/ui/warhero_welcome_page.webp", "background": "images/ui/warhero_welcome_page.webp",
"id": "fvtt-warhero" "id": "fvtt-warhero"

View File

@ -27,6 +27,7 @@
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div> </div>
</li> </li>
{{#each classes as |class idx|}}
<li class="item flexrow list-item" data-item-id="{{class._id}}"> <li class="item flexrow list-item" data-item-id="{{class._id}}">
<label class="item-field-label-medium">{{localize "WH.ui.class"}}</label> <label class="item-field-label-medium">{{localize "WH.ui.class"}}</label>
<a class="item-edit"><img class="sheet-competence-img" src="{{class.img}}"></a> <a class="item-edit"><img class="sheet-competence-img" src="{{class.img}}"></a>
@ -35,6 +36,7 @@
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div> </div>
</li> </li>
{{/each}}
<li class="item flexrow list-item" > <li class="item flexrow list-item" >
<label class="item-field-label-medium">{{localize "WH.ui.religion"}}</label> <label class="item-field-label-medium">{{localize "WH.ui.religion"}}</label>
<input type="text" class="item-field-label-medium" name="system.biodata.religion" value="{{system.biodata.religion}}" data-dtype="String" /> <input type="text" class="item-field-label-medium" name="system.biodata.religion" value="{{system.biodata.religion}}" data-dtype="String" />
@ -458,10 +460,10 @@
<li class="item stat flexrow list-item list-item-shadow" data-item-id="{{power._id}}"> <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{power._id}}">
<a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
src="{{power.img}}" /></a> src="{{power.img}}" /></a>
<span class="item-name-label"> <span class="item-name-label-long3">
<a class="power-roll"><i class="fa-solid fa-dice-d20"></i>{{power.name}}</a> <a class="power-roll"><i class="fa-solid fa-dice-d20"></i>{{power.name}}</a>
</span> </span>
<span class="item-name-label"> <span class="item-name-label-medium">
<a class="power-roll">{{power.system.level}}</a> <a class="power-roll">{{power.system.level}}</a>
</span> </span>
<div class="item-filler">&nbsp;</div> <div class="item-filler">&nbsp;</div>
@ -523,6 +525,10 @@
</label> </label>
</span> </span>
<span class="item-field-label-medium">
<label class="short-label">{{localize (concat "WH.conf." item.system.isidentified)}}</label>
</span>
<div class="item-filler">&nbsp;</div> <div class="item-filler">&nbsp;</div>
<div class="item-controls item-controls-fixed"> <div class="item-controls item-controls-fixed">
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a> <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>

View File

@ -12,8 +12,8 @@
</li> </li>
<li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.identified"}}</label> <li class="flexrow"><label class="item-field-label-medium ">{{localize "WH.ui.identified"}}</label>
<select class="item-field-label-long " type="text" name="system.identified" value="{{system.identified}}" data-dtype="String"> <select class="item-field-label-long " type="text" name="system.isidentified" value="{{system.isidentified}}" data-dtype="String">
{{#select system.identified}} {{#select system.isidentified}}
{{#each config.identifiedState as |type key|}} {{#each config.identifiedState as |type key|}}
<option value="{{key}}">{{localize type}}</option> <option value="{{key}}">{{localize type}}</option>
{{/each}} {{/each}}