feat: character list window (#602)

Updated character list window for old and new versions. --------- Co-authored-by: Marcos <[email protected]>
mehah · Oct 27, 2023 · 23e0626 · 23e0626
1 parent 01eeb84
commit 23e0626
Show file tree

Hide file tree

Showing 12 changed files with 315 additions and 12 deletions.
diff --git a/data/images/game/entergame/dailyreward_collected.png b/data/images/game/entergame/dailyreward_collected.png
diff --git a/data/images/game/entergame/dailyreward_notcollected.png b/data/images/game/entergame/dailyreward_notcollected.png
diff --git a/data/images/game/entergame/hidden.png b/data/images/game/entergame/hidden.png
diff --git a/data/images/game/entergame/maincharacter.png b/data/images/game/entergame/maincharacter.png
diff --git a/data/images/game/entergame/nopremium.png b/data/images/game/entergame/nopremium.png
diff --git a/data/images/game/entergame/premium.png b/data/images/game/entergame/premium.png
diff --git a/modules/client_entergame/characterlist.lua b/modules/client_entergame/characterlist.lua
@@ -9,6 +9,7 @@ local waitingWindow
 local updateWaitEvent
 local resendWaitEvent
 local loginEvent
+local outfitCreatureBox
 
 -- private functions
 local function tryLogin(charInfo, tries)
@@ -94,7 +95,18 @@ local function resendWait()
                     worldHost = selected.worldHost,
                     worldPort = selected.worldPort,
                     worldName = selected.worldName,
-                    characterName = selected.characterName
+                    characterName = selected.characterName,
+                    characterLevel = selected.characterLevel,
+                    main = selected.main,
+                    dailyreward = selected.dailyreward,
+                    hidden = selected.hidden,
+                    outfitid = selected.outfitid,
+                    headcolor = selected.headcolor,
+                    torsocolor = selected.torsocolor,
+                    legscolor = selected.legscolor,
+                    detailcolor = selected.detailcolor,
+                    addonsflags = selected.addonsflags,
+                    characterVocation = selected.characterVocation
                 }
                 tryLogin(charInfo)
             end
@@ -255,6 +267,10 @@ function CharacterList.create(characters, account, otui)
 
     characterList:destroyChildren()
     local accountStatusLabel = charactersWindow:getChildById('accountStatusLabel')
+    local accountStatusIcon = nil
+    if g_game.getFeature(GameEnterGameShowAppearance) then
+        accountStatusIcon = charactersWindow:getChildById('accountStatusIcon')
+    end
 
     local focusLabel
     for i, characterInfo in ipairs(characters) do
@@ -276,6 +292,37 @@ function CharacterList.create(characters, account, otui)
             end
         end
 
+        if g_game.getFeature(GameEnterGameShowAppearance) then
+            local creatureDisplay = widget:getChildById('outfitCreatureBox', characterList)
+            creatureDisplay:setSize("64 64")
+            local creature = Creature.create()
+            local outfit = {type = characterInfo.outfitid, head = characterInfo.headcolor, body = characterInfo.torsocolor, legs = characterInfo.legscolor, feet = characterInfo.detailcolor, addons = characterInfo.addonsflags}
+            creature:setOutfit(outfit)
+            creature:setDirection(2)
+            creatureDisplay:setCreature(creature)
+
+            local mainCharacter = widget:getChildById('mainCharacter', characterList)
+            if characterInfo.main then
+                mainCharacter:setImageSource('/images/game/entergame/maincharacter')
+            else
+                mainCharacter:setImageSource('')
+            end
+
+            local statusDailyReward = widget:getChildById('statusDailyReward', characterList)
+            if characterInfo.dailyreward == 0 then
+                statusDailyReward:setImageSource('/images/game/entergame/dailyreward_collected')
+            else
+                statusDailyReward:setImageSource('/images/game/entergame/dailyreward_notcollected')
+            end
+
+            local statusHidden = widget:getChildById('statusHidden', characterList)
+            if characterInfo.hidden then
+                statusHidden:setImageSource('/images/game/entergame/hidden')
+            else
+                statusHidden:setImageSource('')
+            end
+        end
+
         -- these are used by login
         widget.characterName = characterInfo.name
         widget.worldName = characterInfo.worldName
@@ -313,12 +360,18 @@ function CharacterList.create(characters, account, otui)
 
     if account.subStatus == SubscriptionStatus.Free then
         accountStatusLabel:setText(('%s%s'):format(tr('Free Account'), status))
+        if accountStatusIcon ~= nil then
+            accountStatusIcon:setImageSource('/images/game/entergame/nopremium')
+        end
     elseif account.subStatus == SubscriptionStatus.Premium then
         if account.premDays == 0 or account.premDays == 65535 then
             accountStatusLabel:setText(('%s%s'):format(tr('Gratis Premium Account'), status))
         else
             accountStatusLabel:setText(('%s%s'):format(tr('Premium Account (%s) days left', account.premDays), status))
         end
+        if accountStatusIcon ~= nil then
+            accountStatusIcon:setImageSource('/images/game/entergame/premium')
+        end
     end
 
     if account.premDays > 0 and account.premDays <= 7 then