Refine rogue job progression

2026-06-30 01:53:45 +09:00
parent 1847e2d9b2
commit 7db67e3ccd
15 changed files with 416 additions and 191 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 = "bandit" } }
+local arts = { { p = "/WarriorButton/Art", c = "warrior" }, { p = "/MageButton/Art", c = "magician" }, { p = "/BanditButton/Art", c = "rogue" } }
 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 = "bandit" } }
+local btns = { { p = "/WarriorButton", c = "warrior" }, { p = "/MageButton", c = "magician" }, { p = "/BanditButton", c = "rogue" } }
 for i = 1, #btns do
 	local e = _EntityService:GetEntityByPath(base .. btns[i].p)
 	if e ~= nil then
@@ -44,9 +44,9 @@ if self.SelectedClass == "warrior" then
 	eng = "Warrior"
 	btnName = "/WarriorButton"
 	desc = "직업군 · 모험가" .. nl .. "방어를 쌓고 버티다 강하게 역공하는 단단한 탱커."
-elseif self.SelectedClass == "bandit" then
+elseif self.SelectedClass == "rogue" then
 	name = "도적"
-	eng = "Thief"
+	eng = "Rogue"
 	btnName = "/BanditButton"
 	desc = "직업군 · 모험가" .. nl .. "표창 난사와 독으로 빠르게 몰아치는 민첩한 직업."
 elseif self.SelectedClass == "magician" then
@@ -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 ~= "bandit" and self.SelectedClass ~= "magician" then
+    method('StartNewGame', `if self.SelectedClass ~= "warrior" and self.SelectedClass ~= "rogue" 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.PlayerJob == "" and self.Floor < self.RunLength then
+		if self:CanAdvanceJob() == true 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("bandit") end)
+	self.ThiefDeckTabHandler = thiefTab:ConnectEvent(ButtonClickEvent, function() self:SetClassDeckTab("rogue") 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 ~= "bandit" then
-	className = "bandit"
+if className ~= "warrior" and className ~= "magician" and className ~= "rogue" then
+	className = "rogue"
 end
 self.CodexMode = false
 self.ClassDeckMode = true
@@ -119,32 +119,30 @@ self:Toast("테스트 카드 추가 모드")`),
 end
 self.ClassDeckCards = {}
 self.ClassDeckTitle = "직업 덱"
-if className ~= "warrior" and className ~= "magician" and className ~= "bandit" then
-	className = "bandit"
+if className ~= "warrior" and className ~= "magician" and className ~= "rogue" then
+	className = "rogue"
 end
 self.ClassDeckClass = className
 local allowed = {}
+local group = nil
+if self.ClassGroups ~= nil then
+	group = self.ClassGroups[className]
+end
+if group == nil then
+	group = { className }
+end
+for i = 1, #group do
+	allowed[group[i]] = true
+end
 if className == "warrior" then
-	allowed["warrior"] = true
-	allowed["fighter"] = true
-	allowed["page"] = true
-	allowed["spearman"] = true
 	self.ClassDeckTitle = "전사 전체 덱"
 elseif className == "magician" then
-	allowed["magician"] = true
-	allowed["firepoison"] = true
-	allowed["icelightning"] = true
-	allowed["cleric"] = true
 	self.ClassDeckTitle = "마법사 전체 덱"
 else
-	allowed["bandit"] = true
-	allowed["shiv"] = true
-	allowed["poisoner"] = true
-	allowed["trickster"] = true
 	self.ClassDeckTitle = "도적 전체 덱"
 end
 for id, c in pairs(self.Cards) do
-	if c ~= nil and c.curse ~= true and allowed[c.class] == true then
+	if c ~= nil and c.curse ~= true and c.token ~= true and allowed[c.class] == true then
 		table.insert(self.ClassDeckCards, id)
 	end
 end
