Fix up replay viewer & hopefully fix shield attacking bug. Also fix l…

…egacy oracle
serprex · Jul 5, 2023 · c0a2aee · c0a2aee
1 parent 5ba4360
commit c0a2aee
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 55 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/rs/src/game.rs b/src/rs/src/game.rs
@@ -1542,7 +1542,7 @@ impl Game {
 				self.proc_data(Event::Attack, id, &mut data);
 				let stasis = data.stasis;
 				let freedom = data.freedom;
-				if !stasis && self.get(id, Stat::delayed) == 0 {
+				if kind != Kind::Shield && !stasis && self.get(id, Stat::delayed) == 0 {
 					let mut trueatk = self.trueatk(id);
 					if trueatk != 0 {
 						let psionic = self.get(id, Flag::psionic);

diff --git a/src/vanilla/views/MainMenu.jsx b/src/vanilla/views/MainMenu.jsx
@@ -72,7 +72,7 @@ export default function OriginalMainMenu() {
 				nymph === etg.NymphList.includes(card.code + 4000),
 		);
 		const update = {
-			pool: etgutil.addcard(rx.orig.pool, ocard.code),
+			pool: ocard.code,
 			oracle: rx.user.oracle,
 			fg,
 		};

diff --git a/src/views/Match.jsx b/src/views/Match.jsx
@@ -770,7 +770,6 @@ function Things(props) {
 					{...props}
 					unregister={unregister}
 					id={id}
-					obj={props.game.byId(id)}
 					pos0={birth(id)}
 					pos={
 						getDeath().get(id) ?? {
@@ -913,8 +912,8 @@ export default function Match(props) {
 
 	const [p1id, setPlayer1] = createSignal(
 			props.replay
-				? pgame().turn
-				: pgame().byUser(rx.user ? rx.user.name : '').id,
+				? game().turn
+				: game().byUser(rx.user ? rx.user.name : '').id,
 		),
 		player1 = () => game().byId(p1id());
 	const [p2id, setPlayer2] = createSignal(player1().foeId),
@@ -1184,25 +1183,24 @@ export default function Match(props) {
 			}
 		});
 
-	const setReplayIndex = idx => {
-		let history = replayhistory();
-		idx = Math.min(idx, props.replay.moves.length);
-		if (idx >= history.length) {
-			history = history.slice();
-			while (idx >= history.length) {
-				const gclone = history[history.length - 1].clone();
-				gclone.next(props.replay.moves[history.length - 1], false);
-				history.push(gclone);
-			}
-			setReplayHistory(history);
-		}
-		const game = history[idx];
+	const setReplayIndex = idx =>
 		batch(() => {
+			let history = replayhistory();
+			idx = Math.min(idx, props.replay.moves.length);
+			if (idx >= history.length) {
+				history = history.slice();
+				while (idx >= history.length) {
+					const gclone = history[history.length - 1].clone();
+					gclone.next(props.replay.moves[history.length - 1], false);
+					history.push(gclone);
+				}
+				setReplayHistory(history);
+			}
+			const game = history[idx];
 			setreplayindex(idx);
 			setPlayer1(game.turn);
 			setPlayer2(game.get_foe(game.turn));
 		});
-	};
 
 	const gotoResult = () => {
 		const { game } = props;