Skip to content

fix: game_outfit Adjust outfit size and prevent "ERROR: invalid thing type" #884

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
Nottinghster merged 2 commits into from
Sep 21, 2024
Merged

fix: game_outfit Adjust outfit size and prevent "ERROR: invalid thing type" #884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce518c6
fix: outfit size , prevent ERROR: invalid thing
kokekanon Sep 21, 2024
b569a82
Merge branch 'main' into kokekanon/fixOutfit
Nottinghster Sep 21, 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
15 changes: 7 additions & 8 deletions modules/game_outfit/outfit.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ local function showSelectionList(data, tempValue, tempField, onSelectCallback)
local button = g_ui.createWidget("SelectionButton", window.selectionList)
button:setId("0")

button.outfit:setOutfit({
type = 0
})
button.name:setText("None")
if tempValue == 0 then
focused = 0
Expand Down Expand Up @@ -846,7 +843,9 @@ function showOutfits()

local thingType = g_things.getThingType(outfit.type, ThingCategoryCreature)
button.outfit:setPadding(-8)
button.outfit:setCreatureSize(thingType:getRealSize() + 32)
if thingType:getRealSize() > 0 then
button.outfit:setCreatureSize(thingType:getRealSize() + 32)
end
--button.outfit:setBorderColor('red')
--button.outfit:setBorderWidth(2)

Expand Down Expand Up @@ -897,7 +896,9 @@ function showMounts()

local thingType = g_things.getThingType(mountData[1], ThingCategoryCreature)
button.outfit:setPadding(-8)
button.outfit:setCreatureSize(thingType:getRealSize() + 32)
if thingType:getRealSize() > 0 then
button.outfit:setCreatureSize(thingType:getRealSize() + 32)
end

button.name:setText(mountData[2])
if tempOutfit.mount == mountData[1] then
Expand Down Expand Up @@ -1056,9 +1057,7 @@ function showTitle()
local button = g_ui.createWidget("SelectionButton", window.selectionList)
button:setId("0")

button.outfit:setOutfit({
type = 0
})

button.name:setText("None")
if tempOutfit.tile == 0 then
focused = 0
Expand Down