Revert "Refine rogue progression and card pools"

This reverts commit 95d6155086.
2026-06-30 00:49:38 +09:00
parent 5e2fd5db22
commit 1847e2d9b2
13 changed files with 380 additions and 276 deletions
--- a/tools/deck/cb/charselect.mjs
+++ b/tools/deck/cb/charselect.mjs
@@ -11,14 +11,14 @@ self:RenderCharacterSelect()`, [
      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'className' },
    ]),
    method('RenderCharacterSelect', `local base = "/ui/SelectUIGroup/CharacterSelectHud"
-local arts = { { p = "/WarriorButton/Art", c = "warrior" }, { p = "/MageButton/Art", c = "magician" }, { p = "/BanditButton/Art", c = "rogue" } }
+local arts = { { p = "/WarriorButton/Art", c = "warrior" }, { p = "/MageButton/Art", c = "magician" }, { p = "/BanditButton/Art", c = "bandit" } }
 for i = 1, #arts do
 	local e = _EntityService:GetEntityByPath(base .. arts[i].p)
 	if e ~= nil and e.SpriteGUIRendererComponent ~= nil and self.ClassPortraits ~= nil and self.ClassPortraits[arts[i].c] ~= nil then
 		e.SpriteGUIRendererComponent.ImageRUID = self.ClassPortraits[arts[i].c]
 	end
 end
-local btns = { { p = "/WarriorButton", c = "warrior" }, { p = "/MageButton", c = "magician" }, { p = "/BanditButton", c = "rogue" } }
+local btns = { { p = "/WarriorButton", c = "warrior" }, { p = "/MageButton", c = "magician" }, { p = "/BanditButton", c = "bandit" } }
 for i = 1, #btns do
 	local e = _EntityService:GetEntityByPath(base .. btns[i].p)
 	if e ~= nil then
@@ -43,17 +43,17 @@ if self.SelectedClass == "warrior" then
 	name = "전사"
 	eng = "Warrior"
 	btnName = "/WarriorButton"
-	desc = "직업군 · 모험가" .. nl .. "방어를 쌓고 버티는 공격형 전사."
-elseif self.SelectedClass == "rogue" then
+	desc = "직업군 · 모험가" .. nl .. "방어를 쌓고 버티다 강하게 역공하는 단단한 탱커."
+elseif self.SelectedClass == "bandit" then
 	name = "도적"
-	eng = "Rogue"
+	eng = "Thief"
 	btnName = "/BanditButton"
-	desc = "직업군 · 모험가" .. nl .. "기동성과 콤보로 빠르게 움직이는 도적."
+	desc = "직업군 · 모험가" .. nl .. "표창 난사와 독으로 빠르게 몰아치는 민첩한 직업."
 elseif self.SelectedClass == "magician" then
-	name = "마법사"
+	name = "법사"
 	eng = "Magician"
 	btnName = "/MageButton"
-	desc = "직업군 · 모험가" .. nl .. "주문과 원소로 전장을 장악하는 마법사."
+	desc = "직업군 · 모험가" .. nl .. "약하지만 게이지 운용으로 화력을 집중하는 원소 마법사."
 end
 if btnName ~= "" then
 	local art = _EntityService:GetEntityByPath(base .. btnName .. "/Art")
