Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: missing range field on flat weapons sheet #1503

Merged
merged 3 commits into from
Dec 1, 2023
Merged

fix: missing range field on flat weapons sheet #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e9e7b1
fix: missing range field on flat weapons sheet
marvin9257 Dec 1, 2023
f8708f4
fix: range value in dialog max on decimal display
marvin9257 Dec 1, 2023
219d776
fix: make it two digits
marvin9257 Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/module/entities/TwodsixItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default class TwodsixItem extends Item {
if (targetTokens.length === 1) {
const targetRange = canvas.grid.measureDistance(controlledTokens[0], targetTokens[0], {gridSpaces: true});
rangeModifier = this.getRangeModifier(targetRange);
rangeLabel = isCEBands ? (this.system.rangeBand === 'none' ? game.i18n.localize(localizePrefix + "none") : `${game.i18n.localize(localizePrefix + getRangeBand(targetRange))}`) : `${targetRange} ${canvas.scene.grid.units}`;
rangeLabel = isCEBands ? (this.system.rangeBand === 'none' ? game.i18n.localize(localizePrefix + "none") : `${game.i18n.localize(localizePrefix + getRangeBand(targetRange))}`) : `${targetRange.toLocaleString(game.i18n.lang, {maximumFractionDigits: 2})} ${canvas.scene.grid.units}`;
} else if (targetTokens.length === 0) {
rangeLabel = isCEBands && this.system.rangeBand === 'none' ? game.i18n.localize(localizePrefix + "none") : game.i18n.localize("TWODSIX.Ship.Unknown");
}
Expand Down
9 changes: 9 additions & 0 deletions static/templates/items/parts/weapon-sheet-flat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
<label class="resource-label" for="system.handlingModifiers">{{localize "TWODSIX.Items.Weapon.HandlingModifiers"}}</label>
<input class="form-input" id="system.handlingModifiers" type="text" placeholder="{{localize 'TWODSIX.Items.Weapon.HandlingExample'}}" name="system.handlingModifiers" value="{{system.handlingModifiers}}">
</div>
<div class="item-range">
{{#if settings.ShowRangeBandAndHideRange}}
<label class="resource-label" for="system.rangeBand">{{localize "TWODSIX.Items.Weapon.rangeBand"}}</label>
<select id="system.rangeBand" name="system.rangeBand">{{selectOptions settings.rangeTypes selected=system.rangeBand localize=true}}</select>
{{else}}
<label class="resource-label" for="system.range">{{localize "TWODSIX.Items.Weapon.Range"}}</label>
<input class="form-input" id="system.range" type="text" name="system.range" value="{{system.range}}">
{{/if}}
</div>
{{> "systems/twodsix/templates/items/parts/weapon-parts/weapon-attack.html"}}
{{> "systems/twodsix/templates/items/parts/weapon-parts/weapon-magazine.html"}}

Expand Down