Skip to content

Commit

Permalink
fix: missing damage type for spells (#1673)
Browse files Browse the repository at this point in the history
This release fixes missing damage type for spells (if damage type used).  Thanks to Alexiandria20 for finding. Also, the Traveller Tools character import macro is fixed to use the prior version of TT.  Thanks to Cynycal for finding.
  • Loading branch information
marvin9257 authored Oct 28, 2024
1 parent bc3f1a5 commit 7a826c2
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 46 deletions.
1 change: 1 addition & 0 deletions src/module/data/item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export class SpellData extends TraitData {
schema.duration = new fields.StringField({...requiredBlankString});
schema.associatedSkillName = new fields.StringField({...requiredBlankString});
schema.damage = new fields.StringField({...requiredBlankString});
schema.damageType = new fields.StringField({required: true, blank: false, initial: "NONE" });
return schema;
}
}
Expand Down
2 changes: 1 addition & 1 deletion static/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@
},
"ShowDamageType": {
"hint": "checked=Show the 'Damage Type' field, unchecked=Hide it",
"name": "Show the 'Damage Type' field on weapon sheets"
"name": "Show the 'Damage Type' field on weapon (and spell) sheets"
},
"showHeroPoints": {
"hint": "Show Hero Points counter on actor sheet.",
Expand Down
File renamed without changes.
Binary file not shown.
2 changes: 1 addition & 1 deletion static/packs/twodsix-macros/CURRENT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MANIFEST-000110
MANIFEST-000118
33 changes: 15 additions & 18 deletions static/packs/twodsix-macros/LOG
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
2024/06/08-08:01:23.420245 70000facd000 Recovering log #106
2024/06/08-08:01:23.420478 70000facd000 Recovering log #113
2024/06/08-08:01:23.421617 70000facd000 Delete type=3 #102
2024/06/08-08:01:23.421754 70000facd000 Delete type=0 #113
2024/06/08-08:01:23.421895 70000facd000 Delete type=0 #106
2024/06/08-08:01:23.422009 70000facd000 Delete type=3 #93
2024/06/08-08:12:42.803511 700010b56000 Level-0 table #116: started
2024/06/08-08:12:42.804553 700010b56000 Level-0 table #116: 5056 bytes OK
2024/06/08-08:12:42.804966 700010b56000 Delete type=0 #114
2024/06/08-08:12:42.808695 700010b56000 Manual compaction at level-0 from '!macros!9PW7N3iRk1FjJwXx' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
2024/06/08-08:12:42.808766 700010b56000 Manual compaction at level-1 from '!macros!9PW7N3iRk1FjJwXx' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!hBeDXIsb9ZylVCDX' @ 106 : 1
2024/06/08-08:12:42.808774 700010b56000 Compacting 1@1 + 1@2 files
2024/06/08-08:12:42.810178 700010b56000 Generated table #117@1: 20 keys, 52948 bytes
2024/06/08-08:12:42.810198 700010b56000 Compacted 1@1 + 1@2 files => 52948 bytes
2024/06/08-08:12:42.810338 700010b56000 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/08-08:12:42.810450 700010b56000 Delete type=2 #116
2024/06/08-08:12:42.810704 700010b56000 Delete type=2 #109
2024/06/08-08:12:42.814851 700010b56000 Manual compaction at level-1 from '!macros!hBeDXIsb9ZylVCDX' @ 106 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
2024/10/28-08:31:06.416694 700012fd8000 Recovering log #115
2024/10/28-08:31:06.418346 700012fd8000 Delete type=0 #115
2024/10/28-08:31:06.418527 700012fd8000 Delete type=3 #110
2024/10/28-08:39:13.598233 700014061000 Level-0 table #121: started
2024/10/28-08:39:13.598977 700014061000 Level-0 table #121: 3807 bytes OK
2024/10/28-08:39:13.599398 700014061000 Delete type=0 #119
2024/10/28-08:39:13.601438 700014061000 Manual compaction at level-0 from '!macros!6kBM5JsjjXQpaWRG' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
2024/10/28-08:39:13.601465 700014061000 Manual compaction at level-1 from '!macros!6kBM5JsjjXQpaWRG' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!GsvOnW0juwgt1vJD' @ 108 : 0
2024/10/28-08:39:13.601472 700014061000 Compacting 1@1 + 1@2 files
2024/10/28-08:39:13.602903 700014061000 Generated table #122@1: 20 keys, 52859 bytes
2024/10/28-08:39:13.602926 700014061000 Compacted 1@1 + 1@2 files => 52859 bytes
2024/10/28-08:39:13.603053 700014061000 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/10/28-08:39:13.603144 700014061000 Delete type=2 #117
2024/10/28-08:39:13.603358 700014061000 Delete type=2 #121
2024/10/28-08:39:13.608954 700014061000 Manual compaction at level-1 from '!macros!GsvOnW0juwgt1vJD' @ 108 : 0 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
44 changes: 18 additions & 26 deletions static/packs/twodsix-macros/LOG.old
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
2024/05/27-12:42:40.311345 70000d06e000 Recovering log #90
2024/05/27-12:42:40.311547 70000d06e000 Recovering log #104
2024/05/27-12:42:40.311720 70000d06e000 Level-0 table #94: started
2024/05/27-12:42:40.312906 70000d06e000 Level-0 table #94: 53149 bytes OK
2024/05/27-12:42:40.314095 70000d06e000 Delete type=0 #104
2024/05/27-12:42:40.314285 70000d06e000 Delete type=0 #90
2024/05/27-12:42:40.314438 70000d06e000 Delete type=3 #88
2024/05/28-08:08:56.784866 70000d8f4000 Level-0 table #107: started
2024/05/28-08:08:56.785726 70000d8f4000 Level-0 table #107: 13894 bytes OK
2024/05/28-08:08:56.785986 70000d8f4000 Delete type=0 #105
2024/05/28-08:08:56.788280 70000d8f4000 Manual compaction at level-0 from '!macros!9PW7N3iRk1FjJwXx' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!xpgbOkPeYsAcjDrm' @ 99 : 1
2024/05/28-08:08:56.788293 70000d8f4000 Compacting 2@0 + 0@1 files
2024/05/28-08:08:56.789544 70000d8f4000 Generated table #108@0: 22 keys, 52982 bytes
2024/05/28-08:08:56.789560 70000d8f4000 Compacted 2@0 + 0@1 files => 52982 bytes
2024/05/28-08:08:56.789644 70000d8f4000 compacted to: files[ 0 1 1 0 0 0 0 ]
2024/05/28-08:08:56.789703 70000d8f4000 Delete type=2 #107
2024/05/28-08:08:56.789890 70000d8f4000 Delete type=2 #94
2024/05/28-08:08:56.791672 70000d8f4000 Manual compaction at level-0 from '!macros!xpgbOkPeYsAcjDrm' @ 99 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
2024/05/28-08:08:56.793555 70000d8f4000 Manual compaction at level-1 from '!macros!9PW7N3iRk1FjJwXx' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!xpgbOkPeYsAcjDrm' @ 99 : 1
2024/05/28-08:08:56.793566 70000d8f4000 Compacting 1@1 + 1@2 files
2024/05/28-08:08:56.794967 70000d8f4000 Generated table #109@1: 20 keys, 52929 bytes
2024/05/28-08:08:56.794990 70000d8f4000 Compacted 1@1 + 1@2 files => 52929 bytes
2024/05/28-08:08:56.795106 70000d8f4000 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/05/28-08:08:56.795198 70000d8f4000 Delete type=2 #108
2024/05/28-08:08:56.795395 70000d8f4000 Delete type=2 #92
2024/05/28-08:08:56.800359 70000d8f4000 Manual compaction at level-1 from '!macros!xpgbOkPeYsAcjDrm' @ 99 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
2024/06/08-08:01:23.420245 70000facd000 Recovering log #106
2024/06/08-08:01:23.420478 70000facd000 Recovering log #113
2024/06/08-08:01:23.421617 70000facd000 Delete type=3 #102
2024/06/08-08:01:23.421754 70000facd000 Delete type=0 #113
2024/06/08-08:01:23.421895 70000facd000 Delete type=0 #106
2024/06/08-08:01:23.422009 70000facd000 Delete type=3 #93
2024/06/08-08:12:42.803511 700010b56000 Level-0 table #116: started
2024/06/08-08:12:42.804553 700010b56000 Level-0 table #116: 5056 bytes OK
2024/06/08-08:12:42.804966 700010b56000 Delete type=0 #114
2024/06/08-08:12:42.808695 700010b56000 Manual compaction at level-0 from '!macros!9PW7N3iRk1FjJwXx' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
2024/06/08-08:12:42.808766 700010b56000 Manual compaction at level-1 from '!macros!9PW7N3iRk1FjJwXx' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!hBeDXIsb9ZylVCDX' @ 106 : 1
2024/06/08-08:12:42.808774 700010b56000 Compacting 1@1 + 1@2 files
2024/06/08-08:12:42.810178 700010b56000 Generated table #117@1: 20 keys, 52948 bytes
2024/06/08-08:12:42.810198 700010b56000 Compacted 1@1 + 1@2 files => 52948 bytes
2024/06/08-08:12:42.810338 700010b56000 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/08-08:12:42.810450 700010b56000 Delete type=2 #116
2024/06/08-08:12:42.810704 700010b56000 Delete type=2 #109
2024/06/08-08:12:42.814851 700010b56000 Manual compaction at level-1 from '!macros!hBeDXIsb9ZylVCDX' @ 106 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end)
Binary file removed static/packs/twodsix-macros/MANIFEST-000110
Binary file not shown.
Binary file added static/packs/twodsix-macros/MANIFEST-000118
Binary file not shown.

0 comments on commit 7a826c2

Please sign in to comment.