@@ -65,7 +65,7 @@ end
 self:SetText(base .. "/SelectedClass", name)
 self:SetText(base .. "/SelectedClass/SelectedClassEng", eng)
 self:SetText(base .. "/SelectedClassStatus", desc)`),
-    method('StartNewGame', `if self.SelectedClass ~= "warrior" and self.SelectedClass ~= "rogue" and self.SelectedClass ~= "magician" then
+    method('StartNewGame', `if self.SelectedClass ~= "warrior" and self.SelectedClass ~= "bandit" and self.SelectedClass ~= "magician" then
 	self:SetText("/ui/SelectUIGroup/CharacterSelectHud/SelectedClassStatus", "직업을 먼저 선택하세요")
 	return
 end
--- a/tools/deck/cb/combat.mjs
+++ b/tools/deck/cb/combat.mjs
@@ -707,7 +707,7 @@ if anyAlive == false then
 		end
 	end
 	if node ~= nil and node.type == "boss" then
-		if self:ShouldOfferJobChoice() == true then
+		if self.PlayerJob == "" and self.Floor < self.RunLength then
 			self:ShowJobChoice()
 		else
 			if self.PlayerJob ~= "" then self:AwardSouls(1) end
--- a/tools/deck/cb/deckview.mjs
+++ b/tools/deck/cb/deckview.mjs
@@ -77,7 +77,7 @@ if thiefTab ~= nil and (thiefTab.ButtonComponent ~= nil or thiefTab:AddComponent
 		thiefTab:DisconnectEvent(ButtonClickEvent, self.ThiefDeckTabHandler)
 		self.ThiefDeckTabHandler = nil
 	end
-	self.ThiefDeckTabHandler = thiefTab:ConnectEvent(ButtonClickEvent, function() self:SetClassDeckTab("rogue") end)
+	self.ThiefDeckTabHandler = thiefTab:ConnectEvent(ButtonClickEvent, function() self:SetClassDeckTab("bandit") end)
 end
 local mageTab = _EntityService:GetEntityByPath("/ui/DeckUIGroup/DeckAllHud/MageTab")
 if mageTab ~= nil and (mageTab.ButtonComponent ~= nil or mageTab:AddComponent("ButtonComponent") ~= nil) then
@@ -101,8 +101,8 @@ end`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], N
 	return
 end
 local className = self.SelectedClass
-if className ~= "warrior" and className ~= "magician" and className ~= "rogue" then
-	className = "rogue"
+if className ~= "warrior" and className ~= "magician" and className ~= "bandit" then
+	className = "bandit"
 end
 self.CodexMode = false
 self.ClassDeckMode = true
@@ -119,8 +119,8 @@ self:Toast("테스트 카드 추가 모드")`),
 end
 self.ClassDeckCards = {}
 self.ClassDeckTitle = "직업 덱"
-if className ~= "warrior" and className ~= "magician" and className ~= "rogue" then
-	className = "rogue"
+if className ~= "warrior" and className ~= "magician" and className ~= "bandit" then
+	className = "bandit"
 end
 self.ClassDeckClass = className
 local allowed = {}
@@ -137,8 +137,10 @@ elseif className == "magician" then
 	allowed["cleric"] = true
 	self.ClassDeckTitle = "마법사 전체 덱"
 else
-	local pools = self.ClassPools or {}
-	allowed = pools[className] or allowed
+	allowed["bandit"] = true
+	allowed["shiv"] = true
+	allowed["poisoner"] = true
+	allowed["trickster"] = true
 	self.ClassDeckTitle = "도적 전체 덱"
 end
 for id, c in pairs(self.Cards) do
@@ -160,7 +162,7 @@ self:RenderAllDeck()
 self:RenderClassDeckTabs()`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'className' }]),
    method('RenderClassDeckTabs', `local tabs = {
 	{ path = "/ui/DeckUIGroup/DeckAllHud/WarriorTab", cls = "warrior" },
-	{ path = "/ui/DeckUIGroup/DeckAllHud/ThiefTab", cls = "rogue" },
+	{ path = "/ui/DeckUIGroup/DeckAllHud/ThiefTab", cls = "bandit" },
 	{ path = "/ui/DeckUIGroup/DeckAllHud/MageTab", cls = "magician" },
 }
 for i = 1, #tabs do
--- a/tools/deck/cb/jobs.mjs
+++ b/tools/deck/cb/jobs.mjs
@@ -1,5 +1,5 @@
 import { method, RUN_LENGTH, GOLD_PER_WIN, CARD_PRICE, REST_HEAL, RELIC_PRICE, ACT_COUNT, ACT_MAPS, LOBBY_MAP, LOBBY_SPAWN } from '../lib/codeblock.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, CLASS_POOLS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable, luaClassPoolsTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';

 export const jobMethods = [
@@ -20,32 +20,9 @@ if kind == "relic" then
 else
 	self:ShowJobSelect()
 end`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'kind' }]),
