diff options
Diffstat (limited to 'webAO/viewport')
| -rw-r--r-- | webAO/viewport/utils/handleICSpeaking.ts | 6 | ||||
| -rw-r--r-- | webAO/viewport/utils/preloadMessageAssets.ts | 8 | ||||
| -rw-r--r-- | webAO/viewport/utils/setSide.ts | 2 | ||||
| -rw-r--r-- | webAO/viewport/viewport.ts | 18 |
4 files changed, 17 insertions, 17 deletions
diff --git a/webAO/viewport/utils/handleICSpeaking.ts b/webAO/viewport/utils/handleICSpeaking.ts index a612e77..b48a445 100644 --- a/webAO/viewport/utils/handleICSpeaking.ts +++ b/webAO/viewport/utils/handleICSpeaking.ts @@ -148,7 +148,7 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { chatContainerBox.style.opacity = "0"; if (client.viewport.getChatmsg().objection === 4) { shoutSprite.src = `${AO_HOST}characters/${encodeURI( - client.viewport.getChatmsg().name!.toLowerCase(), + client.viewport.getChatmsg().name!, )}/custom.gif`; } else { shoutSprite.src = client.resources[shout].src; @@ -272,7 +272,7 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { client.viewport.blipChannels.forEach( (channel: HTMLAudioElement) => (channel.src = `${AO_HOST}sounds/blips/${encodeURI( - client.viewport.getChatmsg().blips.toLowerCase(), + client.viewport.getChatmsg().blips, )}.opus`), ); @@ -288,7 +288,7 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { // apply effects fg.style.animation = ""; - const effectName = client.viewport.getChatmsg().effects[0].toLowerCase(); + const effectName = client.viewport.getChatmsg().effects[0]; const badEffects = ["", "-", "none"]; if (effectName.startsWith("rain")) { (<HTMLLinkElement>document.getElementById("effect_css")).href = diff --git a/webAO/viewport/utils/preloadMessageAssets.ts b/webAO/viewport/utils/preloadMessageAssets.ts index 0a24e84..f3924cd 100644 --- a/webAO/viewport/utils/preloadMessageAssets.ts +++ b/webAO/viewport/utils/preloadMessageAssets.ts @@ -61,8 +61,8 @@ export default async function preloadMessageAssets( AO_HOST: string, emoteExtensions: string[], ): Promise<PreloadedAssets> { - const charName = chatmsg.name!.toLowerCase(); - const charEmote = chatmsg.sprite!.toLowerCase(); + const charName = chatmsg.name!; + const charEmote = chatmsg.sprite!; const doPreload = async (): Promise<PreloadedAssets> => { // Build candidate URL lists for each emote @@ -76,12 +76,12 @@ export default async function preloadMessageAssets( chatmsg.preanim !== ""; const preanimUrls = hasPreanim - ? buildEmoteUrls(AO_HOST, emoteExtensions, charName, chatmsg.preanim!.toLowerCase(), "") + ? buildEmoteUrls(AO_HOST, emoteExtensions, charName, chatmsg.preanim!, "") : null; const hasPair = !!chatmsg.other_name; const pairIdleUrls = hasPair - ? buildEmoteUrls(AO_HOST, emoteExtensions, chatmsg.other_name!.toLowerCase(), chatmsg.other_emote!.toLowerCase(), "(a)") + ? buildEmoteUrls(AO_HOST, emoteExtensions, chatmsg.other_name!, chatmsg.other_emote!, "(a)") : null; // Shout SFX per-character path diff --git a/webAO/viewport/utils/setSide.ts b/webAO/viewport/utils/setSide.ts index 564d477..c34d162 100644 --- a/webAO/viewport/utils/setSide.ts +++ b/webAO/viewport/utils/setSide.ts @@ -10,7 +10,7 @@ export async function setBackgroundImage(elementid: string, bgname: string, bgpa let url; let success = false; for (const extension of client.background_extensions) { - url = `${AO_HOST}background/${encodeURI(bgname.toLowerCase())}/${bgpart}${extension}`; + url = `${AO_HOST}background/${encodeURI(bgname)}/${bgpart}${extension}`; const exists = await fileExists(url); if (exists) { diff --git a/webAO/viewport/viewport.ts b/webAO/viewport/viewport.ts index 45cfc96..70ec5c5 100644 --- a/webAO/viewport/viewport.ts +++ b/webAO/viewport/viewport.ts @@ -52,7 +52,7 @@ const viewport = (): Viewport => { backgroundName = value; }; const getBackgroundFolder = () => - `${AO_HOST}background/${encodeURI(backgroundName.toLowerCase())}/`; + `${AO_HOST}background/${encodeURI(backgroundName)}/`; const getTextNow = () => { return textnow; }; @@ -147,8 +147,8 @@ const viewport = (): Viewport => { const chatBox = document.getElementById("client_chat"); const waitingBox = document.getElementById("client_chatwaiting"); const chatBoxInner = document.getElementById("client_inner_chat"); - const charName = chatmsg.name.toLowerCase(); - const charEmote = chatmsg.sprite.toLowerCase(); + const charName = chatmsg.name; + const charEmote = chatmsg.sprite; if (chatmsg.content.charAt(textnow.length) !== " ") { blipChannels[currentBlipChannel].play().catch(() => {}); @@ -319,11 +319,11 @@ const viewport = (): Viewport => { ); } - const charName = chatmsg.name.toLowerCase(); - const charEmote = chatmsg.sprite.toLowerCase(); + const charName = chatmsg.name; + const charEmote = chatmsg.sprite; - const pairName = chatmsg.other_name.toLowerCase(); - const pairEmote = chatmsg.other_emote.toLowerCase(); + const pairName = chatmsg.other_name; + const pairEmote = chatmsg.other_emote; // TODO: preanims sometimes play when they're not supposed to const isShoutOver = tickTimer >= shoutTimer; @@ -353,7 +353,7 @@ const viewport = (): Viewport => { if (chatmsg.preloadedAssets) { setEmoteFromUrl(chatmsg.preloadedAssets.preanimUrl, false, chatmsg.side); } else { - const preanim = chatmsg.preanim.toLowerCase(); + const preanim = chatmsg.preanim; setEmote(AO_HOST, client, charName, preanim, "", false, chatmsg.side); } } @@ -489,7 +489,7 @@ const viewport = (): Viewport => { (chatmsg.type == 1 || chatmsg.type == 2 || chatmsg.type == 6) ) { const sfxUrl = chatmsg.preloadedAssets?.emoteSfxUrl - ?? `${AO_HOST}sounds/general/${encodeURI(chatmsg.sound.toLowerCase())}.opus`; + ?? `${AO_HOST}sounds/general/${encodeURI(chatmsg.sound)}.opus`; playSFX(sfxUrl, chatmsg.looping_sfx); } } |
