Fix //w in chat, fix Legacy SoSe shard filtering

serprex · Aug 10, 2023 · b53957a · b53957a
1 parent fa300f3
commit b53957a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/parseChat.js b/src/parseChat.js
@@ -113,9 +113,9 @@ export default function parseChat(e) {
 			store.chatMsg(msg.slice(1), 'System');
 		} else if (!msg.match(/^\/[^/]/) || (user && msg.match(/^\/w( |")/))) {
 			if (!msg.match(/^\s*$/)) {
-				msg = msg.replace(/^\/\//, '/');
+				escapedmsg = msg.replace(/^\/\//, '/');
 				if (user) {
-					const data = { msg };
+					const data = { msg: escapedmsg };
 					if (msg.match(/^\/w( |")/)) {
 						const match = msg.match(/^\/w"([^"]*)"/);
 						const to = (match && match[1]) || msg.slice(3, msg.indexOf(' ', 4));
@@ -128,7 +128,7 @@ export default function parseChat(e) {
 				} else {
 					sock.emit({
 						x: 'guestchat',
-						msg: msg,
+						msg: escapedmsg,
 						u: storeState.opts.username || guestname,
 					});
 				}

diff --git a/src/rs/src/skill.rs b/src/rs/src/skill.rs
@@ -4856,7 +4856,7 @@ impl Skill {
 							&& !card::IsOf(card.code as i32, card::v_Miracle)
 							&& !etg::ShardList[1..]
 								.iter()
-								.any(|&shard| card::IsOf(card.code as i32 + 2000, shard as i32))
+								.any(|&shard| card::IsOf(card.code as i32, shard as i32 - 4000))
 							&& (i > 0 || anyentro || card.element as i32 == etg::Entropy)
 					}) {
 						if card.element as i32 == etg::Entropy {