Skip to content

Commit 4b8743d

Browse files
LarkinaboutLarkinabout
authored
Merge pull request #22 from Larkinabout/v10
V10
2 parents dc2d672 + 15410f7 commit 4b8743d

File tree

6 files changed

+38
-36
lines changed

6 files changed

+38
-36
lines changed

‎module.json‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
{
2-
"name": "challenge-tracker",
2+
"id": "challenge-tracker",
33
"title": "Challenge Tracker",
44
"description": "An interactive aid to track successes and failures in challenges à la D&D 4e-inspired skill challenges and Blades in the Dark progress clocks",
5-
"version": "0.8",
5+
"version": "0.0",
66
"library": "false",
7-
"manifestPlusVersion": "1.0.0",
8-
"minimumCoreVersion": "9",
9-
"compatibleCoreVersion": "9",
7+
"manifestPlusVersion": "1.2.0",
8+
"compatibility": {
9+
"minimum": 10,
10+
"verified": 10
11+
},
1012
"authors": [
1113
{
1214
"name": "Larkinabout",
1315
"url": "https://github.com/Larkinabout"
1416
}
1517
],
1618
"socket": true,
17-
"dependencies": [
18-
{
19-
"name": "color-picker"
20-
},
21-
{
22-
"name": "socketlib"
23-
}
24-
],
25-
"conflicts": [
26-
27-
],
19+
"relationships": {
20+
"systems": [],
21+
"requires": [
22+
{
23+
"id": "color-picker"
24+
},
25+
{
26+
"id": "socketlib"
27+
}
28+
]
29+
},
2830
"esmodules": [
2931
"./scripts/challenge-tracker.js"
3032
],

‎scripts/challenge-tracker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Hooks.on('getSceneControlButtons', (controls) => {
120120
if (toggle) {
121121
ChallengeTrackerForm.open()
122122
} else {
123-
ChallengeTrackerForm.challengeTrackerForm.close()
123+
game.challengeTrackerForm.close()
124124
}
125125
},
126126
toggle: true

‎scripts/flags.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export class ChallengeTrackerFlag {
88
**/
99
static getList (userId) {
1010
const challengeTrackerList = []
11-
if (!game.users.get(userId)?.data.flags['challenge-tracker']) return
12-
const flagKeys = Object.keys(game.users.get(userId)?.data.flags['challenge-tracker'])
11+
if (!game.users.get(userId)?.flags['challenge-tracker']) return
12+
const flagKeys = Object.keys(game.users.get(userId)?.flags['challenge-tracker'])
1313
const flagsLength = flagKeys.length
1414
for (const flagKey of flagKeys) {
1515
const flagData = game.users.get(userId)?.getFlag(ChallengeTrackerSettings.id, flagKey)
@@ -29,8 +29,8 @@ export class ChallengeTrackerFlag {
2929
* @param {string} challengeTrackerId Unique identifier for the Challenge Tracker
3030
**/
3131
static get (ownerId, challengeTrackerId) {
32-
if (!game.users.get(ownerId)?.data.flags['challenge-tracker']) return
33-
const flagKey = Object.keys(game.users.get(ownerId)?.data.flags['challenge-tracker']).find(ct => ct === challengeTrackerId)
32+
if (!game.users.get(ownerId)?.flags['challenge-tracker']) return
33+
const flagKey = Object.keys(game.users.get(ownerId)?.flags['challenge-tracker']).find(ct => ct === challengeTrackerId)
3434
if (!flagKey) return
3535
const challengeTracker = game.users.get(ownerId)?.getFlag(ChallengeTrackerSettings.id, flagKey)
3636
return challengeTracker
@@ -68,7 +68,7 @@ export class ChallengeTrackerFlag {
6868
* @param {string} challengeTrackerId Unique identifier for the Challenge Tracker
6969
**/
7070
static async unset (ownerId, challengeTrackerId) {
71-
const flagKey = Object.keys(game.users.get(ownerId)?.data.flags['challenge-tracker'])
71+
const flagKey = Object.keys(game.users.get(ownerId)?.flags['challenge-tracker'])
7272
.find(ct => ct === challengeTrackerId)
7373
if (!flagKey) {
7474
ui.notifications.error(game.i18n.format('challengeTracker.errors.doesNotExist', { value: challengeTrackerId }))
@@ -93,8 +93,8 @@ export class ChallengeTrackerFlag {
9393
}
9494

9595
static async setOwner () {
96-
if (!game.user.data.flags['challenge-tracker']) return
97-
const flagKeys = Object.keys(game.user.data.flags['challenge-tracker'])
96+
if (!game.user.flags['challenge-tracker']) return
97+
const flagKeys = Object.keys(game.user.flags['challenge-tracker'])
9898
for (const flagKey of flagKeys) {
9999
const flag = await game.user.getFlag(ChallengeTrackerSettings.id, flagKey)
100100
if (flag.ownerId !== game.userId) {

‎scripts/forms.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export class ChallengeTrackerForm extends FormApplication {
140140
}
141141

142142
async move (direction, ownerId, challengeTrackerId) {
143-
const flagLength = Object.keys(game.users.get(ownerId).data.flags['challenge-tracker']).length
143+
const flagLength = Object.keys(game.users.get(ownerId).flags['challenge-tracker']).length
144144
const challengeTracker1 = ChallengeTrackerFlag.get(ownerId, challengeTrackerId)
145145
if (!challengeTracker1) return
146146
const originalPosition = challengeTracker1.listPosition
@@ -155,7 +155,7 @@ export class ChallengeTrackerForm extends FormApplication {
155155
newPosition = originalPosition + 1
156156
break
157157
}
158-
const challengeTracker2 = Object.values(game.users.get(ownerId).data.flags['challenge-tracker']).find(ct => ct.listPosition === newPosition)
158+
const challengeTracker2 = Object.values(game.users.get(ownerId).flags['challenge-tracker']).find(ct => ct.listPosition === newPosition)
159159
await ChallengeTrackerFlag.set(ownerId, { id: challengeTrackerId, listPosition: newPosition })
160160
if (challengeTracker2) await ChallengeTrackerFlag.set(ownerId, { id: challengeTracker2.id, listPosition: originalPosition })
161161
}
@@ -254,7 +254,7 @@ export class ChallengeTrackerEditForm extends FormApplication {
254254
const title = formData.title ?? game.i18n.localize('challengeTracker.labels.challengeTrackerTitle')
255255
const persist = true
256256
const id = challengeTrackerId
257-
const listPosition = Object.keys(game.users.get(ownerId).data.flags['challenge-tracker'] || {}).length + 1
257+
const listPosition = Object.keys(game.users.get(ownerId).flags['challenge-tracker'] || {}).length + 1
258258
challengeTrackerOptions = foundry.utils.mergeObject(formData, { ownerId, id, listPosition, persist, title })
259259
}
260260
await ChallengeTrackerFlag.set(ownerId, challengeTrackerOptions)

‎scripts/main.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ export class ChallengeTracker extends Application {
310310

311311
// Set listPosition
312312
challengeTrackerOptions.listPosition = challengeTrackerOptions.listPosition ??
313-
Object.keys(game.users.get(ownerId).data.flags['challenge-tracker']).length + 1 ??
313+
Object.keys(game.users.get(ownerId).flags['challenge-tracker']).length + 1 ??
314314
1
315315

316316
// Set title
@@ -1487,7 +1487,7 @@ export class ChallengeTracker extends Application {
14871487
if (game.user.isGM) {
14881488
for (const user of game.users.entries()) {
14891489
const userId = user[0]
1490-
const flagKey = Object.keys(game.users.get(userId)?.data.flags[ChallengeTrackerSettings.id]).find(ct => ct.id === challengeTrackerId)
1490+
const flagKey = Object.keys(game.users.get(userId)?.flags[ChallengeTrackerSettings.id]).find(ct => ct.id === challengeTrackerId)
14911491
if (flagKey) ownerId = userId
14921492
}
14931493
}
@@ -1533,7 +1533,7 @@ export class ChallengeTracker extends Application {
15331533
const ownerId = game.userId
15341534

15351535
// Set flag
1536-
const flagKey = Object.keys(game.user.data.flags[ChallengeTrackerSettings.id]).find(ct => ct.title === challengeTrackerTitle)
1536+
const flagKey = Object.keys(game.user.flags[ChallengeTrackerSettings.id]).find(ct => ct.title === challengeTrackerTitle)
15371537
if (flagKey) {
15381538
const flagData = ChallengeTrackerFlag.get(ownerId, flagKey)
15391539
challengeTrackerOptions = foundry.utils.mergeObject(flagData, challengeTrackerOptions)
@@ -1604,7 +1604,7 @@ export class ChallengeTracker extends Application {
16041604
if (game.user.isGM) {
16051605
for (const user of game.users.entries()) {
16061606
const userId = user[0]
1607-
const flagKey = Object.keys(game.users.get(userId)?.data.flags[ChallengeTrackerSettings.id]).find(ct => ct.id === challengeTrackerId)
1607+
const flagKey = Object.keys(game.users.get(userId)?.flags[ChallengeTrackerSettings.id]).find(ct => ct.id === challengeTrackerId)
16081608
if (flagKey) {
16091609
ownerId = userId
16101610
break
@@ -1632,7 +1632,7 @@ export class ChallengeTracker extends Application {
16321632
const ownerId = game.userId
16331633

16341634
// Delete flag
1635-
const flagKey = Object.keys(game.user.data.flags[ChallengeTrackerSettings.id]).find(ct => ct.title === challengeTrackerTitle)
1635+
const flagKey = Object.keys(game.user.flags[ChallengeTrackerSettings.id]).find(ct => ct.title === challengeTrackerTitle)
16361636
if (flagKey) {
16371637
ChallengeTrackerFlag.unset(ownerId, flagKey)
16381638
}
@@ -1660,7 +1660,7 @@ export class ChallengeTracker extends Application {
16601660
if (game.user.isGM) {
16611661
for (const user of game.users.entries()) {
16621662
const userId = user[0]
1663-
const flagKey = Object.keys(game.users.get(userId)?.data.flags[ChallengeTrackerSettings.id]).find(ct => ct.id === challengeTrackerId)
1663+
const flagKey = Object.keys(game.users.get(userId)?.flags[ChallengeTrackerSettings.id]).find(ct => ct.id === challengeTrackerId)
16641664
if (flagKey) ownerId = userId
16651665
}
16661666
}
@@ -1689,7 +1689,7 @@ export class ChallengeTracker extends Application {
16891689
const ownerId = game.userId
16901690

16911691
// Get flag
1692-
const challengeTrackerId = Object.entries(game.user.data.flags[ChallengeTrackerSettings.id]).find(ct => ct[1].title === challengeTrackerTitle)[0]
1692+
const challengeTrackerId = Object.entries(game.user.flags[ChallengeTrackerSettings.id]).find(ct => ct[1].title === challengeTrackerTitle)[0]
16931693
if (challengeTrackerId) {
16941694
const flagData = ChallengeTrackerFlag.get(ownerId, challengeTrackerId)
16951695
if (flagData) return flagData

‎templates/challenge-tracker-edit-form.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
<label for="backgroundImage">{{localize "challengeTracker.labels.editForm.backgroundImage"}}:</label>
6464
<div class="challenge-tracker-form-file-picker-group">
6565
<input type="text" id="backgroundImage" name="backgroundImage" data-dtype="text" value="{{backgroundImage}}">
66-
{{filePicker target="backgroundImage" type="text"}}
66+
{{filePicker target="backgroundImage" type="image"}}
6767
</div>
6868
</div>
6969
<div class="form-group" title="{{localize "challengeTracker.labels.editForm.foregroundImageTooltip"}}">
7070
<label for="foregroundImage">{{localize "challengeTracker.labels.editForm.foregroundImage"}}:</label>
7171
<div class="challenge-tracker-form-file-picker-group">
7272
<input type="text" id="foregroundImage" name="foregroundImage" data-dtype="text" value="{{foregroundImage}}">
73-
{{filePicker target="foregroundImage" type="text"}}
73+
{{filePicker target="foregroundImage" type="image"}}
7474
</div>
7575
</div>
7676
</div>

0 commit comments

Comments
 (0)