Commit Graph

418 Commits

Author SHA1 Message Date
Chr1Z
f27296c06d
Merge pull request #210 from argonui/family-inheritance-functions
Family Inheritance: Context menu functions
2023-02-05 02:39:25 +01:00
Chr1Z
2f4e5be13a
Merge pull request #207 from argonui/legacy-tool-cleanup
"Hidden Zone" tool cleanup
2023-02-05 02:24:21 +01:00
Chr1Z93
33750606d0 clearing playarea "missingData" table when highlighting 2023-02-04 03:21:32 +01:00
Chr1Z93
94deae2848 added hightling button 2023-02-04 03:11:26 +01:00
Chr1Z93
8bef677eda optimization 2023-02-04 00:36:46 +01:00
Chr1Z93
28ad9da9ab context menu functions 2023-02-03 15:06:01 +01:00
Chr1Z93
fffb9df89e excludes "The Heart of Madness" from line drawing 2023-02-02 17:50:28 +01:00
Chr1Z93
811a7ca645 deck cutter feedback 2023-02-02 17:29:56 +01:00
Chr1Z93
caad1df8ea updating tools and their position 2023-02-02 17:23:51 +01:00
Chr1Z93
77d0339354 fixing memo condition 2023-02-02 16:55:18 +01:00
Chr1Z93
b5519334f9 Merge branch 'main' into victory-display 2023-02-02 12:22:56 +01:00
Chr1Z93
9bcd09367a updated logic 2023-02-02 12:20:58 +01:00
Chr1Z93
2e01e3565d even triggers 2023-02-02 00:49:29 +01:00
Chr1Z93
df2178fda4 updating image 2023-02-01 23:21:42 +01:00
Chr1Z93
c04c9b7212 fixing integration 2023-01-27 20:36:08 +01:00
Chr1Z93
6900b0ab8b shortened message 2023-01-27 20:15:09 +01:00
Chr1Z93
9113c32325 added message for cards without VP in VP display 2023-01-27 20:12:26 +01:00
Chr1Z93
b40c6e6d9e initial build 2023-01-27 19:22:29 +01:00
Buhallin
d2529ef5c8
When an investigator includes multiple copies of their signatures, spawn the right number from the card panel 2023-01-23 22:48:01 -08:00
Buhallin
ca7f5b6367
Update playermat token check to use Memo 2023-01-18 01:06:07 -08:00
Buhallin
7e09f5e780
Update token templates and handling for TokenManager
- Moves token keys from GMNotes to Memo to avoid issues attempting to parse invalid JSON
- Merges the clue and doom tokens to a single token and rotates it to properly spawn doom
- Updates the various token pools to match the TokenSource objects so spawned tokens can go back into the pools
2023-01-18 00:42:38 -08:00
Chr1Z
99cf04761e
Merge pull request #194 from argonui/weakness-finder
Remove area check when drawing a random weakness
2023-01-16 12:11:05 +01:00
Buhallin
679fcd03de
Remove area check when drawing a random weakness
If the weakness is on the table, don't consider it for the random weakness pool
2023-01-16 02:38:57 -08:00
Chr1Z
9e3a6c454d
Merge pull request #193 from argonui/custom-bug
Check for card types when updating customizable data
2023-01-16 11:35:53 +01:00
Buhallin
6a09da1723
Check for card types when updating customizable data
Avoids errors from GMNotes on tokens which aren't JSON
2023-01-16 02:29:08 -08:00
Buhallin
2e5484d97b
Fix check for missing metadata in PlayArea onObjectPickup 2023-01-16 02:12:23 -08:00
Chr1Z93
3ee647f5e7 increasing size of discard buttons 2023-01-16 00:43:46 +01:00
Chr1Z93
b3ec5cf8a8 fixed typo for tokenspawntrackerapi 2023-01-14 17:58:10 +01:00
Buhallin
e994a16992
Remove unnecessary blank line 2023-01-13 11:10:48 -08:00
Buhallin
8ca3ac9247
Bugfix for location lines
- Fixes a timing issue which would cause shadow lines to appear when hovering on a snap point
- Fixes a missing nil check that would cause errors during onUpdate if the card had no connections
2023-01-13 11:08:55 -08:00
Chr1Z
31006694b8
Merge pull request #184 from argonui/faster-connectors
Optimize location connection drawing during drag operations
2023-01-12 01:06:39 +01:00
Buhallin
42ce7e726e
Enable connection drawing for Devil Reef 2023-01-11 15:46:27 -08:00
Chr1Z
560ddf7b56
Merge pull request #183 from argonui/title-gradient
Enhancements and tweaks for the scenario title splash
2023-01-11 23:46:19 +01:00
Buhallin
bcc6dc5b8d
Tweak title splash
- Move position up
- Add common COLLISION_ENABLED handling to prevent splash from showing when reloading a save with the scenario card on the table
2023-01-11 14:37:30 -08:00
Buhallin
e6854801fb
Clear vector lines from cards when they're not being dragged
The events which can indicate a drag stop are varied:
- Drag a card into another on the table (tryObjectEnterContainer)
- Drag multiple cards into another on the table (onCollisionEnter, tryObjectEnterContainer)
- Group multiple cards while holding them (tryObjectEnterContainer)
2023-01-11 13:42:58 -08:00
Buhallin
67eaa646e1
Remove old lines 2023-01-11 03:39:33 -08:00
Buhallin
6b52e412e9
Turn off debug 2023-01-11 03:36:11 -08:00
Buhallin
a65cf33059
Optimize location connection drawing during drag operations
Previously the entire location map was being rebuilt and redrawn in onUpdate() during a drag operation, including the connectors which weren't changing.  This was causing notable lag on some systems.

