Commit Graph

208 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Chr1Z93
7a60c318ca addition of fan made accessorie options 2022-12-17 02:49:34 +01:00
Buhallin
baaf6f158b
Merge branch 'main' into scenario-event 2022-12-15 20:31:49 -08: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
31a471d648
Merge pull request #96 from argonui/tour
SCED Intro Tour, Part 2
2022-12-14 12:02:06 +01: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
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
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
4e500a8cc5
Remove GUID comparison in favor of direct object comparison 2022-12-11 13:37:40 -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
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
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
Chr1Z93
d4a41b7b02 option for playermat snap tags added 2022-12-06 21:26:08 +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
Buhallin
1af38ee3ae
Handle connections for double-sided and locked locations 2022-12-04 23:54:34 -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
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
34ddd85675
Move investigator counter object to on-demand retrieval 2022-11-24 13:38:29 -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
Chr1Z93
a1d10432d2 correction of typo 2022-11-23 22:37:28 +01:00
Chr1Z93
5ee6a9e196 clue data for five scenarios 2022-11-21 21:40:37 +01:00
Buhallin
990871646e
Merge pull request #38 from argonui/fortuneandfolly_fix
adding missing information for FaF
2022-11-15 16:25:54 -08:00
Chr1Z93
e35dfd5c48 using require for the official standalones 2022-11-16 00:23:27 +01:00
Chr1Z93
4d976d69a6 reverted autoformatting 2022-11-15 23:51:32 +01:00
Chr1Z93
6df443e56d adding missing information for FaF 2022-11-15 23:46:35 +01:00
Chr1Z
c88c185950
Merge pull request #25 from argonui/globalscript
updated global script
2022-11-15 12:15:53 +01:00
Chr1Z93
68d49aca98 added documentation for difficulty selector code 2022-11-15 11:57:28 +01:00
Chr1Z93
1b2f70b59b resolving requested changes 2022-11-14 11:03:06 +01:00
Chr1Z
fafaa874f5
Merge pull request #20 from argonui/playarea
updated playarea
2022-11-14 00:30:04 +01:00
Chr1Z93
510588c74c fixing onLoad bug 2022-11-14 00:29:18 +01:00
Chr1Z93
7f9d70aa56 implementation of requested changes 2022-11-13 01:12:01 +01:00
Chr1Z
35633f8de2
Merge pull request #17 from argonui/chr1z-1
updated doom counters
2022-11-12 21:04:26 +01:00
Chr1Z93
9d508882ee global script update 2022-11-12 14:42:06 +01:00
Chr1Z93
6b7eba56a5 changes from code review 2022-11-12 13:51:43 +01:00
Chr1Z93
d0fdaefe42 updated playarea 2022-11-12 11:46:05 +01:00
Chr1Z93
b9fe8a21c9 updated playmat image swapper 2022-11-12 11:41:37 +01:00
Chr1Z93
d22c4d5806 updated doom counters 2022-11-12 11:27:59 +01:00
Kevin
3d216f1dab Update source repository to SCED v2.3.1 2022-10-25 00:36:45 -07:00
Kevin
83f75c2318 Initial code extraction and commit
Initialize the SCED repository by moving most scripts from TTS objects 
to separate files which are included via require().
2021-10-06 20:37:31 -07:00