adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity
874 Commits 5 Branches 26 Tags 19 MiB
311d36ce81
Commit Graph

489 Commits

Author SHA1 Message Date
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
Chr1Z93
20e0f8075b bugfix for handhelper, error handling for missing barrel 2022-12-22 13:18:45 +01:00
Chr1Z93
d5f04cf465 addition of "load default" functionality 2022-12-22 12:50:02 +01:00
Buhallin
f3c1bf169d
Merge pull request #109 from argonui/custom-id-support 
Playermat: Allow non-numeric IDs for upkeep // Addition of promo and revised art for investigators as states
 2022-12-22 00:41:53 -08:00
Buhallin
00b2a8c026
Merge pull request #118 from argonui/optionpanel-5 
Option Panel: Part 5 - Storing GUIDs for spawned helper objects to allow later removal at any position
 2022-12-22 00:37:37 -08:00
Chr1Z93
2cc1b7f518 updated documentation 2022-12-22 02:28:33 +01:00
Chr1Z
7561b837ea
Merge branch 'main' into optionpanel-4 2022-12-22 01:44:49 +01:00
Chr1Z93
d1231da78e text changes, button resizing 2022-12-22 01:42:32 +01:00
Chr1Z93
7660e47bcd updated documentation 2022-12-21 14:16:03 +01:00
Buhallin
49c3c170ef
Merge pull request #116 from argonui/tour 
SCED Intro Tour, Part 4
 2022-12-20 22:19:50 -08:00
Chr1Z93
5726409e42 save GUIDs for spawned helper objects, remove them by GUID 2022-12-20 20:35:33 +01:00
Chr1Z93
07be63e505 rebuilding UI for scrollview, bugfix for token arranger 2022-12-20 15:27:47 +01:00
Buhallin
456d210b6e
Merge pull request #106 from argonui/investigator-panel 
Create a unified panel for groups of player cards.
 2022-12-20 00:31:43 -08:00
Buhallin
33e3c7d35c
SCED Intro Tour, Part 4 
Final UI pass before the script is implemented
- Adds UI assets for speech bubble and buttons
- Fully implements flippable sides, including speech bubble flip and object repositioning
- A few minor cleanups and enhancements relating to camera position
 2022-12-20 00:26:29 -08:00
Buhallin
b72cbca8a2
Minor format cleanup 2022-12-19 17:06:52 -08:00
Buhallin
77cff5e30c
Merge pull request #107 from argonui/tour 
SCED Intro Tour, Part 3
 2022-12-19 17:05:59 -08:00
Buhallin
afe36b3dea
Merge branch 'main' into tour 2022-12-19 14:25:15 -08:00
Chr1Z
34cc3d8173
Merge pull request #113 from argonui/downloadbox 
Move official content to require for downloadboxes
 2022-12-19 23:15:48 +01:00
Chr1Z
e9266fe0cd
Merge pull request #110 from argonui/investigator-counter-require 
Use require for investigator counter
 2022-12-19 23:15:34 +01:00
Chr1Z93
6c4973a274 added re-grabbing of notes onClick 2022-12-19 22:06:27 +01:00
Chr1Z93
4d1af1fc18 renaming token to "investigator count" 2022-12-19 22:04:09 +01:00
Chr1Z93
2e4349bd49 move official content to require for downloadboxes 2022-12-19 18:25:24 +01:00
Chr1Z93
21d1f33848 use require for investigator counter 2022-12-19 17:04:55 +01:00
Chr1Z93
db9b7d7bdd upkeep button now allows all characters in IDs 2022-12-19 16:52:12 +01:00
Chr1Z93
e0fb91809f resolving comments (part 2) 2022-12-19 15:15:44 +01:00
Chr1Z93
43789fdaa7 resolving comments (part 1) 2022-12-19 14:39:32 +01:00
Buhallin
ddb690a5ef
Merge branch 'main' into tour 2022-12-18 22:25:01 -08:00
Buhallin
240a30f3bb
SCED Intro Tour, Part 3 
Adds additional capabilities for tour cards:
- Option to specify exact position for the camera, rather than an object.  This will enable looking at items which are not their own objects, such as the draw chaos token button.
- Option to specify height for object look.  This acts as a camera zoom; we cannot control the zoom at all, much less when attached.  By controlling the height when we're looking at an object we simulate zoom.
- Right/Left narrator image.  This will flip the card so the narrator's image is on the right or left, adding some variety to the presentation.
- Cardinal points for card position.  In addition to just adding variety, this will allow the card to be placed closer to where you want it, including other Global XML elements.
 2022-12-18 22:20:42 -08:00
