Commit Graph

326 Commits

Author SHA1 Message Date
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