-    method('ShouldOfferJobChoice', `if self.Floor >= self.RunLength then
-	return false
-end
-if self.PlayerJob == "" then
-	return true
-end
-if self.PlayerJob == "assassin" or self.PlayerJob == "thief" then
-	return true
-end
-return false`, [], 0, 'boolean'),
-    method('CurrentJobChoices', `if self.PlayerJob == "" then
-	local baseClass = self.SelectedClass
-	if baseClass == "rogue" then
-		return self.Jobs["rogue"]
-	end
-	return self.Jobs[baseClass] or self.Jobs["rogue"]
-elseif self.PlayerJob == "assassin" then
-	return self.Jobs["assassin"]
-elseif self.PlayerJob == "thief" then
-	return self.Jobs["thief"]
-end
-return nil`, [], 0, 'any'),
-    method('ShowJobSelect', `local opts = self:CurrentJobChoices()
-if opts == nil or #opts <= 0 then
-	self:ContinueAfterBoss()
-	return
+    method('ShowJobSelect', `local opts = self.Jobs[self.SelectedClass]
+if opts == nil then
+	opts = self.Jobs["warrior"]
 end
 self.JobOpts = opts
 for i = 1, 3 do
@@ -57,7 +34,7 @@ for i = 1, 3 do
 		self:SetText(base .. "/Desc", o.desc)
 		local sc = self.Cards[o.starter]
 		if sc ~= nil then
-			self:SetText(base .. "/Starter", "기본 카드: " .. sc.name)
+			self:SetText(base .. "/Starter", "대표 카드: " .. sc.name)
 		end
 	else
 		self:SetEntityEnabled(base, false)
@@ -75,28 +52,15 @@ self:SetEntityEnabled("/ui/SelectUIGroup/JobSelectHud", true)`),
 end
 if self.SelectedClass == "warrior" then
 	return "전사"
-elseif self.SelectedClass == "rogue" then
+elseif self.SelectedClass == "bandit" then
 	return "도적"
 elseif self.SelectedClass == "magician" then
 	return "마법사"
 end
 return "플레이어"`, [], 0, 'string'),