Buhallin
a2fb1058c6
Create a unified panel for groups of player cards. 
The will replace the investigator boxes, class card spread tokens, and weakness container.  It will (in the future) replace the bonded and upgrade sheet bags.

This is a code-only submit while we wait on final images for the new panel.
 2022-12-17 01:24:19 -08:00
Chr1Z93
7a60c318ca addition of fan made accessorie options 2022-12-17 02:49:34 +01:00
Buhallin
83ff3eb65b
Merge pull request #103 from argonui/remove-chaosbag-shuffle 
Chaos Bag: Stop shuffling onLoad()
 2022-12-15 20:35:46 -08:00
Buhallin
baaf6f158b
Merge branch 'main' into scenario-event 2022-12-15 20:31:49 -08:00
Chr1Z93
54f825a417 removed chaos bag shuffling onload 2022-12-16 03:27:38 +01:00
Chr1Z
67c9cf2643
Merge pull request #94 from argonui/optionpanel-2 
Optionpanel: Part 2
 2022-12-16 03:20:01 +01:00
Buhallin
45a5870121
Stop event from firing multiple times for the same scenario 
A card can collide with the area more than once; many of the campaign memory bags caused a double collision on placement, and it would happen if the user picked up or flipped the card.

This would cause any behavior that triggered from the event to each time, so suppress further events which don't actually change the scenario.
 2022-12-15 13:08:32 -08:00
Buhallin
7339646ae7
Clean up previous commit 2022-12-15 00:34:01 -08:00
Buhallin
bf8f9bd12b
Add an event generator for scenario name changes 
Based in the newly-named Mythos Area, when a Scenario card lands the name will be extracted and sent to interested objects.

Playarea will use this for special location handling, and there will be other cases in the future.
 2022-12-15 00:29:56 -08:00
Buhallin
0e3a66bfaa
Merge branch 'main' into tour 2022-12-14 23:19:56 -08:00
Buhallin
bdadfdcc9f
Fix visibility handling for Tour cards 
Panel visibility isn't inhered by the children, so each element in the panel has to have the visibility set directly.
 2022-12-14 23:18:58 -08:00
Chr1Z93
bbd9151227 moving clue handling to playermatapi 2022-12-15 02:26:38 +01:00
Chr1Z93
d47bc0845a resolving comments 2022-12-15 00:18:10 +01:00
Chr1Z
f1bdf1f7a0
Merge pull request #98 from argonui/loader-refactor 
Major refactoring of ArkhamDB deck importer
 2022-12-14 12:02:15 +01:00
Chr1Z
31a471d648
Merge pull request #96 from argonui/tour 
SCED Intro Tour, Part 2
 2022-12-14 12:02:06 +01:00
Buhallin
da9c32b95c
Major refactoring of ArkhamDB deck importer 
- Splits all ArkhamDB interactions to a module
- Removes undeveloped code for Command Manager
- Removes bespoke logging in favor of standard SCED approach
- Removes mass load test functions
- Function documentation cleanup
 2022-12-14 00:54:26 -08:00
Chr1Z93
c9afcdb5cc Merge branch 'main' into optionpanel-2 2022-12-13 20:14:36 +01:00
Chr1Z
608ff4ec4f
Merge pull request #97 from argonui/playarea-api 
Add PlayArea API
 2022-12-13 20:03:36 +01:00
Chr1Z
2c7a05db80
Merge pull request #93 from argonui/optionpanel 
Optionpanel: Part 1
 2022-12-13 20:01:26 +01:00
Buhallin
c8cec71109
Handle review comments 2022-12-13 02:15:16 -08:00
Buhallin
db65f3c8e3
Add PlayArea API 
Creates an API object for the PlayArea, and moves most references to the PlayArea to use the API instead.

Image swapper is excluded on this, as I'm not completely sure how TTS will handle having an object rebuild itself.
 2022-12-12 18:56:04 -08:00
