Merge pull request #987 from YumiWhellie/main

Updated slot modification through permanent dropping
This commit is contained in:
Chr1Z 2024-11-14 14:58:25 +01:00 committed by GitHub
commit 5118930d0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -121,7 +121,8 @@ local slotNameToChar = {
["Hand (right)"] = "M",
["Hand (left)"] = "M",
["Hand x2"] = "N",
["Tarot"] = "A"
["Tarot"] = "A",
["Blursed"] = "zy"
}
-- slot symbol for the respective slot (from top left to bottom right) - intentionally global!
@ -773,7 +774,7 @@ function createXML()
raycastTarget = "false", -- this disables the click function temporarily
onClick = "slotClickFunction",
scale = "0.1 0.1 1",
width = "175",
width = "350",
height = "175",
position = x .. " " .. y .. " -11"
},
@ -1280,10 +1281,12 @@ function onCollisionEnter(collisionInfo)
-- main uses spawning
if inArea(localCardPos, MAIN_PLAY_AREA) and (md.type == "Asset" or md.type == "Event") then
spawnTokensOrShowHelper(object)
if md.id == "02158" or id == "01694" then
if md.id == "02158" or md.id == "01694" or md.id == "90027" or md.id == "60232" then
modifySlot("Ally", localCardPos)
elseif md.id == "02157" or id == "01695" then
elseif md.id == "02157" or md.id == "01695" then
modifySlot("Accessory", localCardPos)
elseif md.id == "10132" then
modifySlot("Blursed", localCardPos)
end
end