Merge pull request #142 from unrealkakeman89/cyr-power-point-ui

Adding powers fix and powercasting dropdown
This commit is contained in:
supervj 2021-02-17 20:53:18 -05:00 committed by GitHub
commit 4fd32de1cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 15 deletions

View file

@ -695,6 +695,10 @@
}
}
.powercasting {
text-transform: capitalize;
}
.languages {
grid-column-end: span 1;
label {
@ -982,7 +986,7 @@
}
& > .panel {
grid-template-rows: 56px 32px 24px auto;
grid-template-rows: 64px 32px 24px auto;
}
h3.power-dc {
line-height: 24px;
@ -1083,9 +1087,6 @@
margin-left: auto;
}
}
// section.traits {
// display:block;
// }
}
}
.tab.force-powerbook,

View file

@ -222,7 +222,7 @@ export default class ActorSheet5e extends ActorSheet {
* @param {Array} powers The power data being prepared
* @private
*/
_preparePowerbook(data, powers) {
_preparePowerbook(data, powers, school) {
const owner = this.actor.owner;
const levels = data.data.powers;
const powerbook = {};
@ -252,7 +252,7 @@ export default class ActorSheet5e extends ActorSheet {
uses: useLabels[i] || value || 0,
slots: useLabels[i] || max || 0,
override: override || 0,
dataset: {"type": "power", "level": prepMode in sections ? 1 : i, "preparation.mode": prepMode},
dataset: {"type": "power", "level": prepMode in sections ? 1 : i, "preparation.mode": prepMode, "school": school},
prop: sl
};
};

View file

@ -142,8 +142,8 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e {
}
// Organize Powerbook and count the number of prepared powers (excluding always, at will, etc...)
const forcePowerbook = this._preparePowerbook(data, forcepowers);
const techPowerbook = this._preparePowerbook(data, techpowers);
const forcePowerbook = this._preparePowerbook(data, forcepowers, "uni");
const techPowerbook = this._preparePowerbook(data, techpowers, "tec");
// Organize Features
const features = {

View file

@ -61,8 +61,8 @@ export default class ActorSheet5eNPCNew extends ActorSheet5e {
other = this._filterItems(other, this._filters.features);
// Organize Powerbook
const forcePowerbook = this._preparePowerbook(data, forcepowers);
const techPowerbook = this._preparePowerbook(data, techpowers);
const forcePowerbook = this._preparePowerbook(data, forcepowers, "uni");
const techPowerbook = this._preparePowerbook(data, techpowers, "tec");
// Organize Features
for ( let item of other ) {

View file

@ -1362,6 +1362,9 @@ input[type="reset"]:disabled {
.sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .trait-selector i.fas:hover {
text-shadow: none;
}
.sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .powercasting {
text-transform: capitalize;
}
.sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .languages {
grid-column-end: span 1;
}
@ -1610,7 +1613,7 @@ input[type="reset"]:disabled {
}
.sw5e.sheet.actor .swalt-sheet .tab.force-powerbook > .panel,
.sw5e.sheet.actor .swalt-sheet .tab.tech-powerbook > .panel {
grid-template-rows: 56px 32px 24px auto;
grid-template-rows: 64px 32px 24px auto;
}
.sw5e.sheet.actor .swalt-sheet .tab.force-powerbook h3.power-dc,
.sw5e.sheet.actor .swalt-sheet .tab.tech-powerbook h3.power-dc {

View file

@ -47,7 +47,6 @@
<h1>{{localize "SW5E.PowercasterLevel"}}</h1>
<div class="attribute-value">
<div></div>
<input class="powercasting-level" type="text" name="data.details.powerForceLevel" value="{{data.details.powerForceLevel}}" data-dtype="Number" placeholder="0" />
</div>
{{else}}
@ -139,7 +138,7 @@
<li class="item flexrow inventory-header powerbook-header powerbook-empty">
<div class="item-controls">
<a class="item-control item-create" title="{{localize 'SW5E.PowerCreate'}}" data-type="power"
data-level="{{lvl}}"><i class="fas fa-plus"></i> {{localize "SW5E.PowerAdd"}}</a>
data-level="{{lvl}}" data-school="uni"><i class="fas fa-plus"></i> {{localize "SW5E.PowerAdd"}}</a>
</div>
</li>
<li class="item flexrow">

View file

@ -29,7 +29,6 @@
<h1>{{localize "SW5E.PowercasterLevel"}}</h1>
<div class="attribute-value">
<div></div>
<input class="powercasting-level" type="text" name="data.details.powerTechLevel" value="{{data.details.powerTechLevel}}" data-dtype="Number" placeholder="0" />
</div>
{{else}}
@ -121,7 +120,7 @@
<li class="item flexrow inventory-header powerbook-header powerbook-empty">
<div class="item-controls">
<a class="item-control item-create" title="{{localize 'SW5E.PowerCreate'}}" data-type="power"
data-level="{{lvl}}"><i class="fas fa-plus"></i> {{localize "SW5E.PowerAdd"}}</a>
data-level="{{lvl}}" data-school="tec"><i class="fas fa-plus"></i> {{localize "SW5E.PowerAdd"}}</a>
</div>
</li>
<li class="item flexrow">

View file

@ -69,6 +69,18 @@
{{/select}}
</select>
</label>
{{#if isNPC}}
<label>
{{localize "SW5E.Powercasting"}}
<select class="powercasting" name="data.attributes.powercasting">
{{#select data.attributes.powercasting}}
{{#each config.powerMaxLevel as |id class|}}
<option value="{{class}}">{{class}}</option>
{{/each}}
{{/select}}
</select>
</label>
{{/if}}
<label class="{{#unless data.traits.senses}}inactive{{/unless}}">
{{#unless isVehicle}}
<label>{{localize "SW5E.Senses"}}</label>