Buhallin
1c3260edf3
SCED Intro Tour, Part 2 
This updates the Tour to work for each player independently.  There is still some refinement to be done, but the basic implementation is there.
 2022-12-12 14:52:04 -08:00
Buhallin
586ba5bef9
Merge branch 'main' into tour 2022-12-12 14:45:39 -08:00
Chr1Z93
c908719245 gave variables better names 2022-12-12 22:42:12 +01:00
Chr1Z93
62ae162179 future-proofed with data for 11 uses 2022-12-12 21:00:59 +01:00
Chr1Z93
2e99d57e46 Merge branch 'main' into optionpanel-2 2022-12-12 13:25:43 +01:00
Chr1Z93
5ab71c56c0 Merge branch 'optionpanel' into optionpanel-2 2022-12-12 13:25:34 +01:00
Chr1Z93
4086365b38 data for 10 tokens (akachi + brand lvl 4) 2022-12-12 12:23:36 +01:00
Chr1Z93
24e8f3d8a6 resolving review comments 2022-12-12 12:18:45 +01:00
Buhallin
9d8beeaedc
Merge pull request #89 from argonui/tour 
SCED Intro Tour, Part 1
 2022-12-12 01:42:18 -08:00
Chr1Z
6d11bf56fb
Merge pull request #81 from argonui/doom-and-clue-counters 
Doom Counter Option UI // Clue Counter clean up
 2022-12-12 10:17:10 +01:00
Chr1Z93
5325f511db Merge branch 'main' into optionpanel-2 2022-12-12 10:02:05 +01:00
Chr1Z
2f83df87d8
removed empty line 2022-12-12 09:55:20 +01:00
Chr1Z
ef7502fbe8
resolving merge conflict 2022-12-12 09:54:02 +01:00
Chr1Z
c4552b4021
Merge branch 'main' into optionpanel 2022-12-12 09:51:15 +01:00
Chr1Z93
a312ede891 repairing save function, XML animation added 2022-12-12 09:38:29 +01:00
Buhallin
054e2cb721
Merge pull request #90 from argonui/chaos-lock 
Block chaos bag changes while the bag is being searched
 2022-12-11 13:56:54 -08:00
Buhallin
1bf7e6de57
Merge pull request #92 from argonui/playermat-tags 
Dynamic playmat snap point tagging
 2022-12-11 13:56:37 -08:00
Buhallin
4e500a8cc5
Remove GUID comparison in favor of direct object comparison 2022-12-11 13:37:40 -08:00
Buhallin
63b781075c
Merge branch 'main' into require-refactor 2022-12-11 00:10:45 -08:00
Buhallin
cb9c4d2d44
Block chaos bag changes while the bag is being searched 
A TTS bug can cause tokens to be lost or possibly duplicated if they are added to a container while that container is being searched.  This uses event listeners to block bag changes while it is being searched.

Steps to reproduce:
1. Search the bag
2. Add a token to the bag (bless/curse is easiest)
3. Remove a token from the bag using the search window
4. Close the search

The token supposedly added in #2 will be gone.
 2022-12-11 00:06:21 -08:00
Buhallin
485c961660
Update a few comments 2022-12-10 23:29:09 -08:00
Buhallin
5d1c7b9c17
Add multiplayer handling to TourManager 
Each player will now be tracked independently, and can watch their own tour.
 2022-12-10 18:08:24 -08:00
Buhallin
a1684b30f0
SCED Intro Tour, Part 1 
Creates the basic framework for the SCED introduction/training tour.  As this will be a large feature, this is intended to checkpoint
progress and work.

What's here:
- Basic tour script definition
- Script UI creation, camera handling, and flow

What's not here:
- Multiplayer support.  Everything is currently locked to white.
- Final UI.  Most UI is placeholder and will be updated later.
- Extra script capability such as higlighting objects, explicit positioning, etc.
 2022-12-10 17:06:27 -08:00
BootleggerFinn
a43b295833
Merge pull request #58 from argonui/datahelper-tsk 
TSK: clue data
 2022-12-08 12:54:11 -08:00
