diff options
| author | stonedDiscord <stonedDiscord@users.noreply.github.com> | 2024-11-20 13:31:50 +0000 |
|---|---|---|
| committer | GitHub Action <actions@github.com> | 2024-11-20 13:31:50 +0000 |
| commit | 6684f3fce6e90fd0574d7bab63b629554ab03ef6 (patch) | |
| tree | b2a62247d17e23a77af57aea355ba621666817c2 /webAO/client/sender | |
| parent | 95a2d1361d84c61b454ebe506e6963b93f6d8dee (diff) | |
Prettified Code!
Diffstat (limited to 'webAO/client/sender')
| -rw-r--r-- | webAO/client/sender/index.ts | 136 | ||||
| -rw-r--r-- | webAO/client/sender/sendCharacter.ts | 8 | ||||
| -rw-r--r-- | webAO/client/sender/sendCheck.ts | 4 | ||||
| -rw-r--r-- | webAO/client/sender/sendDE.ts | 4 | ||||
| -rw-r--r-- | webAO/client/sender/sendEE.ts | 9 | ||||
| -rw-r--r-- | webAO/client/sender/sendHP.ts | 4 | ||||
| -rw-r--r-- | webAO/client/sender/sendIC.ts | 148 | ||||
| -rw-r--r-- | webAO/client/sender/sendMA.ts | 4 | ||||
| -rw-r--r-- | webAO/client/sender/sendMusicChange.ts | 5 | ||||
| -rw-r--r-- | webAO/client/sender/sendOOC.ts | 50 | ||||
| -rw-r--r-- | webAO/client/sender/sendPE.ts | 8 | ||||
| -rw-r--r-- | webAO/client/sender/sendRT.ts | 4 | ||||
| -rw-r--r-- | webAO/client/sender/sendSelf.ts | 10 | ||||
| -rw-r--r-- | webAO/client/sender/sendServer.ts | 10 | ||||
| -rw-r--r-- | webAO/client/sender/sendZZ.ts | 12 |
15 files changed, 208 insertions, 208 deletions
diff --git a/webAO/client/sender/index.ts b/webAO/client/sender/index.ts index 4781ec1..a50fce3 100644 --- a/webAO/client/sender/index.ts +++ b/webAO/client/sender/index.ts @@ -1,71 +1,73 @@ import { sendIC } from "./sendIC"; -import { sendSelf } from './sendSelf' -import { sendServer } from './sendServer' -import { sendCheck } from './sendCheck' -import {sendHP} from './sendHP' -import {sendOOC} from './sendOOC' -import {sendCharacter} from './sendCharacter' -import {sendRT} from './sendRT' -import {sendMusicChange} from './sendMusicChange' -import {sendZZ} from './sendZZ' -import {sendEE} from './sendEE' -import {sendDE} from './sendDE' -import {sendPE} from './sendPE' -import {sendMA} from './sendMA' +import { sendSelf } from "./sendSelf"; +import { sendServer } from "./sendServer"; +import { sendCheck } from "./sendCheck"; +import { sendHP } from "./sendHP"; +import { sendOOC } from "./sendOOC"; +import { sendCharacter } from "./sendCharacter"; +import { sendRT } from "./sendRT"; +import { sendMusicChange } from "./sendMusicChange"; +import { sendZZ } from "./sendZZ"; +import { sendEE } from "./sendEE"; +import { sendDE } from "./sendDE"; +import { sendPE } from "./sendPE"; +import { sendMA } from "./sendMA"; export interface ISender { - sendIC: (deskmod: number, - preanim: string, - name: string, - emote: string, - message: string, - side: string, - sfx_name: string, - emote_modifier: number, - sfx_delay: number, - objection_modifier: number, - evidence: number, - flip: boolean, - realization: boolean, - text_color: number, - showname: string, - other_charid: string, - self_hoffset: number, - self_yoffset: number, - noninterrupting_preanim: boolean, - looping_sfx: boolean, - screenshake: boolean, - frame_screenshake: string, - frame_realization: string, - frame_sfx: string, - additive: boolean, - effect: string) => void - sendSelf: (message: string) => void - sendServer: (message: string) => void - sendCheck: () => void - sendHP: (side: number, hp: number) => void - sendOOC: (message: string) => void - sendCharacter: (character: number) => void - sendRT: (testimony: string) => void - sendMusicChange: (track: string) => void - sendZZ: (msg: string) => void - sendEE: (id: number, name: string, desc: string, img: string) => void - sendDE: (id: number) => void - sendPE: (name: string, desc: string, img: string) => void - sendMA: (id: number, length: number, reason: string) => void + sendIC: ( + deskmod: number, + preanim: string, + name: string, + emote: string, + message: string, + side: string, + sfx_name: string, + emote_modifier: number, + sfx_delay: number, + objection_modifier: number, + evidence: number, + flip: boolean, + realization: boolean, + text_color: number, + showname: string, + other_charid: string, + self_hoffset: number, + self_yoffset: number, + noninterrupting_preanim: boolean, + looping_sfx: boolean, + screenshake: boolean, + frame_screenshake: string, + frame_realization: string, + frame_sfx: string, + additive: boolean, + effect: string, + ) => void; + sendSelf: (message: string) => void; + sendServer: (message: string) => void; + sendCheck: () => void; + sendHP: (side: number, hp: number) => void; + sendOOC: (message: string) => void; + sendCharacter: (character: number) => void; + sendRT: (testimony: string) => void; + sendMusicChange: (track: string) => void; + sendZZ: (msg: string) => void; + sendEE: (id: number, name: string, desc: string, img: string) => void; + sendDE: (id: number) => void; + sendPE: (name: string, desc: string, img: string) => void; + sendMA: (id: number, length: number, reason: string) => void; } export const sender = { - sendIC, - sendSelf, - sendServer, - sendCheck, - sendHP, - sendOOC, - sendCharacter, - sendRT, - sendMusicChange, - sendZZ, - sendEE, - sendDE, - sendPE, - sendMA -}
\ No newline at end of file + sendIC, + sendSelf, + sendServer, + sendCheck, + sendHP, + sendOOC, + sendCharacter, + sendRT, + sendMusicChange, + sendZZ, + sendEE, + sendDE, + sendPE, + sendMA, +}; diff --git a/webAO/client/sender/sendCharacter.ts b/webAO/client/sender/sendCharacter.ts index 5e81727..2db4dcd 100644 --- a/webAO/client/sender/sendCharacter.ts +++ b/webAO/client/sender/sendCharacter.ts @@ -5,7 +5,7 @@ import { client } from "../../client"; * @param {number} character the character ID */ export const sendCharacter = (character: number) => { - if (character === -1 || client.chars[character].name) { - client.sender.sendServer(`CC#${client.playerID}#${character}#web#%`); - } -}
\ No newline at end of file + if (character === -1 || client.chars[character].name) { + client.sender.sendServer(`CC#${client.playerID}#${character}#web#%`); + } +}; diff --git a/webAO/client/sender/sendCheck.ts b/webAO/client/sender/sendCheck.ts index 91b3a02..7eb4751 100644 --- a/webAO/client/sender/sendCheck.ts +++ b/webAO/client/sender/sendCheck.ts @@ -4,5 +4,5 @@ import { client } from "../../client"; * Sends a keepalive packet. */ export const sendCheck = () => { - client.sender.sendServer(`CH#${client.charID}#%`); -} + client.sender.sendServer(`CH#${client.charID}#%`); +}; diff --git a/webAO/client/sender/sendDE.ts b/webAO/client/sender/sendDE.ts index 4d94d65..cf8fa5a 100644 --- a/webAO/client/sender/sendDE.ts +++ b/webAO/client/sender/sendDE.ts @@ -5,5 +5,5 @@ import { client } from "../../client"; * @param {number} evidence id */ export const sendDE = (id: number) => { - client.sender.sendServer(`DE#${id}#%`); -}
\ No newline at end of file + client.sender.sendServer(`DE#${id}#%`); +}; diff --git a/webAO/client/sender/sendEE.ts b/webAO/client/sender/sendEE.ts index 7c5bfe3..2aac2a6 100644 --- a/webAO/client/sender/sendEE.ts +++ b/webAO/client/sender/sendEE.ts @@ -1,7 +1,6 @@ import { client } from "../../client"; import { escapeChat } from "../../encoding"; - /** * Sends edit evidence command. * @param {number} evidence id @@ -10,7 +9,7 @@ import { escapeChat } from "../../encoding"; * @param {string} evidence image filename */ export const sendEE = (id: number, name: string, desc: string, img: string) => { - client.sender.sendServer( - `EE#${id}#${escapeChat(name)}#${escapeChat(desc)}#${escapeChat(img)}#%` - ); -}
\ No newline at end of file + client.sender.sendServer( + `EE#${id}#${escapeChat(name)}#${escapeChat(desc)}#${escapeChat(img)}#%`, + ); +}; diff --git a/webAO/client/sender/sendHP.ts b/webAO/client/sender/sendHP.ts index d007094..bd44163 100644 --- a/webAO/client/sender/sendHP.ts +++ b/webAO/client/sender/sendHP.ts @@ -6,5 +6,5 @@ import { client } from "../../client"; * @param {number} hp the health point */ export const sendHP = (side: number, hp: number) => { - client.sender.sendServer(`HP#${side}#${hp}#%`); -}
\ No newline at end of file + client.sender.sendServer(`HP#${side}#${hp}#%`); +}; diff --git a/webAO/client/sender/sendIC.ts b/webAO/client/sender/sendIC.ts index ca8984f..d23a113 100644 --- a/webAO/client/sender/sendIC.ts +++ b/webAO/client/sender/sendIC.ts @@ -1,8 +1,8 @@ import { extrafeatures } from "../../client"; import { escapeChat } from "../../encoding"; -import {client} from '../../client' +import { client } from "../../client"; import queryParser from "../../utils/queryParser"; -const {mode} = queryParser() +const { mode } = queryParser(); /** * Sends an in-character chat message. @@ -26,81 +26,81 @@ const {mode} = queryParser() * @param {number} noninterrupting_preanim play the full preanim (optional) */ export const sendIC = ( - deskmod: number, - preanim: string, - name: string, - emote: string, - message: string, - side: string, - sfx_name: string, - emote_modifier: number, - sfx_delay: number, - objection_modifier: number, - evidence: number, - flip: boolean, - realization: boolean, - text_color: number, - showname: string, - other_charid: string, - self_hoffset: number, - self_yoffset: number, - noninterrupting_preanim: boolean, - looping_sfx: boolean, - screenshake: boolean, - frame_screenshake: string, - frame_realization: string, - frame_sfx: string, - additive: boolean, - effect: string + deskmod: number, + preanim: string, + name: string, + emote: string, + message: string, + side: string, + sfx_name: string, + emote_modifier: number, + sfx_delay: number, + objection_modifier: number, + evidence: number, + flip: boolean, + realization: boolean, + text_color: number, + showname: string, + other_charid: string, + self_hoffset: number, + self_yoffset: number, + noninterrupting_preanim: boolean, + looping_sfx: boolean, + screenshake: boolean, + frame_screenshake: string, + frame_realization: string, + frame_sfx: string, + additive: boolean, + effect: string, ) => { - let extra_cccc = ""; - let other_emote = ""; - let other_offset = ""; - let extra_27 = ""; - let extra_28 = ""; + let extra_cccc = ""; + let other_emote = ""; + let other_offset = ""; + let extra_27 = ""; + let extra_28 = ""; - if (extrafeatures.includes("cccc_ic_support")) { - const self_offset = extrafeatures.includes("y_offset") - ? `${self_hoffset}<and>${self_yoffset}` - : self_hoffset; // HACK: this should be an & but client fucked it up and all the servers adopted it - if (mode === "replay") { - other_emote = "##"; - other_offset = "#0#0"; - } - extra_cccc = `${escapeChat( - showname - )}#${other_charid}${other_emote}#${self_offset}${other_offset}#${Number( - noninterrupting_preanim - )}#`; + if (extrafeatures.includes("cccc_ic_support")) { + const self_offset = extrafeatures.includes("y_offset") + ? `${self_hoffset}<and>${self_yoffset}` + : self_hoffset; // HACK: this should be an & but client fucked it up and all the servers adopted it + if (mode === "replay") { + other_emote = "##"; + other_offset = "#0#0"; + } + extra_cccc = `${escapeChat( + showname, + )}#${other_charid}${other_emote}#${self_offset}${other_offset}#${Number( + noninterrupting_preanim, + )}#`; - if (extrafeatures.includes("looping_sfx")) { - extra_27 = `${Number(looping_sfx)}#${Number( - screenshake - )}#${frame_screenshake}#${frame_realization}#${frame_sfx}#`; - if (extrafeatures.includes("effects")) { - extra_28 = `${Number(additive)}#${escapeChat(effect)}#`; - } - } + if (extrafeatures.includes("looping_sfx")) { + extra_27 = `${Number(looping_sfx)}#${Number( + screenshake, + )}#${frame_screenshake}#${frame_realization}#${frame_sfx}#`; + if (extrafeatures.includes("effects")) { + extra_28 = `${Number(additive)}#${escapeChat(effect)}#`; + } } + } - const serverMessage = - `MS#${deskmod}#${escapeChat(preanim)}#${escapeChat(name)}#${escapeChat( - emote - )}` + - `#${escapeChat(message)}#${escapeChat(side)}#${escapeChat( - sfx_name - )}#${emote_modifier}` + - `#${client.charID}#${sfx_delay}#${Number(objection_modifier)}#${Number( - evidence - )}#${Number(flip)}#${Number( - realization - )}#${text_color}#${extra_cccc}${extra_27}${extra_28}%`; + const serverMessage = + `MS#${deskmod}#${escapeChat(preanim)}#${escapeChat(name)}#${escapeChat( + emote, + )}` + + `#${escapeChat(message)}#${escapeChat(side)}#${escapeChat( + sfx_name, + )}#${emote_modifier}` + + `#${client.charID}#${sfx_delay}#${Number(objection_modifier)}#${Number( + evidence, + )}#${Number(flip)}#${Number( + realization, + )}#${text_color}#${extra_cccc}${extra_27}${extra_28}%`; - client.sender.sendServer(serverMessage); - if (mode === "replay") { - (<HTMLInputElement>( - document.getElementById("client_ooclog") - )).value += `wait#${(<HTMLInputElement>document.getElementById("client_replaytimer")).value - }#%\r\n`; - } -}
\ No newline at end of file + client.sender.sendServer(serverMessage); + if (mode === "replay") { + (<HTMLInputElement>document.getElementById("client_ooclog")).value += + `wait#${ + (<HTMLInputElement>document.getElementById("client_replaytimer")).value + }#%\r\n`; + } +}; diff --git a/webAO/client/sender/sendMA.ts b/webAO/client/sender/sendMA.ts index 5ba4e4b..6260da1 100644 --- a/webAO/client/sender/sendMA.ts +++ b/webAO/client/sender/sendMA.ts @@ -7,5 +7,5 @@ import { client } from "../../client"; * @param {string} reason player message */ export const sendMA = (id: number, length: number, reason: string) => { - client.sender.sendServer(`MA#${id}#${length}#${reason}#%`); -}
\ No newline at end of file + client.sender.sendServer(`MA#${id}#${length}#${reason}#%`); +}; diff --git a/webAO/client/sender/sendMusicChange.ts b/webAO/client/sender/sendMusicChange.ts index 50c6306..69cba58 100644 --- a/webAO/client/sender/sendMusicChange.ts +++ b/webAO/client/sender/sendMusicChange.ts @@ -1,10 +1,9 @@ import { client } from "../../client"; - /** * Requests to change the music to the specified track. * @param {string} track the track ID */ export const sendMusicChange = (track: string) => { - client.sender.sendServer(`MC#${track}#${client.charID}#%`); -} + client.sender.sendServer(`MC#${track}#${client.charID}#%`); +}; diff --git a/webAO/client/sender/sendOOC.ts b/webAO/client/sender/sendOOC.ts index 9674ad9..43c3773 100644 --- a/webAO/client/sender/sendOOC.ts +++ b/webAO/client/sender/sendOOC.ts @@ -1,33 +1,33 @@ -import { client } from '../../client' -import { escapeChat } from '../../encoding'; -import setCookie from '../../utils/setCookie'; -import { saveChatlogHandle } from '../../client/saveChatLogHandle' +import { client } from "../../client"; +import { escapeChat } from "../../encoding"; +import setCookie from "../../utils/setCookie"; +import { saveChatlogHandle } from "../../client/saveChatLogHandle"; /** * Sends an out-of-character chat message. * @param {string} message the message to send */ export const sendOOC = (message: string) => { - setCookie( - "OOC_name", - (<HTMLInputElement>document.getElementById("OOC_name")).value - ); - const oocName = `${escapeChat( - (<HTMLInputElement>document.getElementById("OOC_name")).value - )}`; - const oocMessage = `${escapeChat(message)}`; + setCookie( + "OOC_name", + (<HTMLInputElement>document.getElementById("OOC_name")).value, + ); + const oocName = `${escapeChat( + (<HTMLInputElement>document.getElementById("OOC_name")).value, + )}`; + const oocMessage = `${escapeChat(message)}`; - const commands = { - "/save_chatlog": saveChatlogHandle, - }; - const commandsMap = new Map(Object.entries(commands)); + const commands = { + "/save_chatlog": saveChatlogHandle, + }; + const commandsMap = new Map(Object.entries(commands)); - if (oocMessage && commandsMap.has(oocMessage.toLowerCase())) { - try { - commandsMap.get(oocMessage.toLowerCase())(); - } catch (e) { - // Command Not Recognized - } - } else { - client.sender.sendServer(`CT#${oocName}#${oocMessage}#%`); + if (oocMessage && commandsMap.has(oocMessage.toLowerCase())) { + try { + commandsMap.get(oocMessage.toLowerCase())(); + } catch (e) { + // Command Not Recognized } -}
\ No newline at end of file + } else { + client.sender.sendServer(`CT#${oocName}#${oocMessage}#%`); + } +}; diff --git a/webAO/client/sender/sendPE.ts b/webAO/client/sender/sendPE.ts index 984fc4d..609a4df 100644 --- a/webAO/client/sender/sendPE.ts +++ b/webAO/client/sender/sendPE.ts @@ -8,7 +8,7 @@ import { escapeChat } from "../../encoding"; * @param {string} evidence image filename */ export const sendPE = (name: string, desc: string, img: string) => { - client.sender.sendServer( - `PE#${escapeChat(name)}#${escapeChat(desc)}#${escapeChat(img)}#%` - ); -}
\ No newline at end of file + client.sender.sendServer( + `PE#${escapeChat(name)}#${escapeChat(desc)}#${escapeChat(img)}#%`, + ); +}; diff --git a/webAO/client/sender/sendRT.ts b/webAO/client/sender/sendRT.ts index 2d6c60a..6953870 100644 --- a/webAO/client/sender/sendRT.ts +++ b/webAO/client/sender/sendRT.ts @@ -5,5 +5,5 @@ import { client } from "../../client"; * @param {string} testimony type */ export const sendRT = (testimony: string) => { - client.sender.sendServer(`RT#${testimony}#%`); -}
\ No newline at end of file + client.sender.sendServer(`RT#${testimony}#%`); +}; diff --git a/webAO/client/sender/sendSelf.ts b/webAO/client/sender/sendSelf.ts index 66c35fa..15665a7 100644 --- a/webAO/client/sender/sendSelf.ts +++ b/webAO/client/sender/sendSelf.ts @@ -1,13 +1,11 @@ import { client } from "../../client"; - /** * Hook for sending messages to the client * @param {string} message the message to send */ export const sendSelf = (message: string) => { - (<HTMLInputElement>( - document.getElementById("client_ooclog") - )).value += `${message}\r\n`; - client.handleSelf(message); -}
\ No newline at end of file + (<HTMLInputElement>document.getElementById("client_ooclog")).value += + `${message}\r\n`; + client.handleSelf(message); +}; diff --git a/webAO/client/sender/sendServer.ts b/webAO/client/sender/sendServer.ts index ae95480..d48cc85 100644 --- a/webAO/client/sender/sendServer.ts +++ b/webAO/client/sender/sendServer.ts @@ -1,11 +1,13 @@ import { client } from "../../client"; import queryParser from "../../utils/queryParser"; -const { mode } = queryParser() +const { mode } = queryParser(); /** * Hook for sending messages to the server * @param {string} message the message to send */ export const sendServer = (message: string) => { - console.debug("C: "+message) - mode === "replay" ? client.sender.sendSelf(message) : client.serv.send(message); -}
\ No newline at end of file + console.debug("C: " + message); + mode === "replay" + ? client.sender.sendSelf(message) + : client.serv.send(message); +}; diff --git a/webAO/client/sender/sendZZ.ts b/webAO/client/sender/sendZZ.ts index 237ab37..e9bd443 100644 --- a/webAO/client/sender/sendZZ.ts +++ b/webAO/client/sender/sendZZ.ts @@ -5,9 +5,9 @@ import { client, extrafeatures } from "../../client"; * @param {string} message to mod */ export const sendZZ = (msg: string) => { - if (extrafeatures.includes("modcall_reason")) { - client.sender.sendServer(`ZZ#${msg}#%`); - } else { - client.sender.sendServer("ZZ#%"); - } -}
\ No newline at end of file + if (extrafeatures.includes("modcall_reason")) { + client.sender.sendServer(`ZZ#${msg}#%`); + } else { + client.sender.sendServer("ZZ#%"); + } +}; |