@@ -162,7 +160,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 = "bandit" },
+	{ path = "/ui/DeckUIGroup/DeckAllHud/ThiefTab", cls = "rogue" },
 	{ 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,9 +1,50 @@
-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, 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';
+import { method } from '../lib/codeblock.mjs';

 export const jobMethods = [
-    method('ShowJobChoice', `self:SetEntityEnabled("/ui/RunUIGroup/CardHand", false)
+    method('BaseClassLabel', `if classId == "warrior" then
+	return "전사"
+elseif classId == "rogue" then
+	return "Rogue"
+elseif classId == "magician" then
+	return "마법사"
+end
+return "플레이어"`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'classId' }], 0, 'string'),
+    method('CurrentClassId', `if self.PlayerJob ~= nil and self.PlayerJob ~= "" then
+	return self.PlayerJob
+end
+return self.SelectedClass or ""`, [], 0, 'string'),
+    method('GetPlayableClasses', `local current = self:CurrentClassId()
+if current == nil or current == "" then
+	return {}
+end
+if self.ClassLineages ~= nil and self.ClassLineages[current] ~= nil then
+	return self.ClassLineages[current]
+end
+return { current }`, [], 0, 'any'),
+    method('CanUseClassCard', `if cardClass == nil or cardClass == "" then
+	return false
+end
+if cardClass == "curse" then
+	return true
+end
+local playable = self:GetPlayableClasses()
+for i = 1, #playable do
+	if playable[i] == cardClass then
+		return true
+	end
+end
+return false`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardClass' }], 0, 'boolean'),
+    method('CanAdvanceJob', `local current = self:CurrentClassId()
+if current == nil or current == "" or self.Jobs == nil then
+	return false
+end
+local opts = self.Jobs[current]
+return opts ~= nil and #opts > 0`, [], 0, 'boolean'),
+    method('ShowJobChoice', `if self:CanAdvanceJob() ~= true then
+	self:ContinueAfterBoss()
+	return
+end
+self:SetEntityEnabled("/ui/RunUIGroup/CardHand", false)
 self:SetEntityEnabled("/ui/RunUIGroup/DeckHud", false)
 self:SetEntityEnabled("/ui/SelectUIGroup/JobChoiceHud", true)`),
    method('PickJobReward', `self:SetEntityEnabled("/ui/SelectUIGroup/JobChoiceHud", false)
@@ -20,9 +61,13 @@ if kind == "relic" then
 else
 	self:ShowJobSelect()
 end`, [{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'kind' }]),
-    method('ShowJobSelect', `local opts = self.Jobs[self.SelectedClass]
+    method('ShowJobSelect', `local current = self:CurrentClassId()
+local opts = nil
+if self.Jobs ~= nil then
+	opts = self.Jobs[current]
+end
 if opts == nil then
-	opts = self.Jobs["warrior"]
+	opts = {}
 end
 self.JobOpts = opts
 for i = 1, 3 do
@@ -41,36 +86,30 @@ for i = 1, 3 do
 	end
 end
 self:SetEntityEnabled("/ui/SelectUIGroup/JobSelectHud", true)`),
-    method('JobLabel', `if self.PlayerJob ~= "" and self.Jobs ~= nil then
-	for cls, list in pairs(self.Jobs) do
-		for i = 1, #list do
-			if list[i].id == self.PlayerJob then
-				return list[i].name
-			end
-		end
-	end
+    method('JobLabel', `if self.PlayerJob ~= "" and self.JobMeta ~= nil and self.JobMeta[self.PlayerJob] ~= nil then
+	return self.JobMeta[self.PlayerJob].name
 end
-if self.SelectedClass == "warrior" then
-	return "전사"
-elseif self.SelectedClass == "bandit" then
-	return "도적"
-elseif self.SelectedClass == "magician" then
-	return "마법사"
-end
-return "플레이어"`, [], 0, 'string'),
-    method('SetJob', `self.PlayerJob = jobId
+return self:BaseClassLabel(self.SelectedClass)`, [], 0, 'string'),
+    method('SetJob', `local current = self:CurrentClassId()
 local starter = ""
-local opts = self.Jobs[self.SelectedClass] or {}
+local tier = 2
+local opts = {}
+if self.Jobs ~= nil and self.Jobs[current] ~= nil then
+	opts = self.Jobs[current]
+end
 for i = 1, #opts do
 	if opts[i].id == jobId then
-		starter = opts[i].starter
+		starter = opts[i].starter or ""
+		tier = opts[i].tier or 2
+		break
 	end
 end
+self.PlayerJob = jobId
 if starter ~= "" then
 	table.insert(self.RunDeck, starter)
 	local sc = self.Cards[starter]
 	if sc ~= nil then
-		self:Toast("2차 전직: " .. self:JobLabel() .. "! 신규 카드 — " .. sc.name)
+		self:Toast(tostring(tier) .. "차 전직: " .. 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,7 +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
-	if c.token ~= true and (c.class == self.SelectedClass or (self.PlayerJob ~= "" and c.class == self.PlayerJob)) then
+	if c.token ~= true and self:CanUseClassCard(c.class) == true then
 		table.insert(pool, id)
 	end
 end
--- a/tools/deck/cb/run.mjs
+++ b/tools/deck/cb/run.mjs
@@ -1,14 +1,14 @@
 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, 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 { CARDS, ENEMIES, CLASSES, JOBS, JOB_META, CLASS_GROUPS, CLASS_LINEAGES, 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, luaClassGroupsTable, luaClassLineagesTable, luaJobMetaTable, 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
 	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(', ')} }
+elseif self.SelectedClass == "rogue" then
+	self.PlayerMaxHp = ${CLASSES.rogue.maxHp}
+	self.RunDeck = { ${CARDS.starterDecks.rogue.map(luaStr).join(', ')} }
 else
 	self.PlayerMaxHp = ${CLASSES.warrior.maxHp}
 	self.RunDeck = { ${CARDS.starterDecks.warrior.map(luaStr).join(', ')} }
@@ -30,6 +30,9 @@ self.CurrentNodeId = ""
 self.CurrentEnemyId = ""
 self.PlayerJob = ""
 ${luaJobsTable(JOBS)}
+${luaJobMetaTable(JOB_META)}
+${luaClassGroupsTable(CLASS_GROUPS)}
+${luaClassLineagesTable(CLASS_LINEAGES)}
 ${luaFramesTable()}
 ${luaNodeIconsTable()}
 ${luaCharsTable()}
--- 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("bandit") end)
+	self.ThiefSelectHandler = thief:ConnectEvent(ButtonClickEvent, function() self:SelectClass("rogue") end)
 end
 local mage = _EntityService:GetEntityByPath("/ui/SelectUIGroup/CharacterSelectHud/MageButton")
 if mage ~= nil and (mage.ButtonComponent ~= nil or mage:AddComponent("ButtonComponent") ~= nil) then