Merge pull request 'Fix combat target cleanup and damage popups' (#59) from codex/fix-card-target-ui-dmgpop into main

Reviewed-on: #59

tools/deck/gen-slaydeck.mjs

@@ -240,7 +240,7 @@ const DAMAGE_DIGIT_RUIDS = [
 const DAMAGE_POP_MAX_DIGITS = 5;
 const DAMAGE_POP_DIGIT_W = 22;
 const DAMAGE_POP_DIGIT_H = 32;
-const DAMAGE_POP_DIGIT_SPACING = 18;
+const DAMAGE_POP_DIGIT_SPACING = -4;
 
 const MAX_MONSTERS = 4;
 const HEAD_OFFSET_Y = 1.4; // 몬스터 월드 원점 위로 띄울 높이(머리 위) — world→screen 변환 전 가산
@@ -1212,22 +1212,23 @@ function upsertUi() {
         text({ value: '', fontSize: 17, bold: true, color: { r: 1, g: 0.72, b: 0.5, a: 1 }, alignment: 4 }),
       ],
     }));
+    const dmgPopBase = `/ui/DefaultGroup/CombatHud/DmgPop${i}`;
     const dmgPop = entity({
-      id: guid('cmb', 250 + i), path: `${base}/DmgPop`, modelId: 'uisprite', entryId: 'UISprite',
+      id: guid('cmb', 250 + i), path: dmgPopBase, modelId: 'uisprite', entryId: 'UISprite',
       componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent',
-      displayOrder: 11,
+      displayOrder: 80 + i,
       components: [
-        transform({ parentW: SLOT_W, parentH: SLOT_H, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 192, y: 56 }, pos: { x: 0, y: 76 } }),
-        sprite({ color: { r: 0.12, g: 0.02, b: 0.02, a: 0.72 }, type: 1 }),
+        transform({ parentW: 1920, parentH: 1080, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: 192, y: 56 }, pos: { x: 0, y: 0 } }),
+        sprite({ color: TRANSPARENT, type: 1 }),
       ],
     });
     dmgPop.jsonString.enable = false;
     combat.push(dmgPop);
     for (let d = 0; d < DAMAGE_POP_MAX_DIGITS; d++) {
       combat.push(entity({
-        id: guid('cmb', 380 + i * 10 + d), path: `${base}/DmgPop/Digit${d + 1}`, modelId: 'uisprite', entryId: 'UISprite',
+        id: guid('cmb', 380 + i * 10 + d), path: `${dmgPopBase}/Digit${d + 1}`, modelId: 'uisprite', entryId: 'UISprite',
         componentNames: 'MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent',
-        displayOrder: 12,
+        displayOrder: 90 + i,
         components: [
           transform({ parentW: 192, parentH: 56, anchor: { x: 0.5, y: 0.5 }, pivot: { x: 0.5, y: 0.5 }, size: { x: DAMAGE_POP_DIGIT_W, y: DAMAGE_POP_DIGIT_H }, pos: { x: 0, y: 0 } }),
           sprite({ dataId: DAMAGE_DIGIT_RUIDS[0], color: { r: 1, g: 1, b: 1, a: 1 }, type: 0 }),
@@ -2878,6 +2879,7 @@ function writeCodeblocks() {
     prop('number', 'Turn', '0'),
     prop('number', 'TweenEventId', '0'),
     prop('number', 'CardHoverTweenId', '0'),
+    prop('number', 'DmgPopSeq', '0'),
     prop('any', 'EndTurnHandler'),
     prop('any', 'NewGameHandler'),
     prop('any', 'WarriorSelectHandler'),
@@ -3449,6 +3451,7 @@ self.PlayerWeak = 0
 self.PlayerVuln = 0
 self.PlayerPowers = {}
 self.FightAttackCount = 0
+self.DmgPopSeq = 0
 self.FirstHpLossDone = false
 self.ClayBlockNext = 0
 self.DiscardSelectRemaining = 0
@@ -4601,6 +4604,7 @@ if c.kind == "Attack" then
 	if best > 0 then
 		self.TargetIndex = best
 		self:PlayCard(slot)
+		self:RenderTargetFrames()
 	else
 		self:RenderTargetFrames()
 	end
@@ -5095,10 +5099,15 @@ if self.PlayerPowers ~= nil and #self.PlayerPowers > 0 then
 end
 self:SetText("/ui/DefaultGroup/CombatHud/PlayerPanel/Buffs", pb)
 self:RenderRun()`),
-    method('ShowDmgPop', `local base = "/ui/DefaultGroup/CombatHud/MonsterSlot" .. tostring(slot) .. "/DmgPop"
+    method('ShowDmgPop', `local slotKey = string.format("%d", math.floor(slot or 0))
+local base = "/ui/DefaultGroup/CombatHud/DmgPop" .. slotKey
 local pop = _EntityService:GetEntityByPath(base)
+if pop == nil then
+	return
+end
+self.DmgPopSeq = (self.DmgPopSeq or 0) + 1
+local popSeq = self.DmgPopSeq
 self:SetText(base, "")
-self:SetEntityEnabled(base, true)
 local damageDigitRuids = { ${DAMAGE_DIGIT_RUIDS.map(luaStr).join(', ')} }
 local shown = tostring(math.max(0, math.floor(amount)))
 if string.len(shown) > ${DAMAGE_POP_MAX_DIGITS} then
@@ -5110,6 +5119,9 @@ for i = 1, string.len(shown) do
 end
 local totalW = #digits * ${DAMAGE_POP_DIGIT_W} + math.max(0, #digits - 1) * ${DAMAGE_POP_DIGIT_SPACING}
 local startX = -totalW / 2 + ${DAMAGE_POP_DIGIT_W} / 2
+for i = 1, ${DAMAGE_POP_MAX_DIGITS} do
+  self:SetEntityEnabled(base .. "/Digit" .. tostring(i), false)
+end
 for i = 1, ${DAMAGE_POP_MAX_DIGITS} do
   local digitPath = base .. "/Digit" .. tostring(i)
   local digitEntity = _EntityService:GetEntityByPath(digitPath)
@@ -5126,19 +5138,43 @@ for i = 1, ${DAMAGE_POP_MAX_DIGITS} do
     end
   end
 end
-if pop ~= nil and pop.UITransformComponent ~= nil then
-  pop.UITransformComponent.anchoredPosition = Vector2(0, 76)
+local popPos = nil
+local m = self.Monsters[slot]
+if m ~= nil and m.entity ~= nil and isvalid(m.entity) and m.entity.TransformComponent ~= nil then
+  local wp = m.entity.TransformComponent.WorldPosition
+  local screen = _UILogic:WorldToScreenPosition(Vector2(wp.x, wp.y + ${HEAD_OFFSET_Y + 0.45}))
+  popPos = _UILogic:ScreenToUIPosition(screen)
+else
+  local slotEntity = _EntityService:GetEntityByPath("/ui/DefaultGroup/CombatHud/MonsterSlot" .. slotKey)
+  if slotEntity ~= nil and slotEntity.UITransformComponent ~= nil then
+    local sp = slotEntity.UITransformComponent.anchoredPosition
+    popPos = Vector2(sp.x, sp.y + 76)
+  end
 end
-local startY = 76
+if pop ~= nil and pop.UITransformComponent ~= nil then
+  if popPos ~= nil then
+    pop.UITransformComponent.anchoredPosition = popPos
+  else
+    pop.UITransformComponent.anchoredPosition = Vector2(0, 120)
+  end
+end
+self:SetEntityEnabled(base, true)
 for i = 1, 6 do
   _TimerService:SetTimerOnce(function()
+    if self.DmgPopSeq ~= popSeq then
+      return
+    end
     local p = _EntityService:GetEntityByPath(base)
     if p ~= nil and p.UITransformComponent ~= nil then
-      p.UITransformComponent.anchoredPosition = Vector2(0, startY + i * 7)
+      local cur = p.UITransformComponent.anchoredPosition
+      p.UITransformComponent.anchoredPosition = Vector2(cur.x, cur.y + 7)
     end
   end, 0.045 * i)
 end
 _TimerService:SetTimerOnce(function()
+  if self.DmgPopSeq ~= popSeq then
+    return
+  end
   self:SetEntityEnabled(base, false)
 end, 0.48)`, [
       { Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' },
@@ -5153,7 +5189,10 @@ end
 self:SetEntityEnabled(base, true)
 _TimerService:SetTimerOnce(function() self:SetEntityEnabled(base, false) end, 0.6)`, [{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'amount' }]),
     method('PlayerAttackMotion', `local lp = _UserService.LocalPlayer
-if lp == nil or lp.StateComponent == nil then
+if lp == nil then
+	return
+end
+if lp.StateComponent == nil then
 	return
 end
 pcall(function() lp.StateComponent:ChangeState("ATTACK") end)

ui/DefaultGroup.ui

@@ -14032,17 +14032,17 @@
       },
       {
         "id": "0cb000fb-0000-4000-8000-00000cb000fb",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop1",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
-          "name": "DmgPop",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop",
+          "name": "DmgPop1",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop1",
           "nameEditable": true,
           "enable": false,
           "visible": true,
           "localize": true,
-          "displayOrder": 11,
-          "pathConstraints": "/////",
+          "displayOrder": 81,
+          "pathConstraints": "////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -14068,11 +14068,11 @@
               "MobileOnly": false,
               "OffsetMax": {
                 "x": 96,
-                "y": 104
+                "y": 28
               },
               "OffsetMin": {
                 "x": -96,
-                "y": 48
+                "y": -28
               },
               "Pivot": {
                 "x": 0.5,
@@ -14091,11 +14091,11 @@
               "UIVersion": 2,
               "anchoredPosition": {
                 "x": 0,
-                "y": 76
+                "y": 0
               },
               "Position": {
                 "x": 0,
-                "y": 76,
+                "y": 0,
                 "z": 0
               },
               "QuaternionRotation": {
@@ -14131,10 +14131,10 @@
               "PreserveSprite": 0,
               "StartFrameIndex": 0,
               "Color": {
-                "r": 0.12,
-                "g": 0.02,
-                "b": 0.02,
-                "a": 0.72
+                "r": 0,
+                "g": 0,
+                "b": 0,
+                "a": 0
               },
               "DropShadow": false,
               "DropShadowAngle": 30,
@@ -14173,17 +14173,17 @@
       },
       {
         "id": "0cb00186-0000-4000-8000-00000cb00186",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit1",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit1",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit1",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit1",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit1",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 91,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -14314,17 +14314,17 @@
       },
       {
         "id": "0cb00187-0000-4000-8000-00000cb00187",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit2",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit2",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit2",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit2",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit2",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 91,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -14455,17 +14455,17 @@
       },
       {
         "id": "0cb00188-0000-4000-8000-00000cb00188",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit3",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit3",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit3",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit3",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit3",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 91,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -14596,17 +14596,17 @@
       },
       {
         "id": "0cb00189-0000-4000-8000-00000cb00189",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit4",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit4",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit4",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit4",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit4",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 91,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -14737,17 +14737,17 @@
       },
       {
         "id": "0cb0018a-0000-4000-8000-00000cb0018a",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit5",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit5",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit5",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot1/DmgPop/Digit5",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop1/Digit5",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 91,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -17087,17 +17087,17 @@
       },
       {
         "id": "0cb000fc-0000-4000-8000-00000cb000fc",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop2",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
-          "name": "DmgPop",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop",
+          "name": "DmgPop2",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop2",
           "nameEditable": true,
           "enable": false,
           "visible": true,
           "localize": true,
-          "displayOrder": 11,
-          "pathConstraints": "/////",
+          "displayOrder": 82,
+          "pathConstraints": "////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -17123,11 +17123,11 @@
               "MobileOnly": false,
               "OffsetMax": {
                 "x": 96,
-                "y": 104
+                "y": 28
               },
               "OffsetMin": {
                 "x": -96,
-                "y": 48
+                "y": -28
               },
               "Pivot": {
                 "x": 0.5,
@@ -17146,11 +17146,11 @@
               "UIVersion": 2,
               "anchoredPosition": {
                 "x": 0,
-                "y": 76
+                "y": 0
               },
               "Position": {
                 "x": 0,
-                "y": 76,
+                "y": 0,
                 "z": 0
               },
               "QuaternionRotation": {
@@ -17186,10 +17186,10 @@
               "PreserveSprite": 0,
               "StartFrameIndex": 0,
               "Color": {
-                "r": 0.12,
-                "g": 0.02,
-                "b": 0.02,
-                "a": 0.72
+                "r": 0,
+                "g": 0,
+                "b": 0,
+                "a": 0
               },
               "DropShadow": false,
               "DropShadowAngle": 30,
@@ -17228,17 +17228,17 @@
       },
       {
         "id": "0cb00190-0000-4000-8000-00000cb00190",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit1",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit1",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit1",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit1",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit1",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 92,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -17369,17 +17369,17 @@
       },
       {
         "id": "0cb00191-0000-4000-8000-00000cb00191",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit2",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit2",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit2",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit2",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit2",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 92,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -17510,17 +17510,17 @@
       },
       {
         "id": "0cb00192-0000-4000-8000-00000cb00192",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit3",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit3",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit3",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit3",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit3",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 92,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -17651,17 +17651,17 @@
       },
       {
         "id": "0cb00193-0000-4000-8000-00000cb00193",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit4",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit4",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit4",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit4",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit4",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 92,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -17792,17 +17792,17 @@
       },
       {
         "id": "0cb00194-0000-4000-8000-00000cb00194",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit5",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit5",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit5",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot2/DmgPop/Digit5",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop2/Digit5",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 92,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -20142,17 +20142,17 @@
       },
       {
         "id": "0cb000fd-0000-4000-8000-00000cb000fd",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop3",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
-          "name": "DmgPop",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop",
+          "name": "DmgPop3",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop3",
           "nameEditable": true,
           "enable": false,
           "visible": true,
           "localize": true,
-          "displayOrder": 11,
-          "pathConstraints": "/////",
+          "displayOrder": 83,
+          "pathConstraints": "////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -20178,11 +20178,11 @@
               "MobileOnly": false,
               "OffsetMax": {
                 "x": 96,
-                "y": 104
+                "y": 28
               },
               "OffsetMin": {
                 "x": -96,
-                "y": 48
+                "y": -28
               },
               "Pivot": {
                 "x": 0.5,
@@ -20201,11 +20201,11 @@
               "UIVersion": 2,
               "anchoredPosition": {
                 "x": 0,
-                "y": 76
+                "y": 0
               },
               "Position": {
                 "x": 0,
-                "y": 76,
+                "y": 0,
                 "z": 0
               },
               "QuaternionRotation": {
@@ -20241,10 +20241,10 @@
               "PreserveSprite": 0,
               "StartFrameIndex": 0,
               "Color": {
-                "r": 0.12,
-                "g": 0.02,
-                "b": 0.02,
-                "a": 0.72
+                "r": 0,
+                "g": 0,
+                "b": 0,
+                "a": 0
               },
               "DropShadow": false,
               "DropShadowAngle": 30,
@@ -20283,17 +20283,17 @@
       },
       {
         "id": "0cb0019a-0000-4000-8000-00000cb0019a",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit1",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit1",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit1",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit1",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit1",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 93,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -20424,17 +20424,17 @@
       },
       {
         "id": "0cb0019b-0000-4000-8000-00000cb0019b",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit2",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit2",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit2",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit2",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit2",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 93,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -20565,17 +20565,17 @@
       },
       {
         "id": "0cb0019c-0000-4000-8000-00000cb0019c",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit3",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit3",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit3",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit3",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit3",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 93,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -20706,17 +20706,17 @@
       },
       {
         "id": "0cb0019d-0000-4000-8000-00000cb0019d",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit4",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit4",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit4",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit4",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit4",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 93,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -20847,17 +20847,17 @@
       },
       {
         "id": "0cb0019e-0000-4000-8000-00000cb0019e",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit5",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit5",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit5",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot3/DmgPop/Digit5",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop3/Digit5",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 93,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -23197,17 +23197,17 @@
       },
       {
         "id": "0cb000fe-0000-4000-8000-00000cb000fe",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop4",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
-          "name": "DmgPop",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop",
+          "name": "DmgPop4",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop4",
           "nameEditable": true,
           "enable": false,
           "visible": true,
           "localize": true,
-          "displayOrder": 11,
-          "pathConstraints": "/////",
+          "displayOrder": 84,
+          "pathConstraints": "////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -23233,11 +23233,11 @@
               "MobileOnly": false,
               "OffsetMax": {
                 "x": 96,
-                "y": 104
+                "y": 28
               },
               "OffsetMin": {
                 "x": -96,
-                "y": 48
+                "y": -28
               },
               "Pivot": {
                 "x": 0.5,
@@ -23256,11 +23256,11 @@
               "UIVersion": 2,
               "anchoredPosition": {
                 "x": 0,
-                "y": 76
+                "y": 0
               },
               "Position": {
                 "x": 0,
-                "y": 76,
+                "y": 0,
                 "z": 0
               },
               "QuaternionRotation": {
@@ -23296,10 +23296,10 @@
               "PreserveSprite": 0,
               "StartFrameIndex": 0,
               "Color": {
-                "r": 0.12,
-                "g": 0.02,
-                "b": 0.02,
-                "a": 0.72
+                "r": 0,
+                "g": 0,
+                "b": 0,
+                "a": 0
               },
               "DropShadow": false,
               "DropShadowAngle": 30,
@@ -23338,17 +23338,17 @@
       },
       {
         "id": "0cb001a4-0000-4000-8000-00000cb001a4",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit1",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit1",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit1",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit1",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit1",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 94,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -23479,17 +23479,17 @@
       },
       {
         "id": "0cb001a5-0000-4000-8000-00000cb001a5",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit2",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit2",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit2",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit2",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit2",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 94,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -23620,17 +23620,17 @@
       },
       {
         "id": "0cb001a6-0000-4000-8000-00000cb001a6",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit3",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit3",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit3",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit3",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit3",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 94,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -23761,17 +23761,17 @@
       },
       {
         "id": "0cb001a7-0000-4000-8000-00000cb001a7",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit4",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit4",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit4",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit4",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit4",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 94,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",
@@ -23902,17 +23902,17 @@
       },
       {
         "id": "0cb001a8-0000-4000-8000-00000cb001a8",
-        "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit5",
+        "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit5",
         "componentNames": "MOD.Core.UITransformComponent,MOD.Core.SpriteGUIRendererComponent",
         "jsonString": {
           "name": "Digit5",
-          "path": "/ui/DefaultGroup/CombatHud/MonsterSlot4/DmgPop/Digit5",
+          "path": "/ui/DefaultGroup/CombatHud/DmgPop4/Digit5",
           "nameEditable": true,
           "enable": true,
           "visible": true,
           "localize": true,
-          "displayOrder": 12,
-          "pathConstraints": "//////",
+          "displayOrder": 94,
+          "pathConstraints": "/////",
           "revision": 1,
           "origin": {
             "type": "Model",