This splits the draw operations into two separate pieces - locations on the board which are unchanging, and locations which are being dragged.  This allows only connections which are actually moving to be recalculated.

Since TTS only allows a single list of vector lines per object the dragged lines are now set on the cards themselves rather than the PlayArea.  This may possibly improve performance in itself, by keeping each list of vectors smaller.  Supporting this required some changes in how pre-built connections are handled.
2023-01-11 00:57:06 -08:00
Buhallin
5caeb47c82
Enhancements and tweaks for the scenario title splash
- Add a background gradient
- Add a wrapping panel to hold both text and gradient
- Add font resizing in case of very long scenario names.  None currently overflow, but this should ensure they stay on one line if we get a longer one
2023-01-10 18:05:19 -08:00
Chr1Z93
24ca8865f4 rename variables 2023-01-11 00:29:45 +01:00
Chr1Z93
f9e64f5f1e typo fix 2023-01-10 19:39:59 +01:00
Chr1Z93
be65664163 adding missing line 2023-01-10 19:38:01 +01:00
Chr1Z93
c9db56be37 only trigger onpickup on playarea for cards, documentation update 2023-01-10 19:31:02 +01:00
Chr1Z
7da588bd33
Merge pull request #178 from argonui/helpers
Fix two timing-related bugs in MythosArea
2023-01-10 07:57:20 +01:00
Buhallin
b14b498558
Merge pull request #174 from argonui/replenish-fix
Bugfix for replenishing with Resource Counters
2023-01-09 16:29:29 -08:00
Buhallin
ec6f2ab585
Fix two timing-related bugs in MythosArea
- Using a frame delay in onObjectEnterContainer was causing errors.  Unclear why, but removing the delay fixes it
- Add a delay to the scenario splash screen, as load lag when placing large scenarios was causing the show to be janky
2023-01-09 16:26:59 -08:00
Chr1Z93
1683ae05ef moving downloadbutton below return to boxes 2023-01-09 23:18:54 +01:00
Chr1Z93
b54ebbe0b8 bugfix for hand zone guids 2023-01-09 20:59:37 +01:00
Chr1Z93
04bca4b998 fixing replenish for resource counters 2023-01-09 20:56:31 +01:00
Chr1Z
51102ae9e0
Merge pull request #172 from argonui/tour-update
Update tour script for new table layout and object changes
2023-01-09 07:01:07 +01:00
Chr1Z
1054f398ba
Merge pull request #171 from argonui/inv-data-fix
Fix some investigator card data
2023-01-09 06:59:56 +01:00
Chr1Z
7c396e58fc
Merge pull request #167 from argonui/accessories-positions-update
Option Panel: Accessories spawn position update
2023-01-09 06:59:24 +01:00
Chr1Z
7c584be26b
Merge pull request #168 from argonui/renaming-table-objects
Table object renaming
2023-01-09 06:59:13 +01:00
Buhallin
6e6d4a9d1e
Update tour script for new table layout and object changes 2023-01-08 16:44:57 -08:00
Buhallin
626c2dfd55
Fix some investigator card data
Fixes the IDs for Lily's Disciplines and adds the extra copies of Lola's signatures
2023-01-08 16:35:22 -08:00
Chr1Z93
6551470e94 correct value because table is no longer nameless 2023-01-08 22:48:34 +01:00
Chr1Z93
31e6dbf969 fixing position 2023-01-08 22:25:47 +01:00
Chr1Z93
40854e43e2 object renaming 2023-01-08 16:07:38 +01:00
Chr1Z93
71dd7aee81 updated spawns and CYOA memory layout 2023-01-08 13:01:48 +01:00
Chr1Z
d2db6a49d9
Merge pull request #157 from argonui/table-layout
New table layout
2023-01-08 12:25:59 +01:00
Chr1Z93
cddd513840 removal of luascriptstates for boxes 2023-01-08 02:38:26 +01:00
Buhallin
8ea3747404
Minor data fixes
Add Tidal Memento for Wendy's investigator cards, and add doom/bounty uses for Tony's Quarry
2023-01-07 12:53:51 -08:00
Buhallin
84742a9cb4
Merge pull request #165 from argonui/pc-relative
Update Unified Player Card panel to use relative positioning
2023-01-06 17:25:25 -08:00
Buhallin
c33d0386b7
Update Unified Player Card panel to use relative positioning
Because of the mix of global and relative positioning this ended up being very complex.  Tried to make sure the comments were thorough, but open to any improvement suggestions.
2023-01-06 16:20:09 -08:00
Chr1Z
77eaaa3dfb
Merge branch 'main' into table-layout 2023-01-07 00:58:48 +01:00
Chr1Z
a046b65307
Merge pull request #158 from argonui/chaos-token-checking
New utility file: TokenChecker
2023-01-07 00:35:10 +01:00
Chr1Z93
d7ddd64532 fixed reference 2023-01-06 17:08:03 +01:00
Chr1Z
ca63ab14c2
Merge pull request #156 from argonui/tokenSpawner
Token Spawner: updated code, orphan removal
2023-01-06 11:10:56 +01:00
Chr1Z
10e11a77a3
Merge pull request #162 from argonui/search-assistant
Search Assistant: Refactor and added to Option Panel
2023-01-06 10:37:15 +01:00
Chr1Z93
9b6722aff3 removing loop from button creation 2023-01-06 10:36:57 +01:00
Chr1Z93
db52e65609 generalized utility file 2023-01-06 10:25:38 +01:00
Chr1Z
89e71a93f2
Merge pull request #159 from argonui/image-swapper
Playarea image swapper: Update position, remove personal information
2023-01-06 10:13:53 +01:00
Chr1Z93
9bf8f00399 refactor and option added 2023-01-06 02:02:24 +01:00
Chr1Z93
8284197899 handle deleted token 2023-01-05 21:01:02 +01:00
Chr1Z93
38abb7ea0c update position, remove personal information 2023-01-05 16:29:25 +01:00
Chr1Z93
46781a9f9e adding new util file 2023-01-05 15:59:07 +01:00
Chr1Z93
d5fac353a7 use local discard pile and draw deck position 2023-01-05 14:10:45 +01:00
Chr1Z93
d8e8aaf3cb first commit 2023-01-05 13:03:15 +01:00
Chr1Z93
541d3f953c updated code, orphan removal 2023-01-05 10:43:01 +01:00
Buhallin
fe6c8411a6
Rename other weakness list 2023-01-05 01:32:53 -08:00
Buhallin
9dcd53fbe0
Final Unified Player Card panel features
- Integrates investigator data
- Adds a third weakness block to place non-basic weaknesses.  This was always intended but it wasn't possible to distinguish those from signature weaknesses without the investigator data.
- Adds Fine Print and Sell Your Soul to the evolved weakness list
- Add a help popup
2023-01-05 01:26:49 -08:00
Chr1Z93
3b0fe55b2f initial commit 2023-01-05 01:06:04 +01:00
Chr1Z
817a15bec6
Merge pull request #147 from argonui/token-manager-counter-token
Token Manager: Bugfix for spawning of multiple tokens and default rotation of damage and horror tokens
2023-01-04 10:22:32 +01:00
Chr1Z
c0b2724495
Merge pull request #133 from argonui/deckimporter-configuration
Deck Importer: configuration cleanup
2023-01-04 10:13:54 +01:00
Chr1Z
9cc66d1e16
Merge pull request #146 from argonui/investigator-unexhaust-fix
Playmat - Upkeep: Dont unexhaust investigators
2023-01-04 10:04:53 +01:00
Chr1Z
98b2298f71
Merge pull request #151 from argonui/location-snap-tags
Option: Location snap tags for play area
2023-01-04 10:04:39 +01:00
Chr1Z93
684302c3ca fix default y values (because of OCD) and increase shiftDown 2023-01-04 01:39:14 +01:00
Chr1Z93
af11ea61d1 handle cards without metadata 2023-01-04 01:25:38 +01:00
Chr1Z93
14aa296b7f Merge branch 'main' into image-swapper-fix 2023-01-04 00:55:55 +01:00
Chr1Z93
560435a3bc Merge branch 'main' into location-snap-tags 2023-01-04 00:50:37 +01:00
Chr1Z93
568d28ac1b enable play area snaps by default 2023-01-04 00:45:48 +01:00
Chr1Z
fe13216c57
Merge pull request #148 from argonui/resource-counter-token
Option: Clickable resource tokens
2023-01-04 00:36:52 +01:00
Chr1Z93
e1106d2d3d resolving comments 2023-01-04 00:36:55 +01:00
Chr1Z
7dcb3edba0
Merge pull request #152 from argonui/token-remover
Token Remover: Exclude chaos tokens + code cleanup
2023-01-03 23:52:13 +01:00
Chr1Z93
efbf9e885f resolving comments 2023-01-03 23:47:34 +01:00
Chr1Z93
644025df7a resolving comments 2023-01-03 23:25:56 +01:00
Chr1Z93
e821900153 resolving comment 2023-01-03 23:12:06 +01:00
Chr1Z93
707b977efc resolving comments 2023-01-03 23:04:59 +01:00
Chr1Z93
c9cd3f70a1 change collision condition 2023-01-03 22:17:27 +01:00
Chr1Z
b32e339540
Merge branch 'main' into chaosbagmanager 2023-01-03 22:07:34 +01:00
Chr1Z
fa9dd37d2e
add data for default options 2023-01-03 22:00:28 +01:00
Chr1Z
9dff6886ea
Merge branch 'main' into optionpanel 2023-01-03 21:57:02 +01:00
Buhallin
c81ec5be93
Merge pull request #149 from argonui/clickable-clues
Option: Clickable clues bugfix
2023-01-03 12:44:49 -08:00
Chr1Z93
8651df0118 initial commit 2023-01-02 13:18:51 +01:00
Chr1Z93
b5d0731208 initial commit 2023-01-02 11:53:29 +01:00
Chr1Z93
573ab77296 re-enables tooltip and blanks the name for tokens 2023-01-02 02:51:40 +01:00
Chr1Z
ba720a8505
removed debug print 2023-01-02 02:43:33 +01:00
Chr1Z93
bacf58a54e bugfix 2023-01-02 02:42:25 +01:00
Chr1Z93
19b69a3cee add upwards shift 2023-01-02 02:27:45 +01:00
Chr1Z93
e3a1a0ce2d initial commit 2023-01-02 02:23:34 +01:00
Chr1Z
f2dd81e5d1
Merge pull request #139 from argonui/loc-links
Draw location connections automatically
2023-01-01 23:35:32 +01:00
Chr1Z93
515f48b94d more fixing 2023-01-01 23:35:16 +01:00
Pokachi
f3ab872688 Minor optimization and clean up for scenario name splash 2023-01-01 14:10:50 -08:00
Pokachi
c90a9e753a
Merge branch 'argonui:main' into main 2023-01-01 16:50:22 -05:00
Chr1Z93
97914af1f7 implement use of inArea 2023-01-01 22:34:18 +01:00
Chr1Z93
eac84f583d fix usage of shiftDown 2023-01-01 22:22:31 +01:00
Chr1Z93
5511c57bf3 fixes spawning of multiple tokens, fixes default rotation of damage and horror 2023-01-01 18:29:17 +01:00
Chr1Z93
b9a2339b80 dont unexhaust right of the asset area 2023-01-01 18:08:09 +01:00
Chr1Z93
f112849177 elder sign button and rotation fix 2023-01-01 17:55:21 +01:00
Chr1Z
13ed44058e
Merge pull request #140 from argonui/player-card-panel
Add Unified Player Card panel
2023-01-01 17:36:33 +01:00
Chr1Z93
da4a043ff7 fix variable name and declaration 2023-01-01 17:29:24 +01:00
Pokachi
7a071d30f4 Moved title splash call from PlayArea to MythosArea. updated comment for
options
2023-01-01 01:57:41 -08:00
Buhallin
fb4bbe8ab4
Remove double start message for the intro tour 2023-01-01 01:52:02 -08:00
Pokachi
d8bdb9fdf8 added a scenario name splash on placing down scenarios as well as a setting in the settings panel to toggle splashing scenario 2023-01-01 01:39:24 -08:00
Buhallin
45d62067ca
Cleanup from comments 2022-12-31 20:55:03 -08:00
Buhallin
aec6163e44
Add Unified Player Card panel
- Adds the new player card panel
- Wires up buttons to functions for spawning cards
- Adds cycle, weakness, bonded, and upgrade sheet spawn handling
2022-12-31 20:51:18 -08:00
Buhallin
2239133013
Disable automatic location connections for some scenarios
The excluded scenarios have very complex connection limitations beyond what's on the cards; we should handle them eventually, but for now we just don't draw the connections for those scenarios.
2022-12-30 20:43:04 -08:00
Buhallin
e562716d30
Merge branch 'main' into loc-links 2022-12-30 20:31:50 -08:00
Chr1Z
195580c9f0
Merge pull request #138 from argonui/playmat-moving
Playmat moving for more set-aside space (Green / Red)
2022-12-31 03:00:13 +01:00
Chr1Z
861ea501d4
Merge pull request #122 from argonui/shortsupply
Card: Short Supply - Moved function from "Hand Helper" directly to card // PlaymatAPI: New functions for playermat getting
2022-12-31 02:59:43 +01:00
Chr1Z93
3c240dcdc8 removing unused function 2022-12-31 02:57:50 +01:00
Chr1Z93
1b52853852 moving spawn location of hand helpers 2022-12-30 23:57:55 +01:00
Buhallin
d00f6dab10
SCED Intro Tour, tweaks and fixes
Contains a variety of small adjustments to the tour:
- Fixed a typo in Darrell's card
- Increased overall size by 10%
- Increased investigator images by about 50%
- Moved some of the card positions slightly to line up with their specific uses
- Updated button images to a smaller base image (because TTS's image scaling is crap)
2022-12-30 14:14:57 -08:00
Chr1Z93
52ca00817e adding more fan-made accessories 2022-12-30 22:37:05 +01:00
Chr1Z93
2df1e66f10 configuration cleanup 2022-12-30 20:53:49 +01:00
Chr1Z93
08936a7230 bugfix and feedback 2022-12-30 20:43:55 +01:00
Chr1Z93
f464e5f0ff implementing further usage of playmatAPI 2022-12-30 20:25:50 +01:00
Buhallin
a744b882ae
SCED Intro Tour, Final
Previous attempt got hosed with some merge conflicts, moving to a new branch to start clean
2022-12-29 16:35:55 -08:00
Buhallin
abdb447dbd
Make Ancestral Knowledge only pull skills from the deck
This will keep it from pulling set-aside cards such as On the Mend or Essence of the Dream
2022-12-29 15:33:07 -08:00
Buhallin
6af1dba778
Final comment pass for token refactoring
Removed unneeded code and named the tokens for templates
2022-12-29 15:24:07 -08:00
Buhallin
17512f5946
Change token spawning to pull templates from a bag rather than the on-board token pools
Also added a hidden zone (for Black) to cover functional objects at the back of the table.
2022-12-29 12:36:02 -08:00
Buhallin
e5c4601835
Round 3 of comment responses 2022-12-28 13:08:48 -08:00
Buhallin
2b94cea679
Round 2 of comment response 2022-12-28 10:32:54 -08:00
Buhallin
98e73a11be
Round 1 of comment response 2022-12-28 10:09:24 -08:00
Buhallin
7d820601a9
Code commit for token spawn refactoring 2022-12-28 02:57:43 -08:00
Buhallin
928f69f007
Updating for review comments 2022-12-23 03:29:56 -08:00
Buhallin
3ea42b7dde
SCED Intro Tour, Part 5
The penultimate step!  This completes the implementation for the tour itself, including:
- First draft tour script fully implemented
- Add investigator images as custom assets
- Added a field to skip re-centering the camera between cards
- Resized text area slightly to fill the space in the speech bubble
2022-12-23 00:07:53 -08:00
Chr1Z93
9a72597fa5 account for taboo versions of bonded cards 2022-12-22 14:40:27 +01:00
Chr1Z93
a55d1dff58 new function for playermat api 2022-12-22 13:45:47 +01:00
Chr1Z93
bdccbf707b implemented usage of playmatapi 2022-12-22 13:35:59 +01:00