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/container bugs v10 #216

Merged
merged 2 commits into from
Sep 1, 2022
Merged

Fix/container bugs v10 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7f3499
fix: typo preventing character sheets opening
anthonyronda Sep 1, 2022
58be5e1
fix: monster sheets blanking
anthonyronda Sep 1, 2022
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/actor/character-sheet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export class OseActorSheetCharacter extends OseActorSheet {
arrayItemData.itemIds = containerContents[container.id] || [];
arrayItemData.totalWeight = containerContents[container.id]?.reduce(
(acc, item) => {
containedItemData = isNewerVersion(game.version, "10.264")
const containedItemData = isNewerVersion(game.version, "10.264")
? item?.system
: item?.data?.data; // v9-compatibility
return (
Expand Down
38 changes: 19 additions & 19 deletions src/templates/actors/partials/monster-attributes-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@ <h4 class="attribute-name box-title" title="{{localize 'OSE.Health'}}">{{ locali
<a class="hp-roll"><i class="fas fa-dice"></i></a>
</h4>
<div class="attribute-value flexrow">
<input name="data.hp.value" type="text" value="{{data.hp.value}}" data-dtype="Number"
<input name="system.hp.value" type="text" value="{{system.hp.value}}" data-dtype="Number"
placeholder="0" />
<span class="sep"> / </span>
<input name="data.hp.max" type="text" value="{{data.hp.max}}" data-dtype="Number" placeholder="0" />
<input name="system.hp.max" type="text" value="{{system.hp.max}}" data-dtype="Number" placeholder="0" />
</div>
</li>
<li class="attribute hit-dice">
<h4 class="attribute-name box-title" title="{{localize 'OSE.HitDice'}}">
<a>{{ localize "OSE.HitDiceShort" }}</a>
</h4>
<div class="attribute-value">
<input name="data.hp.hd" type="text" value="{{data.hp.hd}}" data-dtype="String" />
<input name="system.hp.hd" type="text" value="{{system.hp.hd}}" data-dtype="String" />
</div>
</li>
<li class="attribute">
{{#if config.ascendingAC}}
<h4 class="attribute-name box-title" title="{{ localize 'OSE.ArmorClass' }}">
{{ localize "OSE.AscArmorClassShort" }}</h4>
<div class="attribute-value">
<input name="data.aac.value" type="text" value="{{data.aac.value}}" data-dtype="Number"
<input name="system.aac.value" type="text" value="{{system.aac.value}}" data-dtype="Number"
placeholder="10" data-dtype="Number" />
</div>
{{else}}
<h4 class="attribute-name box-title" title="{{ localize 'OSE.ArmorClass' }}">
{{ localize "OSE.ArmorClassShort" }}</h4>
<div class="attribute-value">
<input name="data.ac.value" type="text" value="{{data.ac.value}}" data-dtype="Number"
<input name="system.ac.value" type="text" value="{{system.ac.value}}" data-dtype="Number"
placeholder="9" data-dtype="Number" />
</div>
{{/if}}
Expand All @@ -42,25 +42,25 @@ <h4 class="attribute-name box-title" title="{{ localize 'OSE.ArmorClass' }}">
<h4 class="attribute-name box-title" title="{{localize 'OSE.AB'}}"><a>{{ localize "OSE.ABShort" }}</a>
</h4>
<div class="attribute-value">
<input name="data.thac0.bba" type="text" value="{{data.thac0.bba}}" placeholder="0"
<input name="system.thac0.bba" type="text" value="{{system.thac0.bba}}" placeholder="0"
data-dtype="Number" />
</div>
{{else}}
<h4 class="attribute-name box-title" title="{{localize 'OSE.Thac0'}}"><a>{{ localize "OSE.Thac0" }}</a>
</h4>
<div class="attribute-value">
<input name="data.thac0.value" type="text" value="{{data.thac0.value}}" placeholder="0"
<input name="system.thac0.value" type="text" value="{{system.thac0.value}}" placeholder="0"
data-dtype="Number" />
</div>
{{/if}}
</li>
{{#if data.retainer.enabled}}
{{#if system.retainer.enabled}}
<li class="attribute">
<h4 class="attribute-name box-title" title="{{ localize 'OSE.Loyalty' }}">
{{ localize "OSE.LoyaltyShort" }}
</h4>
<div class="attribute-value">
<input name="data.retainer.loyalty" type="text" value="{{data.retainer.loyalty}}" placeholder="0"
<input name="system.retainer.loyalty" type="text" value="{{system.retainer.loyalty}}" placeholder="0"
data-dtype="Number" />
</div>
</li>
Expand All @@ -70,7 +70,7 @@ <h4 class="attribute-name box-title" title="{{localize 'OSE.movement.base'}}">
{{ localize "OSE.movement.short" }}
</h4>
<div class="attribute-value">
<input name="data.movement.base" type="text" value="{{data.movement.base}}" placeholder="0"
<input name="system.movement.base" type="text" value="{{system.movement.base}}" placeholder="0"
data-dtype="Number" />
</div>
</li>
Expand All @@ -97,7 +97,7 @@ <h4 class="attribute-name box-title" title="{{localize 'OSE.movement.base'}}">
{{#each attackPatterns as |section pattern|}}
<ol class="attack-pattern">
{{#each section as |item|}}
<li class="item-entry {{#if (or item.data.data.roll (eq item.type 'weapon'))}}item-rollable{{/if}}"
<li class="item-entry {{#if (or item.system.roll (eq item.type 'weapon'))}}item-rollable{{/if}}"
data-item-id="{{item.id}}">
<div class="item-header flexrow">
<div class="item-pattern pattern-{{pattern}}" title="{{localize 'OSE.items.pattern'}}">
Expand All @@ -109,10 +109,10 @@ <h4 class="item-name" title="{{item.name}}">
</h4>
{{#if (eq type "weapon")}}
<div class="field-long counter flexrow">
<input type="text" value="{{item.data.data.counter.value}}" data-dtype="Number"
<input type="text" value="{{item.system.counter.value}}" data-dtype="Number"
placeholder="0" data-field="value" title="{{localize 'OSE.items.roundAttacks'}}">
/
<input type="text" value="{{item.data.data.counter.max}}" data-field="max"
<input type="text" value="{{item.system.counter.max}}" data-field="max"
data-dtype="Number" placeholder="0"
title="{{localize 'OSE.items.roundAttacksMax'}}">
</div>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h4 class="item-name" title="{{item.name}}">
<li class="attacks-description">
{{#unless isNew}}
<label>{{ localize "OSE.movement.details" }}</label>
<input name="data.movement.value" type="text" value="{{data.movement.value}}" data-dtype="String" />
<input name="system.movement.value" type="text" value="{{system.movement.value}}" data-dtype="String" />
{{else}}
<button data-action="generate-saves">{{localize "OSE.dialog.generateSaves"}}</button>
{{/unless}}
Expand All @@ -155,39 +155,39 @@ <h4 class="attribute-name box-title">
<a>{{ localize "OSE.saves.death.long" }}</a>
</h4>
<div class="attribute-value">
<input name="data.saves.death.value" type="text" value="{{data.saves.death.value}}"
<input name="system.saves.death.value" type="text" value="{{system.saves.death.value}}"
placeholder="0" data-dtype="Number" />
</li>
<li class="attribute saving-throw" data-save="wand">
<h4 class="attribute-name box-title">
<a>{{ localize "OSE.saves.wand.long" }}</a>
</h4>
<div class="attribute-value">
<input name="data.saves.wand.value" type="text" value="{{data.saves.wand.value}}"
<input name="system.saves.wand.value" type="text" value="{{system.saves.wand.value}}"
placeholder="0" data-dtype="Number" />
</li>
<li class="attribute saving-throw" data-save="paralysis">
<h4 class="attribute-name box-title">
<a>{{ localize "OSE.saves.paralysis.long" }}</a>
</h4>
<div class="attribute-value">
<input name="data.saves.paralysis.value" type="text" value="{{data.saves.paralysis.value}}"
<input name="system.saves.paralysis.value" type="text" value="{{system.saves.paralysis.value}}"
placeholder="0" data-dtype="Number" />
</li>
<li class="attribute saving-throw" data-save="breath">
<h4 class="attribute-name box-title">
<a>{{ localize "OSE.saves.breath.long" }}</a>
</h4>
<div class="attribute-value">
<input name="data.saves.breath.value" type="text" value="{{data.saves.breath.value}}"
<input name="system.saves.breath.value" type="text" value="{{system.saves.breath.value}}"
placeholder="0" data-dtype="Number" />
</li>
<li class="attribute saving-throw" data-save="spell">
<h4 class="attribute-name box-title">
<a>{{ localize "OSE.saves.spell.long" }}</a>
</h4>
<div class="attribute-value">
<input name="data.saves.spell.value" type="text" value="{{data.saves.spell.value}}"
<input name="system.saves.spell.value" type="text" value="{{system.saves.spell.value}}"
placeholder="0" />
</li>
</ul>
Expand Down
28 changes: 16 additions & 12 deletions src/templates/actors/partials/monster-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ <h1 class="charname">
<div>
<input
type="text"
name="data.details.alignment"
value="{{data.details.alignment}}"
name="system.details.alignment"
value="{{system.details.alignment}}"
/>
<label>{{localize 'OSE.details.alignment'}}</label>
</div>
Expand All @@ -31,8 +31,8 @@ <h1 class="charname">
<div>
<input
type="text"
name="data.details.appearing.d"
value="{{data.details.appearing.d}}"
name="system.details.appearing.d"
value="{{system.details.appearing.d}}"
/>
<label>{{localize 'OSE.details.appearing'}}</label>
</div>
Expand All @@ -48,8 +48,8 @@ <h1 class="charname">
<div>
<input
type="text"
name="data.details.appearing.w"
value="{{data.details.appearing.w}}"
name="system.details.appearing.w"
value="{{system.details.appearing.w}}"
/>
</div>
)
Expand All @@ -65,8 +65,8 @@ <h1 class="charname">
<div>
<input
type="text"
name="data.details.morale"
value="{{data.details.morale}}"
name="system.details.morale"
value="{{system.details.morale}}"
/>
<label>{{localize 'OSE.details.morale'}}</label>
</div>
Expand All @@ -78,14 +78,18 @@ <h1 class="charname">
</ul>
<ul class="summary flexrow">
<li>
<input type="text" name="data.details.xp" value="{{data.details.xp}}" />
<input
type="text"
name="system.details.xp"
value="{{system.details.xp}}"
/>
<label>{{localize 'OSE.details.experience.award'}}</label>
</li>
<li>
<input
type="text"
name="data.details.specialAbilities"
value="{{data.details.specialAbilities}}"
name="system.details.specialAbilities"
value="{{system.details.specialAbilities}}"
/>
<label title="Special Abilities"
>{{localize 'OSE.details.special.abilities'}}</label
Expand All @@ -95,7 +99,7 @@ <h1 class="charname">
class="treasure-table"
title="{{localize 'OSE.details.treasureTableHint'}}"
>
<div>{{{data.details.treasure.link}}}</div>
<div>{{{system.details.treasure.link}}}</div>
<label>{{localize 'OSE.details.treasure'}}</label>
</li>
</ul>
Expand Down