Skip to content

Commit

Permalink
closes #840, closes #841
Browse files Browse the repository at this point in the history
  • Loading branch information
Muttley committed Jul 9, 2024
1 parent b6773b7 commit 9656e62
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 27 deletions.
2 changes: 2 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@
* [#835] Update Sleep spell description to the latest version
* [#837] AC not displaying consistently when adding effects
* [#839] Free Carry item calculation wrong if you have duplicate items instead of just using item quantity
* [#841] Compendium item links no longer working in Foundry v12

## Chores
* [#813] Merged Finnish language updates from Crowdin
* [#829] Remove all Tours
* [#840] Remove Roll Initiative button from character sheet

**NOTE:** We have found that the Tours are very fragile and onerous to maintain; needing to be tested/updated when even minor changes are made to the interface. Therefore we are removing them and will rely on alternate methods of teaching the system.

Expand Down
1 change: 0 additions & 1 deletion i18n/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,6 @@ SHADOWDARK.sheet.player.luck: Luck
SHADOWDARK.sheet.player.melee_attacks: Melee Attacks
SHADOWDARK.sheet.player.name.label: Name
SHADOWDARK.sheet.player.ranged_attacks: Ranged Attacks
SHADOWDARK.sheet.player.roll_initiative: Roll Initiative
SHADOWDARK.sheet.player.spells_from_items: Spells From Items
SHADOWDARK.sheet.player.spells_tier: Tier
SHADOWDARK.sheet.player.spells: Spells
Expand Down
1 change: 1 addition & 0 deletions system/src/apps/LevelUpSD.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export default class LevelUpSD extends FormApplication {
// checks for effects on talent and prompts if needed
let talentObj = await shadowdark.utils.createItemWithEffect(talentItem);
talentObj.system.level = this.data.targetLevel;
talentObj.uuid = talentItem.uuid;
this.data.talents.push(talentObj);
this.render();
}
Expand Down
11 changes: 0 additions & 11 deletions system/src/sheets/ActorSheetSD.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ export default class ActorSheetSD extends ActorSheet {
event => this._onItemSelection(event)
);

html.find("[data-action='roll-initiative']").click(
event => this._onRollInitiative(event)
);

html.find("[data-action='show-details']").click(
event => shadowdark.utils.toggleItemDetails(event.currentTarget)
);
Expand Down Expand Up @@ -212,13 +208,6 @@ export default class ActorSheetSD extends ActorSheet {
this.actor.rollHP();
}

async _onRollInitiative(event) {
event.preventDefault();

// User the default roll available to each Actor / Token
await this.actor.rollInitiative({ createCombatants: false, rerollInitiative: false});
}

async _onRollAbilityCheck(event) {
event.preventDefault();

Expand Down
9 changes: 0 additions & 9 deletions system/templates/actors/player/abilities.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@
{{> actors/player/abilities/ac }}
{{> actors/player/abilities/luck }}
{{> actors/player/abilities/stats }}
<div class="grid-colspan-2">
<a
class="rollable large"
data-action="roll-initiative"
>
<i class="fa-solid fa-dice-d20"></i>
{{localize 'SHADOWDARK.sheet.player.roll_initiative'}}
</a>
</div>
</div>
<div class="grid-1-columns">
{{> actors/player/abilities/attacks }}
Expand Down
8 changes: 4 additions & 4 deletions system/templates/actors/player/details.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</div>
<div class="content">
{{#if isSpellcaster}}<a class="fas fa-book" data-action="open-spellbook" style="margin-right:4px"></a>{{/if}}
<a class="content-link" data-uuid="{{system.class}}">{{uuidToName system.class}}</a>
<a class="content-link" data-link data-uuid="{{system.class}}">{{uuidToName system.class}}</a>
</div>
</div>

Expand Down Expand Up @@ -88,7 +88,7 @@
</span>
</div>
<div class="content">
<a class="content-link" data-uuid="{{system.ancestry}}">{{uuidToName system.ancestry}}</a>
<a class="content-link" data-link data-uuid="{{system.ancestry}}">{{uuidToName system.ancestry}}</a>
</div>
</div>

Expand All @@ -107,7 +107,7 @@
</span>
</div>
<div class="content">
<a class="content-link" data-uuid="{{system.background}}">{{uuidToName system.background}}</a>
<a class="content-link" data-link data-uuid="{{system.background}}">{{uuidToName system.background}}</a>
</div>
</div>

Expand Down Expand Up @@ -144,7 +144,7 @@
</span>
</div>
<div class="content">
<a class="content-link" data-uuid="{{system.deity}}">{{uuidToName system.deity}}</a>
<a class="content-link" data-link data-uuid="{{system.deity}}">{{uuidToName system.deity}}</a>
</div>
</div>
</div>
Expand Down
18 changes: 16 additions & 2 deletions system/templates/apps/level-up.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@
{{#each talents}}
<div style="white-space: nowrap;">
<a class="remove-item fas fa-delete-right" data-action="delete-talent" data-index="{{@index}}"></a>
<a class="content-link" data-uuid="{{this.uuid}}">{{this.name}}</a>
<a
class="content-link"
data-link
data-tooltip="{{this.name}}"
data-uuid="{{this.uuid}}"
>
{{this.name}}
</a>
</div>
{{/each}}
</fieldset>
Expand All @@ -75,7 +82,14 @@
{{#if this}}
<div style="white-space: nowrap;">
<a class="remove-item fas fa-delete-right" data-action="delete-spell" data-tier="{{@../key}}" data-index="{{@index}}"></a>
<a class="content-link" data-uuid="{{this.uuid}}">{{this.name}}</a>
<a
class="content-link"
data-link
data-tooltip="{{this.name}}"
data-uuid="{{this.uuid}}"
>
{{this.name}}
</a>
</div>
{{/if}}
{{#unless this}}
Expand Down

0 comments on commit 9656e62

Please sign in to comment.