Fix tooltip hovering to accurately track cursor

Fix Pixie not removing gpull from tricked creature
serprex · Feb 19, 2024 · 50e1b85 · 50e1b85
1 parent d22bdd6
commit 50e1b85
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/rs/src/skill.rs b/src/rs/src/skill.rs
@@ -4520,13 +4520,15 @@ impl Skill {
 					.map(|(idx, id)| idx as i16)
 					.collect::<Vec<_>>();
 				if let Some(&pick) = ctx.choose(&candidates) {
-					let tidx = ctx.getIndex(t) as usize;
-					let pl = ctx.get_player_mut(town);
-					let pickid = pl.deck[pick as usize];
-					pl.deck_mut()[pick as usize] = t;
-					ctx.setCrea(town, tidx, pickid);
-					ctx.fx(pickid, Fx::StartPos(-town));
-					ctx.fx(t, Fx::EndPos(!town));
+					let tidx = ctx.remove(t);
+					if tidx != -1 {
+						let pl = ctx.get_player_mut(town);
+						let pickid = pl.deck[pick as usize];
+						pl.deck_mut()[pick as usize] = t;
+						ctx.setCrea(town, tidx as usize, pickid);
+						ctx.fx(pickid, Fx::StartPos(-town));
+						ctx.fx(t, Fx::EndPos(!town));
+					}
 				}
 			}
 			Self::tutordraw => {

diff --git a/src/views/ArenaTop.jsx b/src/views/ArenaTop.jsx
@@ -38,7 +38,7 @@ export default function ArenaTop({ lv }) {
 								<span
 									class="atoptext"
 									onMouseMove={e =>
-										setCard({ card, x: e.pageX + 4, y: e.pageY + 4 })
+										setCard({ card, x: e.clientX + 4, y: e.clientY + 4 })
 									}
 									onMouseLeave={[setCard, null]}>
 									{card.name}

diff --git a/src/views/Match.jsx b/src/views/Match.jsx
@@ -1410,7 +1410,7 @@ export default function Match(props) {
 			game().actinfo(targeting().src, id);
 		setTooltip({
 			text: `${game().thingText(id)}${actinfo ? '\n' + actinfo : ''}`,
-			style: `position:absolute;left:${e.pageX}px;top:${e.pageY}px;z-index:5`,
+			style: `position:fixed;left:${e.clientX}px;top:${e.clientY}px;z-index:5`,
 		});
 		if (game().get_kind(id) !== Kind.Player) setCard(e, game().getCard(id));
 	};