Chr1Z93
cb0a3d4256 removing orphaned file 2022-12-08 14:39:49 +01:00
Chr1Z93
251bf93dd4 implementing clue counting method swap 2022-12-08 14:27:55 +01:00
Chr1Z93
f69f426248 Merge branch 'doom-and-clue-counters' of https://github.com/argonui/SCED into optionpanel-2 2022-12-08 12:55:26 +01:00
Chr1Z93
19e538fbd9 WIP clue counting method swapping 2022-12-08 12:46:22 +01:00
Chr1Z93
d53302c9e0 WIP commit to split PR into parts 2022-12-08 12:01:10 +01:00
Chr1Z93
d4beeeb95d UI done for now 2022-12-07 16:40:55 +01:00
Chr1Z
477074cc20
Merge pull request #83 from argonui/servitor-bugfix 
DeckImporter: Summoned Servitor (Dominance) - BUGFIX
 2022-12-06 22:42:33 +01:00
Chr1Z93
d4a41b7b02 option for playermat snap tags added 2022-12-06 21:26:08 +01:00
Buhallin
5231609f44 Add some cleanup for playmat snap type setting, as well as a get() method to return the current state 2022-12-06 21:00:56 +01:00
Buhallin
bd89174377 Expanded documentation and remove old log messages 2022-12-06 21:00:45 +01:00
Buhallin
43315aefcc Add method to enable or disable card type snap point tagging on a playmat 
This uses the new object API concept to provide a layer of indirection between
an object and others which might call() to methods on it.  Example usage:

local playmatApi = require("playermat/PlaymatApi")
playmatApi.setLimitSnapsByType(tag, "All")
 2022-12-06 21:00:23 +01:00
Chr1Z93
ce8e6815a5 xml cleanup 2022-12-06 20:57:33 +01:00
Chr1Z93
12a71894d8 moved xml to dedicated folder, save function added 2022-12-06 20:10:09 +01:00
Chr1Z93
5b0cdf942d resolve merge conflict (again!!) 2022-12-06 11:34:49 +01:00
Chr1Z93
c84e8a2101 resolve merge conflict (again) 2022-12-06 11:34:00 +01:00
Chr1Z93
cd83347c72 resolve merge conflict 2022-12-06 11:32:57 +01:00
Chr1Z93
33a33ebbe1 Revert "use require, optimize" 
This reverts commit 97b3dd4ce5.
 2022-12-06 11:16:00 +01:00
Chr1Z93
b03aee593d bugfix for 'dominance' 2022-12-06 11:09:47 +01:00
Buhallin
1af38ee3ae
Handle connections for double-sided and locked locations 2022-12-04 23:54:34 -08:00
Buhallin
666d9f073b
Add some cleanup for playmat snap type setting, as well as a get() method to return the current state 2022-12-04 14:49:34 -08:00
Buhallin
6ed61c9174
Expanded documentation and remove old log messages 2022-12-04 01:29:02 -08:00
Buhallin
8478003860
Add method to enable or disable card type snap point tagging on a playmat 
This uses the new object API concept to provide a layer of indirection between
an object and others which might call() to methods on it.  Example usage:

local playmatApi = require("playermat/PlaymatApi")
playmatApi.setLimitSnapsByType(tag, "All")
 2022-12-04 01:21:53 -08:00
Buhallin
5d1e23a91b
Finalize location connections 
Includes some bugfixes and further optimizations
 2022-12-02 17:42:19 -08:00
Buhallin
c05238cbce
Automatic location connections, Phase 1 2022-12-02 11:45:59 -08:00
Chr1Z93
5a71eda9a7 initial commit optionpanel (WORK IN PROGRESS) 2022-12-02 01:17:19 +01:00
Chr1Z93
1edf2c084e added tooltip for mastercluecounter 2022-12-01 14:47:54 +01:00
Chr1Z93
c9c6d2b122 please dont hate me 2022-12-01 14:39:22 +01:00
Chr1Z93
2bbcab33fa removed autoformatting 2022-11-29 22:25:15 +01:00
Chr1Z93
c9ce7df533 addition of final scenario 2022-11-29 17:54:24 +01:00
Buhallin
12f7ed0e3e
Merge pull request #76 from argonui/diana 
Add startsInHand handling for the deck loader
 2022-11-28 10:35:58 -08:00
