-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add ship context to position rolls and display of total armor (#…
…1548) This release adds/fixes a few things: * The ship context has been added to position chat rolls. Now formulas can include "@ship.var_name" in the calculations for chat rolls. For example, "@ship.shipStats.drives.mDrive.rating" will include the ships m-drive thrust value. Note that the ".system" context is not used. * Adds a display option to show total armor value rather than the incremental, secondary armor value. This is explained further in the wiki here: https://github.com/xdy/twodsix-foundryvtt/wiki/Secondary-Armor-and-Damage-Types#display-of-primary-and-secondary-armor-on-actor-sheets. Thanks to the suggestion of @phil. * Fixes the pop-out style for inline rolls * Adds the ability to have custom flavor for position chat rolls ( use '#' to separate roll formula and context, e.g. '/r 1d6 + @ship.shipStats.drives.mDrive.rating # Trust Now!') * Fixes healing macro - thanks to @huber for finding * Fixes CE SRD skills compendium - no pre-selected characteristics and adds groups * Adds style fixes for Monk's Enhanced Journal Entries. Must use the setting Experimental Features-> Style -> Correct some css... Thanks to @MrZwij for finding and helping to debug the issue.
- Loading branch information
1 parent
0dab193
commit 4689123
Showing
31 changed files
with
145 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
File renamed without changes.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
MANIFEST-000141 | ||
MANIFEST-000147 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
2024/02/27-13:13:11.434018 70000c884000 Recovering log #138 | ||
2024/02/27-13:13:11.434194 70000c884000 Recovering log #142 | ||
2024/02/27-13:13:11.435204 70000c884000 Delete type=3 #135 | ||
2024/02/27-13:13:11.435324 70000c884000 Delete type=0 #138 | ||
2024/02/27-13:13:11.435424 70000c884000 Delete type=0 #142 | ||
2024/02/27-13:39:59.668660 70000d10a000 Level-0 table #145: started | ||
2024/02/27-13:39:59.669507 70000d10a000 Level-0 table #145: 1938 bytes OK | ||
2024/02/27-13:39:59.669867 70000d10a000 Delete type=0 #143 | ||
2024/02/27-13:39:59.671648 70000d10a000 Manual compaction at level-0 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) | ||
2024/02/27-13:39:59.672399 70000d10a000 Manual compaction at level-1 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 551 : 1 | ||
2024/02/27-13:39:59.672416 70000d10a000 Compacting 1@1 + 1@2 files | ||
2024/02/27-13:39:59.675055 70000d10a000 Generated table #146@1: 195 keys, 124832 bytes | ||
2024/02/27-13:39:59.675101 70000d10a000 Compacted 1@1 + 1@2 files => 124832 bytes | ||
2024/02/27-13:39:59.675242 70000d10a000 compacted to: files[ 0 0 1 0 0 0 0 ] | ||
2024/02/27-13:39:59.675341 70000d10a000 Delete type=2 #140 | ||
2024/02/27-13:39:59.675567 70000d10a000 Delete type=2 #145 | ||
2024/02/27-13:39:59.677547 70000d10a000 Manual compaction at level-1 from '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 551 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) | ||
2024/03/09-11:33:56.955188 700012ce7000 Recovering log #144 | ||
2024/03/09-11:33:56.955510 700012ce7000 Recovering log #156 | ||
2024/03/09-11:33:56.956801 700012ce7000 Delete type=0 #144 | ||
2024/03/09-11:33:56.956964 700012ce7000 Delete type=3 #141 | ||
2024/03/09-11:33:56.957124 700012ce7000 Delete type=0 #156 | ||
2024/03/10-09:08:55.142348 700012d6a000 Level-0 table #159: started | ||
2024/03/10-09:08:55.143548 700012d6a000 Level-0 table #159: 41244 bytes OK | ||
2024/03/10-09:08:55.143926 700012d6a000 Delete type=0 #157 | ||
2024/03/10-09:08:55.146339 700012d6a000 Manual compaction at level-0 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) | ||
2024/03/10-09:08:55.147984 700012d6a000 Manual compaction at level-1 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at '!items!zoM94sYgc5zKQyAn' @ 576 : 1 | ||
2024/03/10-09:08:55.148009 700012d6a000 Compacting 1@1 + 1@2 files | ||
2024/03/10-09:08:55.151112 700012d6a000 Generated table #160@1: 195 keys, 127177 bytes | ||
2024/03/10-09:08:55.151147 700012d6a000 Compacted 1@1 + 1@2 files => 127177 bytes | ||
2024/03/10-09:08:55.151299 700012d6a000 compacted to: files[ 0 0 1 0 0 0 0 ] | ||
2024/03/10-09:08:55.151425 700012d6a000 Delete type=2 #159 | ||
2024/03/10-09:08:55.152041 700012d6a000 Delete type=2 #146 | ||
2024/03/10-09:08:55.152887 700012d6a000 Manual compaction at level-1 from '!items!zoM94sYgc5zKQyAn' @ 576 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,17 @@ | ||
2024/02/19-12:08:28.084590 70001368f000 Recovering log #132 | ||
2024/02/19-12:08:28.084718 70001368f000 Recovering log #136 | ||
2024/02/19-12:08:28.085526 70001368f000 Delete type=3 #120 | ||
2024/02/19-12:08:28.085645 70001368f000 Delete type=0 #132 | ||
2024/02/19-12:08:28.085737 70001368f000 Delete type=3 #45 | ||
2024/02/19-12:08:28.085825 70001368f000 Delete type=0 #136 | ||
2024/02/19-12:39:35.743673 700013f15000 Level-0 table #139: started | ||
2024/02/19-12:39:35.744732 700013f15000 Level-0 table #139: 7608 bytes OK | ||
2024/02/19-12:39:35.745392 700013f15000 Delete type=0 #137 | ||
2024/02/19-12:39:35.750113 700013f15000 Manual compaction at level-0 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) | ||
2024/02/19-12:39:35.752179 700013f15000 Manual compaction at level-1 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at '!items!snzqG8jfTrfqzkdw' @ 546 : 1 | ||
2024/02/19-12:39:35.752201 700013f15000 Compacting 1@1 + 1@2 files | ||
2024/02/19-12:39:35.755193 700013f15000 Generated table #140@1: 195 keys, 124743 bytes | ||
2024/02/19-12:39:35.755221 700013f15000 Compacted 1@1 + 1@2 files => 124743 bytes | ||
2024/02/19-12:39:35.755348 700013f15000 compacted to: files[ 0 0 1 0 0 0 0 ] | ||
2024/02/19-12:39:35.755524 700013f15000 Delete type=2 #139 | ||
2024/02/19-12:39:35.755836 700013f15000 Delete type=2 #134 | ||
2024/02/19-12:39:35.756691 700013f15000 Manual compaction at level-1 from '!items!snzqG8jfTrfqzkdw' @ 546 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) | ||
2024/02/27-13:13:11.434018 70000c884000 Recovering log #138 | ||
2024/02/27-13:13:11.434194 70000c884000 Recovering log #142 | ||
2024/02/27-13:13:11.435204 70000c884000 Delete type=3 #135 | ||
2024/02/27-13:13:11.435324 70000c884000 Delete type=0 #138 | ||
2024/02/27-13:13:11.435424 70000c884000 Delete type=0 #142 | ||
2024/02/27-13:39:59.668660 70000d10a000 Level-0 table #145: started | ||
2024/02/27-13:39:59.669507 70000d10a000 Level-0 table #145: 1938 bytes OK | ||
2024/02/27-13:39:59.669867 70000d10a000 Delete type=0 #143 | ||
2024/02/27-13:39:59.671648 70000d10a000 Manual compaction at level-0 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) | ||
2024/02/27-13:39:59.672399 70000d10a000 Manual compaction at level-1 from '!folders!7JNabnKuKR3HpTut' @ 72057594037927935 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 551 : 1 | ||
2024/02/27-13:39:59.672416 70000d10a000 Compacting 1@1 + 1@2 files | ||
2024/02/27-13:39:59.675055 70000d10a000 Generated table #146@1: 195 keys, 124832 bytes | ||
2024/02/27-13:39:59.675101 70000d10a000 Compacted 1@1 + 1@2 files => 124832 bytes | ||
2024/02/27-13:39:59.675242 70000d10a000 compacted to: files[ 0 0 1 0 0 0 0 ] | ||
2024/02/27-13:39:59.675341 70000d10a000 Delete type=2 #140 | ||
2024/02/27-13:39:59.675567 70000d10a000 Delete type=2 #145 | ||
2024/02/27-13:39:59.677547 70000d10a000 Manual compaction at level-1 from '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 551 : 1 .. '!items.effects!PWnobwS6H67tMyVF.rGFRveaZoUElSjXq' @ 0 : 0; will stop at (end) |
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file renamed
BIN
+50.8 KB
static/packs/twodsix-macros/000053.ldb → static/packs/twodsix-macros/000069.ldb
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
MANIFEST-000054 | ||
MANIFEST-000065 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,15 @@ | ||
2023/08/01-12:44:36.700029 70000b24f000 Recovering log #51 | ||
2023/08/01-12:44:36.701537 70000b24f000 Delete type=3 #48 | ||
2023/08/01-12:44:36.701780 70000b24f000 Delete type=0 #51 | ||
2023/08/01-12:44:36.702041 70000b24f000 Delete type=3 #32 | ||
2023/08/01-12:45:10.332792 70000cadb000 Level-0 table #57: started | ||
2023/08/01-12:45:10.332830 70000cadb000 Level-0 table #57: 0 bytes OK | ||
2023/08/01-12:45:10.333011 70000cadb000 Delete type=0 #55 | ||
2023/08/01-12:45:10.333292 70000cadb000 Manual compaction at level-0 from '!macros!4d9MaEr7rJdWS1NY' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end) | ||
2023/08/01-12:45:10.333348 70000cadb000 Manual compaction at level-1 from '!macros!4d9MaEr7rJdWS1NY' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end) | ||
2024/03/09-09:35:29.831165 700013869000 Recovering log #64 | ||
2024/03/09-09:35:29.832394 700013869000 Delete type=0 #64 | ||
2024/03/09-09:35:29.832511 700013869000 Delete type=3 #63 | ||
2024/03/09-10:53:41.223694 7000140ef000 Level-0 table #68: started | ||
2024/03/09-10:53:41.224439 7000140ef000 Level-0 table #68: 2110 bytes OK | ||
2024/03/09-10:53:41.224992 7000140ef000 Delete type=0 #66 | ||
2024/03/09-10:53:41.225438 7000140ef000 Manual compaction at level-0 from '!macros!4d9MaEr7rJdWS1NY' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end) | ||
2024/03/09-10:53:41.225526 7000140ef000 Manual compaction at level-1 from '!macros!4d9MaEr7rJdWS1NY' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!xpgbOkPeYsAcjDrm' @ 57 : 1 | ||
2024/03/09-10:53:41.225586 7000140ef000 Compacting 1@1 + 1@2 files | ||
2024/03/09-10:53:41.229697 7000140ef000 Generated table #69@1: 19 keys, 52454 bytes | ||
2024/03/09-10:53:41.229740 7000140ef000 Compacted 1@1 + 1@2 files => 52454 bytes | ||
2024/03/09-10:53:41.229941 7000140ef000 compacted to: files[ 0 0 1 0 0 0 0 ] | ||
2024/03/09-10:53:41.230051 7000140ef000 Delete type=2 #68 | ||
2024/03/09-10:53:41.230559 7000140ef000 Delete type=2 #53 | ||
2024/03/09-10:53:41.233615 7000140ef000 Manual compaction at level-1 from '!macros!xpgbOkPeYsAcjDrm' @ 57 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,3 @@ | ||
2023/08/01-12:23:05.278845 70000764d000 Recovering log #29 | ||
2023/08/01-12:23:05.279009 70000764d000 Recovering log #49 | ||
2023/08/01-12:23:05.280156 70000764d000 Delete type=0 #29 | ||
2023/08/01-12:23:05.280288 70000764d000 Delete type=0 #49 | ||
2023/08/01-12:23:05.280480 70000764d000 Delete type=3 #27 | ||
2023/08/01-12:39:00.856951 700008ed9000 Level-0 table #52: started | ||
2023/08/01-12:39:00.857680 700008ed9000 Level-0 table #52: 4953 bytes OK | ||
2023/08/01-12:39:00.857909 700008ed9000 Delete type=0 #50 | ||
2023/08/01-12:39:00.858504 700008ed9000 Manual compaction at level-0 from '!macros!4d9MaEr7rJdWS1NY' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end) | ||
2023/08/01-12:39:00.858542 700008ed9000 Manual compaction at level-1 from '!macros!4d9MaEr7rJdWS1NY' @ 72057594037927935 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at '!macros!wQj2pUYR9fBF6Xjl' @ 55 : 1 | ||
2023/08/01-12:39:00.858549 700008ed9000 Compacting 1@1 + 1@2 files | ||
2023/08/01-12:39:00.859902 700008ed9000 Generated table #53@1: 19 keys, 52016 bytes | ||
2023/08/01-12:39:00.859924 700008ed9000 Compacted 1@1 + 1@2 files => 52016 bytes | ||
2023/08/01-12:39:00.860014 700008ed9000 compacted to: files[ 0 0 1 0 0 0 0 ] | ||
2023/08/01-12:39:00.860075 700008ed9000 Delete type=2 #31 | ||
2023/08/01-12:39:00.860218 700008ed9000 Delete type=2 #52 | ||
2023/08/01-12:39:00.860774 700008ed9000 Manual compaction at level-1 from '!macros!wQj2pUYR9fBF6Xjl' @ 55 : 1 .. '!macros!xpgbOkPeYsAcjDrm' @ 0 : 0; will stop at (end) | ||
2024/03/07-14:34:20.365466 70000dd5c000 Recovering log #61 | ||
2024/03/07-14:34:20.366363 70000dd5c000 Delete type=0 #61 | ||
2024/03/07-14:34:20.366493 70000dd5c000 Delete type=3 #58 |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.