diff --git a/tools/deck/cb/combat.mjs b/tools/deck/cb/combat.mjs
index efb6d33..f3e8eb1 100644
--- a/tools/deck/cb/combat.mjs
+++ b/tools/deck/cb/combat.mjs
@@ -295,6 +295,7 @@ if dmg > 0 then
 		self:ApplyPoisonToMonster(m, poison)
 	end
 end
+self:ShowDmgPop(m.slot, dmg)
 self:MonsterHitMotion(m.slot)
 local killed = false
 if m.hp <= 0 then
diff --git a/tools/deck/cb/deckview.mjs b/tools/deck/cb/deckview.mjs
index edd3999..7f9ce33 100644
--- a/tools/deck/cb/deckview.mjs
+++ b/tools/deck/cb/deckview.mjs
@@ -181,6 +181,7 @@ end
 self.DeckInspectKind = ""
 self.ClassDeckMode = false
 self.ClassDeckClass = ""
+self.CodexMode = false
 self.DebugCardPickerMode = false
 self:RenderClassDeckTabs()
 self.DeckAllOpen = true
@@ -211,6 +212,9 @@ local title = "모든 덱"
 if self.ClassDeckMode == true then
 	pile = self.ClassDeckCards or {}
 	title = self.ClassDeckTitle
+	if self.CodexMode == true then
+		title = "카드 도감"
+	end
 	if self.DebugCardPickerMode == true then
 		title = title .. " - 테스트 카드 추가"
 	end
diff --git a/tools/deck/cb/hand.mjs b/tools/deck/cb/hand.mjs
index e5b8c0c..926ddb2 100644
--- a/tools/deck/cb/hand.mjs
+++ b/tools/deck/cb/hand.mjs
@@ -550,7 +550,7 @@ if c.kind == "Attack" then
 					if targetIdx ~= nil and targetIdx > 0 then
 						local prev = self.TargetIndex
 						self.TargetIndex = targetIdx
-						local killed = self:DealDamageToTarget(total / hitN, c.pierce == true)
+						local killed = self:DealDamageToTarget(math.floor(total / hitN), c.pierce == true)
 						self.TargetIndex = prev
 						if killed == true then roundKilled = true end
 					end
diff --git a/tools/deck/cb/items.mjs b/tools/deck/cb/items.mjs
index 738ce50..de45917 100644
--- a/tools/deck/cb/items.mjs
+++ b/tools/deck/cb/items.mjs
@@ -151,7 +151,6 @@ if p.effect == "heal" then
 	self.PlayerHp = math.min(self.PlayerHp + p.value, self.PlayerMaxHp)
 elseif p.effect == "damage" then
 	self:DealDamageToTarget(p.value, false)
-	self:ShowDmgPop(self.TargetIndex, p.value)
 elseif p.effect == "strength" then
 	self.PlayerStr = self.PlayerStr + p.value
 elseif p.effect == "block" then
diff --git a/tools/deck/cb/reward.mjs b/tools/deck/cb/reward.mjs
index 32b0740..3e80ae3 100644
--- a/tools/deck/cb/reward.mjs
+++ b/tools/deck/cb/reward.mjs
@@ -47,7 +47,7 @@ if slot ~= 0 and self.RewardChoices ~= nil then
 		table.insert(self.RunDeck, id)
 	end
 end
-if self.BonusRewardScreens ~= nil and self.BonusRewardScreens > 0 and slot ~= 0 then
+if self.BonusRewardScreens ~= nil and self.BonusRewardScreens > 0 then
 	self.BonusRewardScreens = self.BonusRewardScreens - 1
 	self:OfferReward()
 	return
diff --git a/tools/deck/cb/shop.mjs b/tools/deck/cb/shop.mjs
index eb9056c..0591ff8 100644
--- a/tools/deck/cb/shop.mjs
+++ b/tools/deck/cb/shop.mjs
@@ -9,7 +9,17 @@ self.ShopBought = { false, false, false }
 for i = 1, 3 do
 	self.ShopChoices[i] = pool[math.random(1, #pool)]
 end
-self.ShopRelic = self.RelicPool[math.random(1, #self.RelicPool)]
+local relicChoices = {}
+for i = 1, #self.RelicPool do
+	if self:HasRelic(self.RelicPool[i]) == false then
+		table.insert(relicChoices, self.RelicPool[i])
+	end
+end
+if #relicChoices > 0 then
+	self.ShopRelic = relicChoices[math.random(1, #relicChoices)]
+else
+	self.ShopRelic = ""
+end
 self.ShopRelicBought = false
 local pkeys = {}
 for pid, _ in pairs(self.Potions) do
@@ -38,6 +48,7 @@ for i = 1, 3 do
 end
 local rr = self.Relics[self.ShopRelic]
 if rr ~= nil then
+	self:SetEntityEnabled("/ui/RunUIGroup/ShopHud/Relic", true)
 	self:SetText("/ui/RunUIGroup/ShopHud/Relic/Label", rr.name .. " — " .. rr.desc)
 	self:SetText("/ui/RunUIGroup/ShopHud/Relic/Price", string.format("%d", ${RELIC_PRICE}) .. " 메소")
 	local re = _EntityService:GetEntityByPath("/ui/RunUIGroup/ShopHud/Relic")
@@ -48,6 +59,8 @@ if rr ~= nil then
 			re.SpriteGUIRendererComponent.Color = Color(0.7, 0.55, 0.85, 1)
 		end
 	end
+else
+	self:SetEntityEnabled("/ui/RunUIGroup/ShopHud/Relic", false)
 end
 local pp = self.Potions[self.ShopPotion]
 if pp ~= nil then
@@ -65,6 +78,9 @@ end`),
     method('BuyRelic', `if self.ShopRelicBought == true then
 	return
 end
+if self.ShopRelic == nil or self.ShopRelic == "" then
+	return
+end
 if self.Gold < ${RELIC_PRICE} then
 	return
 end