-    method('SetJob', `local prevJob = self.PlayerJob
-local tier = 2
-if prevJob == "assassin" or prevJob == "thief" then
-	tier = 3
-end
-self.PlayerJob = jobId
+    method('SetJob', `self.PlayerJob = jobId
 local starter = ""
-local opts = {}
-if prevJob == "" then
-	local baseClass = self.SelectedClass
-	opts = self.Jobs[baseClass] or self.Jobs["rogue"] or {}
-elseif prevJob == "assassin" then
-	opts = self.Jobs["assassin"] or {}
-elseif prevJob == "thief" then
-	opts = self.Jobs["thief"] or {}
-end
+local opts = self.Jobs[self.SelectedClass] or {}
 for i = 1, #opts do
 	if opts[i].id == jobId then
 		starter = opts[i].starter
@@ -106,7 +70,7 @@ if starter ~= "" then
 	table.insert(self.RunDeck, starter)
 	local sc = self.Cards[starter]
 	if sc ~= nil then
-		self:Toast(tostring(tier) .. "차 전직: " .. self:JobLabel() .. "! 신규 카드 — " .. sc.name)
+		self:Toast("2차 전직: " .. self:JobLabel() .. "! 신규 카드 — " .. sc.name)
 	end
 end
 self:SetText("/ui/RunUIGroup/CombatHud/PlayerPanel/Name", self:JobLabel())
--- a/tools/deck/cb/reward.mjs
+++ b/tools/deck/cb/reward.mjs
@@ -5,10 +5,7 @@ import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER,
 export const rewardMethods = [
    method('CardPool', `local pool = {}
 for id, c in pairs(self.Cards) do
-	local pools = self.ClassPools or {}
-	local basePool = pools[self.SelectedClass] or pools.rogue or {}
-	local jobPool = pools[self.PlayerJob] or {}
-	if c.token ~= true and ((basePool[c.class] == true) or (self.PlayerJob ~= "" and jobPool[c.class] == true)) then
+	if c.token ~= true and (c.class == self.SelectedClass or (self.PlayerJob ~= "" and c.class == self.PlayerJob)) then
 		table.insert(pool, id)
 	end
 end
--- a/tools/deck/cb/run.mjs
+++ b/tools/deck/cb/run.mjs
@@ -1,17 +1,17 @@
 import { method, RUN_LENGTH, GOLD_PER_WIN, CARD_PRICE, REST_HEAL, RELIC_PRICE, ACT_COUNT, ACT_MAPS, LOBBY_MAP, LOBBY_SPAWN } from '../lib/codeblock.mjs';
-import { CARDS, ENEMIES, CLASSES, JOBS, CLASS_POOLS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaCharsTable, luaClassPoolsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
+import { CARDS, ENEMIES, CLASSES, JOBS, SOUL_UNLOCKS, CARDFRAMES, RARITIES, MAP_ROWS, MAP_COLS, CHEST_CLOSED_RUID, CHEST_OPEN_RUID, NODEICONS, CHARS, CAM, RELICS, POTIONS, luaSoulShopTable, frameRuid, luaFramesTable, luaNodeIconsTable, luaCharsTable, luaRelicsTable, luaPotionsTable, luaIntentsArray, luaEnemiesTable, luaStr, luaJobsTable, luaCardsTable, luaDeckTable } from '../lib/data.mjs';
 import { UI_FILE, COMMON_FILE, UI_ROOT, GENERATED_UI_SECTIONS, UI_APPEND_ORDER, DISABLED_STOCK_CONTROLS, TRANSPARENT, DARK, GOLD, ATTACK, DEFEND, SKILL, DAMAGE_DIGIT_RUIDS, DAMAGE_POP_MAX_DIGITS, DAMAGE_POP_DIGIT_W, DAMAGE_POP_DIGIT_H, DAMAGE_POP_DIGIT_SPACING, MAX_MONSTERS, HEAD_OFFSET_Y, HP_BAR_W, WHITE, CARD_NAME_TEXT, CARD_DESC_TEXT, cardFaceLayout, CARD_W, CARD_H, CARD_SPACING, CARD_XS, ALIGN_CENTER, ALIGN_BOTTOM_CENTER, guid, transform, sprite, button, text, scrollLayoutGroup, popupLayerFor, uiOrderFor, displayOrderFor, applySortingOverride, entity, uiPath, sectionRoot, isGeneratedUiEntity, appendUiSection } from '../lib/ui-helpers.mjs';

 export const runMethods = [
    method('StartRun', `if self.SelectedClass == "magician" then
-\tself.PlayerMaxHp = ${CLASSES.magician.maxHp}
-\tself.RunDeck = { ${CARDS.starterDecks.magician.map(luaStr).join(', ')} }
-elseif self.SelectedClass == "rogue" then
-\tself.PlayerMaxHp = ${CLASSES.rogue.maxHp}
-\tself.RunDeck = { ${CARDS.starterDecks.rogue.map(luaStr).join(', ')} }
+	self.PlayerMaxHp = ${CLASSES.magician.maxHp}
+self.RunDeck = { ${CARDS.starterDecks.magician.map(luaStr).join(', ')} }
+elseif self.SelectedClass == "bandit" then
+	self.PlayerMaxHp = ${CLASSES.bandit.maxHp}
+	self.RunDeck = { ${CARDS.starterDecks.bandit.map(luaStr).join(', ')} }
 else
-\tself.PlayerMaxHp = ${CLASSES.warrior.maxHp}
-\tself.RunDeck = { ${CARDS.starterDecks.warrior.map(luaStr).join(', ')} }
+	self.PlayerMaxHp = ${CLASSES.warrior.maxHp}
+	self.RunDeck = { ${CARDS.starterDecks.warrior.map(luaStr).join(', ')} }
 end
 self.PlayerMaxHp = self.PlayerMaxHp - self:AscStartHpPenalty()
 self.PlayerHp = self.PlayerMaxHp
@@ -30,7 +30,6 @@ self.CurrentNodeId = ""
 self.CurrentEnemyId = ""
 self.PlayerJob = ""
 ${luaJobsTable(JOBS)}
-${luaClassPoolsTable()}
 ${luaFramesTable()}
 ${luaNodeIconsTable()}
 ${luaCharsTable()}
@@ -47,16 +46,16 @@ if lp ~= nil then cam = lp.CameraComponent end
 if cam == nil then cam = _CameraService:GetCurrentCameraComponent() end
 if cam ~= nil then cam.ConfineCameraArea = false end
 _TimerService:SetTimerOnce(function()
-\tlocal cc = nil
-\tlocal lp2 = _UserService.LocalPlayer
-\tif lp2 ~= nil then cc = lp2.CameraComponent end
-\tif cc == nil then cc = _CameraService:GetCurrentCameraComponent() end
-\tif cc ~= nil then
-\t\tcc.ZoomRatio = ${CAM.zoomRatio}
-\t\tcc.CameraOffset = Vector2(${CAM.cameraOffsetX}, ${CAM.cameraOffsetY})
-\t\tcc.ScreenOffset = Vector2(${CAM.screenOffsetX}, ${CAM.screenOffsetY})
-\t\tcc.ConfineCameraArea = true
-\tend
+	local cc = nil
+	local lp2 = _UserService.LocalPlayer
+	if lp2 ~= nil then cc = lp2.CameraComponent end
+	if cc == nil then cc = _CameraService:GetCurrentCameraComponent() end
+	if cc ~= nil then
+		cc.ZoomRatio = ${CAM.zoomRatio}
+		cc.CameraOffset = Vector2(${CAM.cameraOffsetX}, ${CAM.cameraOffsetY})
+		cc.ScreenOffset = Vector2(${CAM.screenOffsetX}, ${CAM.screenOffsetY})
+		cc.ConfineCameraArea = true
+	end
 end, 0.2)`),
    method('StartCombat', `self:ShowState("combat")
 self:KickCombatCamera()
@@ -123,7 +122,7 @@ self.Hand = {}
 ${luaCardsTable(CARDS.cards)}
 self.DrawPile = {}
 for i = 1, #self.RunDeck do
-\tself.DrawPile[i] = self.RunDeck[i]
+	self.DrawPile[i] = self.RunDeck[i]
 end
 self:Shuffle(self.DrawPile)
 self:PrepareCombatDrawPile()
@@ -134,14 +133,123 @@ self:ApplyRelics("combatStart")
 self:RenderCombat()
 local slotTid = 0
 slotTid = _TimerService:SetTimerRepeat(function()
-\tif self.CombatOver == true or self.Monsters == nil or #self.Monsters == 0 then
-\t\t_TimerService:ClearTimer(slotTid)
-\t\treturn
-\tend
-\tfor i = 1, #self.Monsters do
-\t\tif self.Monsters[i] ~= nil and self.Monsters[i].alive == true then
-\t\t\tself:PositionMonsterSlot(i)
-\t\tend
-\tend
+	if self.CombatOver == true or self.Monsters == nil or #self.Monsters == 0 then
+		_TimerService:ClearTimer(slotTid)
+		return
+	end
+	for i = 1, #self.Monsters do
+		if self.Monsters[i] ~= nil and self.Monsters[i].alive == true then
+			self:PositionMonsterSlot(i)
+		end
+	end
 end, 0.15)`),
+    method('RegisterMonster', `if self.Registered == nil then
+	self.Registered = {}
+end
+local g = group
+if g == nil or g == "" then g = "combat" end
+local mp = mapName
+if mp == nil then mp = "" end
+table.insert(self.Registered, { entity = monster, enemyId = enemyId, group = g, map = mp })`, [
+      { Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'monster' },
+      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'enemyId' },
+      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'group' },
+      { Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'mapName' },
+    ]),
+    method('BuildMonsters', `self.Monsters = {}
+local g = "combat"
+local node = self.MapNodes[self.CurrentNodeId]
+if node ~= nil and node.type ~= nil then g = node.type end
+local pmap = ""
+local lp = _UserService.LocalPlayer
+if lp ~= nil and lp.CurrentMapName ~= nil then pmap = lp.CurrentMapName end
+local reg = self.Registered or {}
+for i = 1, #reg do
+	if reg[i].entity ~= nil and isvalid(reg[i].entity) then
+		reg[i].entity:SetVisible(false)
+	end
+end
+local byGroup = {}
+for i = 1, #reg do
+	local r = reg[i]
+	if r.entity ~= nil and isvalid(r.entity) and (r.map == nil or r.map == "" or pmap == "" or r.map == pmap) then
+		local gg = r.group
+		if gg == nil or gg == "" then gg = "combat" end
+		if byGroup[gg] == nil then byGroup[gg] = {} end
+		local x = 0
+		if r.entity.TransformComponent ~= nil then
+			x = r.entity.TransformComponent.WorldPosition.x
+		end
+		table.insert(byGroup[gg], { entity = r.entity, enemyId = r.enemyId, x = x })
+	end
+end
+-- 노드 타입별 랜덤 구성: 일반 1~3 / 엘리트 1+일반0~2 / 보스 1
+local chosen = {}
+local function takeFrom(key, k)
+	local src = byGroup[key] or {}
+	local pool = {}
+	for i = 1, #src do pool[i] = src[i] end
+	self:Shuffle(pool)
+	local taken = 0
+	for i = 1, #pool do
+		if taken >= k then break end
+		table.insert(chosen, pool[i])
+		taken = taken + 1
+	end
+end
+if g == "boss" then
+	takeFrom("boss", 1)
+elseif g == "elite" then
+	takeFrom("elite", 1)
+	takeFrom("combat", math.random(0, 2))
+else
+	takeFrom("combat", math.random(1, 3))
+end
+if #chosen == 0 then takeFrom(g, 1) end
+if #chosen == 0 then takeFrom("combat", 1) end
+table.sort(chosen, function(a, b) return a.x < b.x end)
+local mult = 1 + (self.Floor - 1) * 0.45
+if g == "elite" or g == "boss" then
+	mult = mult + self:AscEliteBonus()
+end
+local n = #chosen
+if n > ${MAX_MONSTERS} then n = ${MAX_MONSTERS} end
+for i = 1, n do
+	local item = chosen[i]
+	local e = self.Enemies[item.enemyId]
+	if e == nil then e = { name = item.enemyId, maxHp = 10, intents = { { kind = "Attack", value = 5 } } } end
+	local intents = {}
+	for k = 1, #e.intents do
+		local v = e.intents[k].value or 0
+		if e.intents[k].kind == "Attack" then
+			v = math.floor(v * mult * self:AscAtkMult())
+		elseif e.intents[k].kind ~= "Debuff" then
+			v = math.floor(v * mult)
+		end
+		intents[k] = { kind = e.intents[k].kind, value = v, effect = e.intents[k].effect, card = e.intents[k].card, count = e.intents[k].count }
+	end
+	local maxHp = math.floor(e.maxHp * mult * self:AscHpMult())
+	local hitClip = nil
+	local standClip = nil
+	if item.entity.StateAnimationComponent ~= nil then
+		pcall(function()
+			hitClip = item.entity.StateAnimationComponent.ActionSheet["hit"]
+			standClip = item.entity.StateAnimationComponent.ActionSheet["stand"]
+		end)
+	end
+	local startIdx = 1
+	if #intents > 0 then startIdx = math.random(1, #intents) end
+	self.Monsters[i] = { entity = item.entity, enemyId = item.enemyId, name = e.name,
+		hp = maxHp, maxHp = maxHp, block = 0, str = e.str or 0, weak = 0, vuln = 0, poison = 0, artifact = e.artifact or 0,
+		hitClip = hitClip, standClip = standClip, motionBusy = false,
+		intents = intents, intentIdx = startIdx, alive = true, slot = i }
+	self:ReviveMonsterEntity(item.entity)
+	self:PositionMonsterSlot(i)
+end
+self.TargetIndex = 1`),
+    method('ReviveMonsterEntity', `if monster == nil or not isvalid(monster) then
+	return
+end
+monster:SetEnable(true)
+monster:SetVisible(true)`, [{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'monster' }]),
 ];
--- a/tools/deck/cb/screens.mjs
+++ b/tools/deck/cb/screens.mjs
@@ -75,7 +75,7 @@ if thief ~= nil and (thief.ButtonComponent ~= nil or thief:AddComponent("ButtonC
 		thief:DisconnectEvent(ButtonClickEvent, self.ThiefSelectHandler)
 		self.ThiefSelectHandler = nil
 	end
-self.ThiefSelectHandler = thief:ConnectEvent(ButtonClickEvent, function() self:SelectClass("rogue") end)
+	self.ThiefSelectHandler = thief:ConnectEvent(ButtonClickEvent, function() self:SelectClass("bandit") end)
 end
 local mage = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/MageButton")
 if mage ~= nil and (mage.ButtonComponent ~= nil or mage:AddComponent("ButtonComponent") ~= nil) then