diff --git a/package-lock.json b/package-lock.json index 64359cd2..4bae92f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "html-webpack-plugin": "^5.6.0", "prettier": "^3.2.5", "solid-js": "^1.8.15", - "webpack": "^5.90.2", + "webpack": "^5.90.3", "webpack-cli": "^5.1.4" } }, @@ -548,9 +548,9 @@ } }, "node_modules/@sindresorhus/merge-streams": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.2.1.tgz", - "integrity": "sha512-255V7MMIKw6aQ43Wbqp9HZ+VHn6acddERTLiiLnlcPLU9PdTq9Aijl12oklAgUEblLWye+vHLzmqBx6f2TGcZw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", "dev": true, "engines": { "node": ">=18" @@ -1079,9 +1079,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001587", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz", - "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==", + "version": "1.0.30001588", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz", + "integrity": "sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ==", "dev": true, "funding": [ { @@ -1438,9 +1438,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.670", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.670.tgz", - "integrity": "sha512-hcijYOWjOtjKrKPtNA6tuLlA/bTLO3heFG8pQA6mLpq7dRydSWicXova5lyxDzp1iVJaYhK7J2OQlGE52KYn7A==", + "version": "1.4.677", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.677.tgz", + "integrity": "sha512-erDa3CaDzwJOpyvfKhOiJjBVNnMM0qxHq47RheVVwsSQrgBA9ZSGV9kdaOfZDPXcHzhG7lBxhj6A7KvfLJBd6Q==", "dev": true }, "node_modules/emoji-regex": { @@ -3185,9 +3185,9 @@ "dev": true }, "node_modules/terser": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz", - "integrity": "sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==", + "version": "5.27.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.2.tgz", + "integrity": "sha512-sHXmLSkImesJ4p5apTeT63DsV4Obe1s37qT8qvwHRmVxKTBH7Rv9Wr26VcAMmLbmk9UliiwK8z+657NyJHHy/w==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -3419,9 +3419,9 @@ "dev": true }, "node_modules/webpack": { - "version": "5.90.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.2.tgz", - "integrity": "sha512-ziXu8ABGr0InCMEYFnHrYweinHK2PWrMqnwdHk2oK3rRhv/1B+2FnfwYv5oD+RrknK/Pp/Hmyvu+eAsaMYhzCw==", + "version": "5.90.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz", + "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", diff --git a/package.json b/package.json index c2d7aa0f..9b0ac326 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "html-webpack-plugin": "^5.6.0", "prettier": "^3.2.5", "solid-js": "^1.8.15", - "webpack": "^5.90.2", + "webpack": "^5.90.3", "webpack-cli": "^5.1.4" }, "scripts": { diff --git a/src/rs/src/skill.rs b/src/rs/src/skill.rs index 49e716b0..b2670843 100644 --- a/src/rs/src/skill.rs +++ b/src/rs/src/skill.rs @@ -1945,7 +1945,7 @@ impl Skill { } }); ctx.spelldmg(foe, dmg); - ctx.poison(foe, ctx.get(t, Stat::poison) + ctx.get(t, Flag::poisonous) as i16); + ctx.poison(foe, poison); } Self::counter => { if ctx.get(c, Stat::frozen) == 0 diff --git a/src/views/Match.jsx b/src/views/Match.jsx index 1023fbf1..7903a46c 100644 --- a/src/views/Match.jsx +++ b/src/views/Match.jsx @@ -805,7 +805,7 @@ export default function Match(props) { hardcorebound = props.game.data.ante.bound; } const [landscape, setLandscape] = createSignal( - !screen.orientation.type.startsWith('portrait'), + !screen || !screen.orientation.type.startsWith('portrait'), ); const [pgame, setGame] = createSignal(props.game); const [tempgame, setTempgame] = createSignal(null); @@ -1336,7 +1336,7 @@ export default function Match(props) { }; const setlandscape = e => setLandscape(!e.target.type.startsWith('portrait')); onMount(() => { - screen.orientation.addEventListener('change', setlandscape); + if (screen) screen.orientation.addEventListener('change', setlandscape); if (props.replay) return; if (!props.game.data.spectate) { document.addEventListener('keydown', onkeydown); @@ -1392,7 +1392,7 @@ export default function Match(props) { onCleanup(() => { setCmds({}); - screen.orientation.removeEventListener('change', setlandscape); + if (screen) screen.orientation.removeEventListener('change', setlandscape); document.removeEventListener('keydown', onkeydown); window.removeEventListener('beforeunload', onbeforeunload); });