Chr1Z93
a31a55c046 fixing formatting 2022-11-28 01:43:40 +01:00
Chr1Z93
a4fbca90b2 adding data for more scenarios 2022-11-28 01:26:09 +01:00
Chr1Z93
b168af0cdb added a "hidden" location 2022-11-25 00:48:32 +01:00
Buhallin
695ad9fd14
Add handling for cards to start in a player's hand 
Currently for Diana's Dark Insight, this add generalized handling to move a card to the player's hand on deck creation.
 2022-11-24 14:25:15 -08:00
Buhallin
34ddd85675
Move investigator counter object to on-demand retrieval 2022-11-24 13:38:29 -08:00
Buhallin
d4a29c3229
Minor formatting fix 2022-11-24 12:04:04 -08:00
Buhallin
0df51128e0
Handle On the Mend when loading from ArkhamDB 
Vincent Lee gets one copy of On the Mend per investigator, and they should start set aside.
 2022-11-24 11:58:57 -08:00
Buhallin
b2819c7953
Fix typo in method doc 2022-11-24 11:01:03 -08:00
Chr1Z93
97b3dd4ce5 use require, optimize 2022-11-24 16:44:04 +01:00
Buhallin
2ec1bae42a
Fix multiple bugs with uses 
- Saved old cards have a different structure for uses (single vs. array) making the change breaking.  Code was assuming an array, breaking any loaded objects with the old structure
- Uses spawn loop was setting the values only, resulting in only the last item being spawned
- Upkeep checks were embedded incorrectly, leading to logic errors in certain circumstances
- If uses had multiple entries, tokens were spawning on top of each other and exploding, probably due to the yPos shift in playmats.  Added an offset to spawn the groups in different places to avoid this, which is prettier anyway
 2022-11-24 00:00:25 -08:00
Chr1Z93
a1d10432d2 correction of typo 2022-11-23 22:37:28 +01:00
Buhallin
4e054b2c22
Clean up testing log statements 2022-11-22 14:49:21 -08:00
Buhallin
2da0899b37
Refactor SpawnBag to be required as a module 
This enables data hiding and improves modularity
 2022-11-22 14:48:46 -08:00
Buhallin
70b2cf420b
Refactor Zones to be used as an included module 
This enables data hiding and enforces a functional interface.
 2022-11-22 14:44:46 -08:00
Chr1Z93
9f9410a3aa Merge branch 'main' of https://github.com/argonui/SCED into datahelper-tsk 2022-11-21 21:42:13 +01:00
Chr1Z93
5ee6a9e196 clue data for five scenarios 2022-11-21 21:40:37 +01:00
Chr1Z93
c54afed3ff resolving comments 2022-11-19 01:56:50 +01:00
Chr1Z93
270c731246 raising tokens, combining sourcescript 2022-11-19 00:33:21 +01:00
Chr1Z
86c8bac295
Merge pull request #54 from argonui/living-ink-circles 
Add skill selection capability to Living Ink
 2022-11-18 19:22:04 +01:00
Buhallin
d2b498a3ba
Fix bug with deck loader since trait removal 
Since traits are now an optional field in the metadata, add nil checks when using them
 2022-11-17 18:51:31 -08:00
Buhallin
b5ff337266
Add skill selection capability to Living Ink 
Skill icons can now be clicked on the sheet to circle them
 2022-11-17 18:26:30 -08:00
Buhallin
90278297db
Merge pull request #50 from argonui/loader-cust-refactor 
Refactor upgrade sheet handling in the deck loader
 2022-11-17 01:55:18 -08:00
Buhallin
6abaaa7e00
Move Minicard spawn zone so they're not on top of the new stat trackers 2022-11-17 01:48:59 -08:00
Buhallin
d830314598
Merge pull request #48 from argonui/spawn_bag 
Create SpawnBag to replace card memory bags
 2022-11-17 01:44:01 -08:00
Buhallin
7c9d728820
Handle review comments, and add some documentation that got lost 2022-11-17 01:39:49 -08:00
Buhallin
c04c7df9f1
Handle review comments 2022-11-17 01:27:59 -08:00
Buhallin
d19d35a310
Refactor upgrade sheet handling in the deck loader 
- Split upgrade sheets to follow the slots/data pattern
- Factor out methods to set selections on upgrade sheets
- Factor out method to add Summoned Servitor minicard
- Add type 'UpgradeSheet' to appropriate cards
- Remove handleStartsInPlay() method and detect it as a default zone
 2022-11-17 01:03:58 -08:00