Skip to content

Nkosi Mabati helper / redrawing token tools #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chr1Z93 merged 9 commits into from
Apr 18, 2024
Merged

Nkosi Mabati helper / redrawing token tools #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a424400
version 1
dscarpac Mar 6, 2024
aa76fff
Merge branch 'argonui:main' into nkosi
dscarpac Mar 24, 2024
7c5c98f
Merge branch 'argonui:main' into nkosi
dscarpac Apr 1, 2024
b28c9c0
more updates
dscarpac Apr 12, 2024
4955c09
updates
dscarpac Apr 17, 2024
a878a15
fixed empty space
dscarpac Apr 18, 2024
8a8ff43
issues resolved
dscarpac Apr 18, 2024
877ac6e
Global fixes
dscarpac Apr 18, 2024
995c8b9
Merge branch 'main' into nkosi
dscarpac Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions modsettings/CustomUIAssets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2026086584372569912/5CB461AEAE2E59D3064D90A776EB86C46081EC78/"
},
{
"Name": "font_arkhamslim",
"Type": 1,
"URL": "http://cloud-3.steamusercontent.com/ugc/2510267299454546112/8CDF773519FEC8C488569072280AC848BCC293D5/"
},
{
"Name": "font_birmingham",
"Type": 1,
Expand Down Expand Up @@ -238,5 +243,50 @@
"Name": "box-cover-mask-wide",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2115061298538827369/A20C2ECB8ECDC1B0AD8B2B38F68CA1C1F5E07D37/"
},
{
"Name": "token-skull",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374775547231/E0FEEF462DE4E7704832CA2415D0D027A6BF5041/"
},
{
"Name": "token-bless",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374775547028/7855033DE0EB1FDDF706E1303054D35FE0902532/"
},
{
"Name": "token-curse",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374775547135/2360372CBE9452CB7B4D135BE13BBA6D46B7D427/"
},
{
"Name": "token-cultist",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374792650461/10D8037632900AA86045BDD42A564716D5855B1B/"
},
{
"Name": "token-tablet",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374792650857/29DAE514E5C838C24C90ABBFFF92B1359B9A2F76/"
},
{
"Name": "token-elder-thing",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374792650683/1C046B6335317CA1AEBFC80645EEC18852D83D80/"
},
{
"Name": "token-frost",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374792650766/73E07A50BE6FD9BED266F3421B472C4BF913DE81/"
},
{
"Name": "token-auto-fail",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2510267932886739653/CB7AA2D73777EF5938A6E6CD664B2ABA52B6E20A/"
},
{
"Name": "token-custom",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2380784374792650571/E4C2B2B69282A4EE15FE290FF6B08BEFC8FCA65C/"
}
]
2 changes: 1 addition & 1 deletion objects/AllPlayerCards.15bb07/NkosiMabati3.6c5628.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": false,
"LuaScript": "",
"LuaScript": "require(\"playercards/cards/NkosiMabati3\")",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Card",
Expand Down
5 changes: 3 additions & 2 deletions src/chaosbag/ChaosBagApi.ttslua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ do
---@param drawAdditional boolean Controls whether additional tokens should be drawn
---@param tokenType? string Name of token (e.g. "Bless") to be drawn from the bag
---@param guidToBeResolved? string GUID of the sealed token to be resolved instead of drawing a token from the bag
ChaosBagApi.drawChaosToken = function(mat, drawAdditional, tokenType, guidToBeResolved)
return Global.call("drawChaosToken", {mat = mat, drawAdditional = drawAdditional, tokenType = tokenType, guidToBeResolved = guidToBeResolved})
---@param returnedToken? tts__Object Token to be replaced with newly drawn token
ChaosBagApi.drawChaosToken = function(mat, drawAdditional, tokenType, guidToBeResolved, returnedToken)
return Global.call("drawChaosToken", {mat = mat, drawAdditional = drawAdditional, tokenType = tokenType, guidToBeResolved = guidToBeResolved, returnedToken = returnedToken})
end

-- returns a Table List of chaos token ids in the current chaos bag
Expand Down
Loading