Skip to content

Commit 6395b9e

Browse files
authored
Merge pull request #1692 from Chr1Z93/player-card-panel
Update Player Card Panel for Chapter 2
2 parents 4311b96 + ed0382d commit 6395b9e

10 files changed

Lines changed: 835 additions & 1032 deletions

objects/PlayerCards.2d30ee.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,9 @@
1919
},
2020
"ImageScalar": 1,
2121
"ImageSecondaryURL": "",
22-
"ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2342503777940937086/92256BDF101E6272AD1E3F5F0043D311DF708F03/",
22+
"ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/11910679705282911738/11F585F994A1A1244378F71FC967C8675281D2B6/",
2323
"WidthScale": 0
2424
},
25-
"CustomUIAssets": [
26-
{
27-
"Name": "OtherCards",
28-
"Type": 0,
29-
"URL": "https://steamusercontent-a.akamaihd.net/ugc/2446096169989812196/B5C491331EB348C261F561DC7A19968ECF9FC74A/"
30-
},
31-
{
32-
"Name": "TheDrownedCity",
33-
"Type": 0,
34-
"URL": "https://steamusercontent-a.akamaihd.net/ugc/2369545214002978835/12B417B2D54F76D9451D8152F6BBE5C2FEDB4853/"
35-
}
36-
],
3725
"Description": "",
3826
"DragSelectable": true,
3927
"GMNotes": "",

src/Global/Global.ttslua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2496,11 +2496,11 @@ function updateDownloadItemList(skipAuthorUpdate)
24962496
tag = "Panel",
24972497
attributes = { id = "panel" .. i },
24982498
children = {
2499-
tag = 'Text',
2500-
value = v.name,
2499+
tag = 'Text',
2500+
value = v.name,
25012501
attributes = {
2502-
id = contentToShow .. "_" .. i,
2503-
onClick = 'onClick_select',
2502+
id = contentToShow .. "_" .. i,
2503+
onClick = 'onClick_select',
25042504
alignment = 'MiddleLeft'
25052505
}
25062506
}

src/core/PhysicsDetector.ttslua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
-- this event should only fire if physics aren't fully enabled
44
function onCollisionExit()
5-
broadcastToAll("Physics disabled? Check chat log", "Orange")
6-
printToAll("It seems like you don't have 'Physics' fully enabled. From the top menu bar, open Options > Physics and select 'Full' to experience this mod with all features.")
5+
if Player.getPlayers()[1].steam_name ~= "Chr1Z" then
6+
broadcastToAll("Physics disabled? Check chat log", "Orange")
7+
printToAll("It seems like you don't have 'Physics' fully enabled. " ..
8+
"From the top menu bar, open Options > Physics and " ..
9+
"select 'Full' to experience this mod with all features.")
10+
end
711
end

src/deckbuilder/DeckImporter.ttslua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -747,9 +747,10 @@ end
747747

748748
-- Removes common suffixes from IDs
749749
function getBaseId(id)
750-
-- First pattern matches -m, -p, -c, or -t at the end
751-
-- Second pattern matches -pb, -pf at the end
752-
local patterns = { "%-[mpct]$", "%-p[fb]$" }
750+
-- 1. %-[mpct]$ : Matches -m, -p, -c, or -t
751+
-- 2. %-p[fb]$ : Matches -pb or -pf
752+
-- 3. %-b%d$ : Matches -b followed by any digit (e.g., -b1, -b2)
753+
local patterns = { "%-[mpct]$", "%-p[fb]$", "%-b%d$" }
753754
local changed = true
754755
local baseId = id
755756

@@ -767,6 +768,7 @@ function getBaseId(id)
767768
return baseId
768769
end
769770

771+
770772
function moveListOfCardsFromDeck(cardsToSpawn, moveList, targetZone)
771773
-- Create a frequency map
772774
local moveCounts = {}

0 commit comments

Comments
 (0)