+ {
@@ -18,12 +22,13 @@ export default class Layout extends React.Component {
render() {
- const { game } = this.props;
+ const { game, match } = this.props;
return (
{
- render(){
- const { veto, teams, active } = this.props;
- return {
-
- render() {
- const { match, teams, isFreezetime, map } = this.props;
- if (!match || !match.vetos.length) return null;
- return (
- {
- constructor(props: IProps){
- super(props);
- this.state = {
- defusing: {
- width: 0,
- active: false,
- countdown: 10,
- side: "left",
- type: "defusing",
- player: null
- },
- planting: {
- width: 0,
- active: false,
- countdown: 10, // Fake
- side: "right",
- type: "planting",
- player: null
- },
- winState: {
- side: 'left',
- show: false
- }
- }
- }
- plantStop = () => this.setState(state => {
- state.planting.active = false;
- return state;
- });
-
- setWidth = (type: 'defusing' | 'planting', width: number) => {
- this.setState(state => {
- state[type].width = width;
- return state;
- })
- }
-
- initPlantTimer = () => {
- const bomb = new Countdown(time => {
- let width = time * 100;
- this.setWidth("planting", width/3);
- });
- GSI.on("bombPlantStart", player => {
- if(!player || !player.team) return;
- this.setState(state => {
- state.planting.active = true;
- state.planting.side = player.team.orientation;
- state.planting.player = player;
- })
- })
- GSI.on("data", data => {
- if(!data.bomb || !data.bomb.countdown || data.bomb.state !== "planting") return this.plantStop();
- this.setState(state => {
- state.planting.active = true;
- })
- return bomb.go(data.bomb.countdown);
- });
- }
-
- defuseStop = () => this.setState(state => {
- state.defusing.active = false;
- state.defusing.countdown = 10;
- return state;
- });
-
- initDefuseTimer = () => {
- const bomb = new Countdown(time => {
- let width = time > this.state.defusing.countdown ? this.state.defusing.countdown*100 : time * 100;
- this.setWidth("defusing", width/this.state.defusing.countdown);
- });
- GSI.on("defuseStart", player => {
- if(!player || !player.team) return;
- this.setState(state => {
- state.defusing.active = true;
- state.defusing.countdown = !Boolean(player.state.defusekit) ? 10 : 5;
- state.defusing.side = player.team.orientation;
- state.defusing.player = player;
- return state;
- })
- })
- GSI.on("data", data => {
- if(!data.bomb || !data.bomb.countdown || data.bomb.state !== "defusing") return this.defuseStop();
- this.setState(state => {
- state.defusing.active = true;
- return state;
- })
- return bomb.go(data.bomb.countdown);
- });
- }
-
- resetWin = () => {
- setTimeout(() => {
- this.setState(state => {
- state.winState.show = false;
- return state;
- })
- }, 6000);
- }
-
- componentDidMount(){
- this.initDefuseTimer();
- this.initPlantTimer();
- GSI.on("roundEnd", score => {
- this.setState(state => {
- state.winState.show = true;
- state.winState.side = score.winner.orientation;
- return state;
- }, this.resetWin);
- });
- }
- getRoundLabel = () => {
- const { map } = this.props;
- const round = map.round + 1;
- if (round <= 30) {
- return `Round ${round}/30`;
- }
- const additionalRounds = round - 30;
- const OT = Math.ceil(additionalRounds/6);
- return `OT ${OT} (${additionalRounds - (OT - 1)*6}/6)`;
- }
+export default class TeamBox extends React.Component {
render() {
- const { defusing, planting, winState } = this.state;
- const { bomb, match, map, phase } = this.props;
- const time = stringToClock(phase.phase_ends_in);
- const left = map.team_ct.orientation === "left" ? map.team_ct : map.team_t;
- const right = map.team_ct.orientation === "left" ? map.team_t : map.team_ct;
- const isPlanted = bomb && (bomb.state === "defusing" || bomb.state === "planted");
+ const { match, map, players, time } = this.props;
+ const left = map.radiant;
+ const right = map.dire;
const bo = (match && Number(match.matchType.substr(-1))) || 0;
- let leftTimer: Timer | null = null, rightTimer: Timer | null = null;
- if(defusing.active || planting.active){
- if(defusing.active){
- if(defusing.side === "left") leftTimer = defusing;
- else rightTimer = defusing;
- } else {
- if(planting.side === "left") leftTimer = planting;
- else rightTimer = planting;
- }
- }
+
+ const leftScore = players.filter(player => player.team_name === 'radiant').map(player => player.kills).reduce((a, b) => a + b, 0);
+ const rightScore = players.filter(player => player.team_name === 'dire').map(player => player.kills).reduce((a, b) => a + b, 0);
+
return (
<>
);
diff --git a/src/HUD/MatchBar/SeriesBox.tsx b/src/HUD/MatchBar/SeriesBox.tsx
index 47bbdbf..84c2ecf 100644
--- a/src/HUD/MatchBar/SeriesBox.tsx
+++ b/src/HUD/MatchBar/SeriesBox.tsx
@@ -1,10 +1,9 @@
import React from "react";
-import * as I from "csgogsi-socket";
+import * as I from "dotagsi";
import { Match } from "../../api/interfaces";
interface Props {
map: I.Map;
- phase: I.PhaseRaw;
match: Match | null;
}
@@ -13,15 +12,15 @@ export default class SeriesBox extends React.Component
{ cooldown ?
diff --git a/src/HUD/Layout/Layout.tsx b/src/HUD/Layout/Layout.tsx
index a8c40c8..9fe8b4c 100644
--- a/src/HUD/Layout/Layout.tsx
+++ b/src/HUD/Layout/Layout.tsx
@@ -1,5 +1,8 @@
import { Dota2 } from "dotagsi";
import React from "react";
+import { Match } from "../../api/interfaces";
+import MatchBar from "../MatchBar/MatchBar";
+import SeriesBox from "../MatchBar/SeriesBox";
import Observed from "./../Players/Observed";
@@ -7,6 +10,7 @@ import Observed from "./../Players/Observed";
interface Props {
game: Dota2,
+ match: Match | null
}
export default class Layout extends React.Component{cooldown}
: null}
{level}
-
+
diff --git a/src/HUD/MapSeries/MapSeries.tsx b/src/HUD/MapSeries/MapSeries.tsx
deleted file mode 100644
index 5b0f0ad..0000000
--- a/src/HUD/MapSeries/MapSeries.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from "react";
-import * as I from "csgogsi-socket";
-import { Match, Veto } from '../../api/interfaces';
-import TeamLogo from "../MatchBar/TeamLogo";
-import "./mapseries.scss";
-
-interface IProps {
- match: Match | null;
- teams: I.Team[];
- isFreezetime: boolean;
- map: I.Map
-}
-
-interface IVetoProps {
- veto: Veto;
- teams: I.Team[];
- active: boolean;
-}
-
-class VetoEntry extends React.Component
-
- }
-}
-
-export default class MapSeries extends React.Component
- {veto.mapName}
-
-
- team.id === veto.teamId)[0]} />
-
-
- team.id === veto.winner)[0]} />
-
-
- {Object.values((veto.score || ['-','-'])).sort().join(":")}
-
-
-
- Currently playing
-
-
- })}
-
- );
- }
-}
diff --git a/src/HUD/MapSeries/mapseries.scss b/src/HUD/MapSeries/mapseries.scss
deleted file mode 100644
index 8c8d042..0000000
--- a/src/HUD/MapSeries/mapseries.scss
+++ /dev/null
@@ -1,153 +0,0 @@
-.map_series_container {
- position: fixed;
- top: 100px;
- right: 20px;
- width: 347px;
- display: flex;
- opacity: 0;
- transition: opacity 0.5s;
- flex-direction: column;
- font-size: 13px;
- .veto_container {
- display: flex;
- background-color: rgba(0,0,0,0.8);
- color: white;
- align-items: center;
- height: 40px;
- &.active {
- .veto_winner {
- display: none;
- }
- .veto_score {
- display: none;
- }
- }
- .veto_map_name {
- width: 116px;
- text-transform: uppercase;
- background-color: rgba(255,255,255,1);
- color: black;
- height: 100%;
- display: flex;
- font-family: Montserrat;
- font-weight: 700;
- align-items: center;
- justify-content: center;
- }
- div {
- img {
- max-height: 30px;
- max-width: 30px;
- }
- }
- .veto_picker {
- width: 77px;
- text-align: center;
- }
- .veto_winner {
- width: 77px;
- text-align: center;
- }
- .active_container {
- width: 154px;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- .active {
- background: white;
- color: black;
- width: 117px;
- height: 25px;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 9px;
- font-weight: 700;
- font-family: Montserrat;
- text-transform: uppercase;
- }
- }
- &:not(.active) {
- .active_container {
- display: none;
- }
- }
- .veto_score {
- width: 77px;
- text-align: center;
- font-size: 14px;
- }
- .logo {
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- .title_bar {
- display: flex;
- background-color: rgba(0,0,0,0.64);
- height: 25px;
- color: white;
- border-radius: 6px 6px 0 0;
- font-family: Montserrat;
- font-size: 13px;
- font-weight: 600;
- margin-bottom: 2px;
- div {
- width: 77px;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- .picked {
- margin-left: auto;
- }
- }
- &.show {
- opacity: 1;
- }
-}
-
-#timeout {
- text-transform: uppercase;
- position: absolute;
- left: 50%;
- transform: translateX(-50%);
- top: 150px;
- background-color: var(--sub-panel-color);
- width: 600px;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100px;
- font-size: 35px;
- transition: opacity 1.5s;
- opacity: 0;
-}
-#pause {
- text-transform: uppercase;
- position: absolute;
- left: 50%;
- transform: translateX(-50%);
- top: 150px;
- background-color: var(--sub-panel-color);
- width: 600px;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100px;
- font-size: 35px;
- transition: opacity 1.5s;
- opacity: 0;
- color: white;
-}
-#timeout.show, #pause.show {
- opacity: 1;
-}
-#timeout.t {
- color: var(--color-new-t);
-}
-#timeout.ct {
- color: var(--color-new-ct);
-}
diff --git a/src/HUD/MatchBar/MatchBar.tsx b/src/HUD/MatchBar/MatchBar.tsx
index f39e536..75759b5 100644
--- a/src/HUD/MatchBar/MatchBar.tsx
+++ b/src/HUD/MatchBar/MatchBar.tsx
@@ -1,10 +1,7 @@
import React from "react";
-import * as I from "csgogsi-socket";
+import * as I from "dotagsi";
import "./matchbar.scss";
import TeamScore from "./TeamScore";
-import Bomb from "./../Timers/BombTimer";
-import Countdown from "./../Timers/Countdown";
-import { GSI } from "../../App";
import { Match } from "../../api/interfaces";
function stringToClock(time: string | number, pad = true) {
@@ -23,179 +20,31 @@ function stringToClock(time: string | number, pad = true) {
interface IProps {
match: Match | null;
map: I.Map;
- phase: I.PhaseRaw,
- bomb: I.Bomb | null,
+ players: I.Player[];
+ time: number;
}
-export interface Timer {
- width: number;
- active: boolean;
- countdown: number;
- side: "left"|"right";
- type: "defusing" | "planting";
- player: I.Player | null;
-}
-interface IState {
- defusing: Timer,
- planting: Timer,
- winState: {
- side: "left"|"right",
- show: boolean
- }
-}
-
-export default class TeamBox extends React.Component
-
- {match.vetos.filter(veto => veto.type !== "ban").map(veto => {
- if(!veto.mapName) return null;
- return Picked
- Winner
- Score
-
-
+ {left.score}
+ {leftScore}
-
- {time}
- {this.getRoundLabel()}
- {right.score}
- {stringToClock(time)}
+ {rightScore}
+
{new Array(amountOfMaps).fill(0).map((_, i) => (
- {
i ? "win" : ""} ${left.side}`} />
+
@@ -33,7 +32,7 @@ export default class SeriesBox extends React.Component i ? "win" : ""} radiant`} />
))}
{new Array(amountOfMaps).fill(0).map((_, i) => (
- {
render() {
- const { orientation, timer, team, showWin } = this.props;
+ const { orientation, team, type } = this.props;
return (
<>
-
i ? "win" : ""} ${right.side}`} />
+
diff --git a/src/HUD/MatchBar/TeamLogo.tsx b/src/HUD/MatchBar/TeamLogo.tsx
index 53a40e5..6834205 100644
--- a/src/HUD/MatchBar/TeamLogo.tsx
+++ b/src/HUD/MatchBar/TeamLogo.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Team } from 'csgogsi-socket';
+import { Team } from 'dotagsi';
import * as I from '../../api/interfaces';
import { apiUrl } from './../../api/api';
diff --git a/src/HUD/MatchBar/TeamScore.tsx b/src/HUD/MatchBar/TeamScore.tsx
index 4e7c718..53173ed 100644
--- a/src/HUD/MatchBar/TeamScore.tsx
+++ b/src/HUD/MatchBar/TeamScore.tsx
@@ -1,29 +1,22 @@
import React from "react";
-import * as I from "csgogsi-socket";
-import WinIndicator from "./WinIndicator";
-import { Timer } from "./MatchBar";
+import * as I from "dotagsi";
import TeamLogo from './TeamLogo';
-import PlantDefuse from "../Timers/PlantDefuse"
interface IProps {
team: I.Team;
orientation: "left" | "right";
- timer: Timer | null;
- showWin: boolean;
+ type: I.Faction
}
export default class TeamScore extends React.Component i ? "win" : ""} dire`} />
))}
+
);
}
diff --git a/src/HUD/MatchBar/WinIndicator.tsx b/src/HUD/MatchBar/WinIndicator.tsx
deleted file mode 100644
index 1fd3294..0000000
--- a/src/HUD/MatchBar/WinIndicator.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import { Team } from 'csgogsi-socket';
-
-export default class WinAnnouncement extends React.Component<{ team: Team | null, show: boolean }> {
- render() {
- const { team, show } = this.props;
- if(!team) return null;
- return {
- state = {
- enableCams: !!this.props.showCam
- }
- componentDidMount(){
- actions.on("toggleCams", () => {
- this.setState({enableCams: !this.state.enableCams})
- });
- }
- render(){
- const { enableCams } = this.state;
- //const url = avatars.filter(avatar => avatar.steamid === this.props.steamid)[0];
- const avatarData = avatars[this.props.steamid];
- if(!avatarData || !avatarData.url){
- return '';
- }
- const slot = this.props.slot === 0 ? 10 : this.props.slot || 1;
- const leftPosition = - 150*((slot-1)%5);
- const topPosition = slot > 5 ? -150 : 0;
- return (
-
{team.name}
- WINS THE ROUND!
-
- }
-}
diff --git a/src/HUD/MatchBar/matchbar.scss b/src/HUD/MatchBar/matchbar.scss
index 56a8fc8..129604a 100644
--- a/src/HUD/MatchBar/matchbar.scss
+++ b/src/HUD/MatchBar/matchbar.scss
@@ -24,36 +24,18 @@
width: 1148px;
height: 70px;
top: 10px;
+ color: white;
left: 50%;
transform: translateX(-50%);
- .CT {
- color: var(--color-new-ct);
- .round-thingy {
- .inner {
- background-color: #28abff;
- }
- background-color: #28abff80;
- }
- }
- .T {
- color: var(--color-new-t);
- .round-thingy {
- .inner {
- background-color: #ffc600;
- }
- background-color: #ffc60080;
- }
- }
+
#timer {
display: flex;
flex-direction: column;
- position: relative;
width: 126px;
height: 115px;
margin-left: 8px;
margin-right: 8px;
background-color: var(--sub-panel-color);
- top: -10px;
&.no-bo {
height: 87px;
}
@@ -200,84 +182,10 @@
flex-direction: row;
width: 10px;
height: 70px;
- &.CT {
- background-color: var(--color-new-ct);
- }
- &.T {
- background-color: var(--color-new-t);
- }
}
}
-.win_text {
- position: fixed;
- display: none;
- opacity: 1;
- width: 503px;
- height: 50px;
- top: 70px;
- align-items: center;
- color: black;
- justify-content: center;
- background-color: white;
- font-size: 20px;
- font-family: Montserrat;
- font-weight: 600;
- &.show {
- display: flex;
- animation: ShowWinCycle 5s linear 1;
- animation-fill-mode: forwards;
- }
- &.right {
- left: calc(50% + 71px);
- }
- &.left {
- right: calc(50% + 71px);
- }
-}
-.defuse_plant_container {
- position: fixed;
- display: flex;
- opacity: 1;
- width: 503px;
- height: 49px;
- top: 70px;
- align-items: center;
- color: white;
- justify-content: center;
- background-color: rgba(0,0,0,0.65);
- .defuse_plant_bar {
- height: 49px;
- background-color: #3c3c3c;
- position: absolute;
- width: 0%;
- }
- .defuse_plant_caption {
- z-index: 1;
- display: flex;
- text-transform: uppercase;
- align-items: flex-end;
- svg {
- margin-right: 13px;
- }
- }
- &.right {
- left: calc(50% + 71px);
- .defuse_plant_bar {
- left: 0;
- }
- }
- &.left {
- right: calc(50% + 71px);
- .defuse_plant_bar {
- right: 0;
- }
- }
- &.hide {
- opacity: 0;
- }
-}
#encapsulator {
overflow: hidden;
display: flex;
@@ -289,31 +197,16 @@
height: 50px;
left: 50%;
transform: translateX(-50%);
- .CT {
- color: var(--color-new-ct);
- }
- .T {
- color: var(--color-new-t);
- }
+
.wins_bar {
display: flex;
flex-direction: row;
width: 10px;
height: 30px;
}
- .wins_bar.CT {
- background-color: var(--color-new-ct);
- }
- .wins_bar.T {
- background-color: var(--color-new-t);
- }
-}
-.alert_bar.CT {
- background-color: var(--color-new-ct);
-}
-.alert_bar.T {
- background-color: var(--color-new-t);
+
}
+
#series_container {
display: flex;
flex-direction: row;
@@ -376,16 +269,8 @@
margin-left: 2px;
margin-right: 2px;
box-sizing: border-box;
-}
-.wins_box.CT {
- background-color: rgba(0,0,0,0.6);
-}
-.wins_box.CT.win {
- background-color: var(--color-new-ct);
-}
-.wins_box.T {
- background-color: rgba(0,0,0,0.6);
-}
-.wins_box.T.win {
- background-color: var(--color-new-t);
+ background-color:rgba(0,0,0,0.25);
+ &.win {
+ background-color: rgba(255,255,255,1);
+ }
}
diff --git a/src/HUD/Players/Avatar.tsx b/src/HUD/Players/Avatar.tsx
deleted file mode 100644
index 87fa01d..0000000
--- a/src/HUD/Players/Avatar.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import { isDev, port } from '../../api/api';
-import { actions } from '../../App';
-
-import { avatars } from './../../api/avatars';
-
-import { Skull } from './../../assets/Icons';
-
-interface IProps {
- steamid: string,
- slot?: number,
- height?: number,
- width?: number,
- showSkull?: boolean,
- showCam?: boolean
-}
-interface IState {
- enableCams: boolean
-}
-export default class Avatar extends React.Component
- {
- this.props.showCam ? : null
- }
- {
- this.props.showSkull ? 
- }
-
-
- );
- }
-
-}
diff --git a/src/HUD/Players/Observed.tsx b/src/HUD/Players/Observed.tsx
index 5c3e4bb..aa7cf49 100644
--- a/src/HUD/Players/Observed.tsx
+++ b/src/HUD/Players/Observed.tsx
@@ -16,7 +16,7 @@ export default class Observed extends React.Component<{ player: Player | null }>
- 
+
@@ -35,7 +35,7 @@ export default class Observed extends React.Component<{ player: Player | null }>
{
- player.items.filter(item => item.type === "slot").map(item => item.name !== "empty" ? 
: null)
+ player.items.filter(item => item.type === "slot").map(item => item.name !== "empty" ? : null)
}
diff --git a/src/HUD/Players/Player.tsx b/src/HUD/Players/Player.tsx
deleted file mode 100644
index 3ae918e..0000000
--- a/src/HUD/Players/Player.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from "react";
-import { Player, WeaponRaw } from "csgogsi-socket";
-import Weapon from "./../Weapon/Weapon";
-import Avatar from "./Avatar";
-import Armor from "./../Indicators/Armor";
-import Bomb from "./../Indicators/Bomb";
-import Defuse from "./../Indicators/Defuse";
-
-interface IProps {
- player: Player,
- isObserved: boolean,
- isFreezetime: boolean,
-}
-export default class PlayerBox extends React.Component {
- render() {
- const { player } = this.props;
- const weapons: WeaponRaw[] = Object.values(player.weapons).map(weapon => ({ ...weapon, name: weapon.name.replace("weapon_", "") }));
- const primary = weapons.filter(weapon => !['C4', 'Pistol', 'Knife', 'Grenade', undefined].includes(weapon.type))[0] || null;
- const secondary = weapons.filter(weapon => weapon.type === "Pistol")[0] || null;
- const grenades = weapons.filter(weapon => weapon.type === "Grenade");
- const isLeft = player.team.orientation === "left";
- return (
- {
- render() {
- return (
- (eventName: K, listener: Events[K]) => void;
- removeListener: (eventName: K, listener: Events[K]) => void;
-};
-
-type EventNames = keyof Events;
-interface EventDescriptor {
- listener: Events[EventNames];
- once: boolean;
-}
-class DOTA2GSI {
- private descriptors: Map;
- private maxListeners: number;
- teams: {
- //left: TeamExtension | null;
- //right: TeamExtension | null;
- };
- //players: PlayerExtension[];
- //last?: CSGO;
- constructor() {
- this.descriptors = new Map();
- this.teams = {
- left: null,
- right: null
- };
- this.maxListeners = 10;
- //this.players = [];
- }
- eventNames = () => {
- //const listeners = this.descriptors.entries();
- const nonEmptyEvents: EventNames[] = [];
-
- /*for (const entry of listeners) {
- if (entry[1] && entry[1].length > 0) {
- nonEmptyEvents.push(entry[0]);
- }
- }*/
-
- return nonEmptyEvents;
- };
- getMaxListeners = () => this.maxListeners;
-
- listenerCount = (eventName: EventNames) => {
- const listeners = this.listeners(eventName);
- return listeners.length;
- };
-
- listeners = (eventName: EventNames) => {
- const descriptors = this.descriptors.get(eventName) || [];
- return descriptors.map(descriptor => descriptor.listener);
- };
-
- removeListener = (eventName: K, listener: Events[K]) => {
- return this.off(eventName, listener);
- };
-
- off = (eventName: K, listener: Events[K]) => {
- const descriptors = this.descriptors.get(eventName) || [];
-
- this.descriptors.set(
- eventName,
- descriptors.filter(descriptor => descriptor.listener !== listener)
- );
- this.emit('removeListener', eventName, listener);
- return this;
- };
-
- addListener = (eventName: K, listener: Events[K]) => {
- return this.on(eventName, listener);
- };
-
- on = (eventName: K, listener: Events[K]) => {
- this.emit('newListener', eventName, listener);
- const listOfListeners = [...(this.descriptors.get(eventName) || [])];
-
- listOfListeners.push({ listener, once: false });
- this.descriptors.set(eventName, listOfListeners);
-
- return this;
- };
-
- once = (eventName: K, listener: Events[K]) => {
- const listOfListeners = [...(this.descriptors.get(eventName) || [])];
-
- listOfListeners.push({ listener, once: true });
- this.descriptors.set(eventName, listOfListeners);
-
- return this;
- };
-
- prependListener = (eventName: K, listener: Events[K]) => {
- const listOfListeners = [...(this.descriptors.get(eventName) || [])];
-
- listOfListeners.unshift({ listener, once: false });
- this.descriptors.set(eventName, listOfListeners);
-
- return this;
- };
-
- emit = (eventName: EventNames, arg?: any, arg2?: any) => {
- const listeners = this.descriptors.get(eventName);
- if (!listeners || listeners.length === 0) return false;
-
- listeners.forEach(listener => {
- if (listener.once) {
- this.descriptors.set(
- eventName,
- listeners.filter(listenerInArray => listenerInArray !== listener)
- );
- }
- listener.listener(arg, arg2);
- });
- return true;
- };
-
- prependOnceListener = (eventName: K, listener: Events[K]) => {
- const listOfListeners = [...(this.descriptors.get(eventName) || [])];
-
- listOfListeners.unshift({ listener, once: true });
- this.descriptors.set(eventName, listOfListeners);
-
- return this;
- };
-
- removeAllListeners = (eventName: EventNames) => {
- this.descriptors.set(eventName, []);
- return this;
- };
-
- setMaxListeners = (n: number) => {
- this.maxListeners = n;
- return this;
- };
-
- rawListeners = (eventName: EventNames) => {
- return this.descriptors.get(eventName) || [];
- };
-
- digest = (gsi: any) => {
-
- this.emit('data', gsi);
- }
-
-}
-
-export { DOTA2GSI };
-
- );
- }
-}
diff --git a/src/HUD/Players/TeamBox.tsx b/src/HUD/Players/TeamBox.tsx
deleted file mode 100644
index 7806799..0000000
--- a/src/HUD/Players/TeamBox.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import Player from './Player'
-import * as I from 'csgogsi-socket';
-import './players.scss';
-
-interface Props {
- players: I.Player[],
- team: I.Team,
- side: 'right' | 'left',
- current: I.Player | null,
- isFreezetime: boolean,
-}
-
-export default class TeamBox extends React.Component
-
-
-
-
-
-
- K
- A
- D
-
-
- {player.stats.kills}
- {player.stats.assists}
- {player.stats.deaths}
-
-
-
-
-
-
- {player.state.health}
-
-
-
- {isLeft ? {player.observer_slot} : null} {player.name} {!isLeft ? {player.observer_slot} : null}
- {primary || secondary ? {player.state.round_kills}
: null}
-
-
-
-
-
- ${player.state.money}
-
- {grenades.map(grenade => (
- [
-
- {primary && secondary ?
-
- {this.props.players.map(player =>
- );
- }
-}
diff --git a/src/HUD/Players/players.scss b/src/HUD/Players/players.scss
deleted file mode 100644
index fe7e169..0000000
--- a/src/HUD/Players/players.scss
+++ /dev/null
@@ -1,358 +0,0 @@
-.teambox {
- position: fixed;
- bottom: 10px;
- display: flex;
- flex-direction: column;
- opacity: 1;
- transition: opacity 0.75s;
- &.CT {
- .player .hp_bar {
- background-color: var(--color-new-ct);
- }
- }
- &.T {
- .player .hp_bar {
- background-color: var(--color-new-t);
- }
- }
- &.hide {
- opacity: 0;
- }
- &.left {
- left: 10px;
- .player {
- .row {
- flex-direction: row;
- .grenades {
- padding-right: 5px;
- }
-
- .armor_and_utility {
- justify-content: flex-start;
- }
- .money {
- margin-right: auto;
- }
- .username .roundkills-container {
- right: 115px;
- }
- .secondary_weapon {
- padding-right: 10px;
- }
-
- }
- .dead-stats {
- right: 8px;
- }
- }
- }
- &.right {
- right: 10px;
- .player {
- flex-direction: row-reverse;
- .dead-stats {
- left: 8px;
- }
- .player_data {
- flex-direction: row-reverse;
- .hp_bar {
- align-self: flex-end;
- }
- .row {
- flex-direction: row-reverse;
- .grenades {
- padding-left: 5px;
- }
- .username {
- flex-direction: row-reverse;
- .roundkills-container {
- left: 115px;
- }
- }
- .secondary_weapon {
- padding-left: 10px;
- }
- .armor_and_utility {
- justify-content: flex-end;
- }
- .money {
- margin-left: auto;
- justify-content: flex-end;
- }
- .weapon {
- transform: scaleX(-1);
- }
- }
- .avatar {
- justify-content: flex-start;
- }
- }
- }
- }
- .player {
- width: 645px;
- height: 70px;
- margin-bottom: 4px;
- display: flex;
- flex-direction: row;
- align-items: center;
- &.active {
- .player_data {
- border: 2px solid white;
- }
- }
- &.dead {
- opacity: 0.7;
- .player_side_bar {
- background-color: var(--main-panel-color) !important;
- }
- .player_data {
- .avatar {
- filter: grayscale(100%);
- }
- .dead-stats {
- display: flex;
- }
- .row {
- .hp_background_2 {
- opacity: 0;
- }
- .health {
- color: #b2b2b2;
- overflow: hidden;
- }
- .username {
- color: #b2b2b2;
- }
- .armor_and_utility {
- width: 0px;
- overflow: hidden;
- }
- .money {
- color: #466722;
- }
- }
- }
- }
- &:last-child .player_data {
- border-radius: 0 0 20px 20px;
- }
- .player_side_bar {
- width: 10px;
- height: 70px;
- &.CT {
- background-color: var(--color-new-ct);
- }
- &.T {
- background-color: var(--color-new-t);
- }
- }
- .dead-stats {
- position: absolute;
- height: 85%;
- width: 60px;
- display: none;
- flex-direction: column;
- font-weight: 600;
- color: white;
- opacity: 0.75;
- top: 10%;
- .labels, .values {
- display: flex;
- flex-direction: row;
- flex: 1;
- .stat-label, .stat-value {
- display: flex;
- flex: 1;
- align-items: center;
- justify-content: center;
- }
- }
- }
- .player_data {
- background-color: var(--sub-panel-color);
- width: 415px;
- display: flex;
- flex-direction: row;
- position: relative;
- height: 100%;
- .player_stats {
- display: flex;
- flex-direction: column;
- flex: 1;
- min-width: 0;
- .hp_bar {
- height: 2px;
- &.low {
- background-color: red;
- }
- }
- .row {
- flex: 1;
- display: flex;
- position: relative;
- svg.weapon {
- filter: invert(45%);
- &.active {
- filter: invert(0);
- }
- }
- .hp_background, .hp_background_2 {
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: 0;
- }
- .hp_background_2 {
- background-color: var(--color-bomb);
- transition: width 0.75s 1.5s;
- }
- .armor_and_utility {
- width: 39px;
- display: flex;
- align-items: center;
- padding-left: 5px;
- padding-right: 5px;
- .armor_indicator, .bomb_indicator, .defuse_indicator {
- svg {
- max-height: 20px;
- fill: white;
- }
- }
- div {
- display: flex;
- width: 50%;
- }
- }
- .username {
- flex: 1;
- display: flex;
- align-items: center;
- z-index: 1;
- color: white;
- font-weight: 600;
- max-width: calc(100% - 49px);
- justify-content: space-between;
- overflow: hidden;
- font-size: 18px;
- text-overflow: ellipsis;
- white-space: nowrap;
- .roundkills-container {
- position: absolute;
- background-image: url('./../../assets/images/icon_skull_default.svg');
- background-repeat: no-repeat;
- background-size: 10px;
- background-position: left 2px;
- padding-left: 16px;
- font-size: 13px;
- }
- div span {
- opacity: 0.6;
- font-size:15px;
- }
- svg.weapon {
- max-height: 30px;
- width: auto;
- margin-left: 5px;
- margin-right: 5px;
- max-width: 100px;
- height: 30px;
- }
- }
- .money {
- width: 60px;
- color: var(--color-moneys);
- font-weight: 600;
- display: flex;
- align-items: center;
- justify-content: flex-start;
- }
- .grenades {
- display: flex;
- align-items: center;
- justify-content: space-around;
- svg.grenade {
- max-height: 20px;
- height: 20px;
- }
- }
- .health {
- width: 49px;
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 1;
- color: white;
- font-weight: 600;
- font-size:18px;
- }
- .secondary_weapon {
- display: flex;
- align-items: center;
- svg {
- max-height: 30px;
- height: 30px;
- }
- }
- }
- }
- .avatar {
- width: 70px;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- img {
- border-radius:50%;
- }
- }
- }
- }
-}
-
-.players_alive {
- display: flex;
- flex-direction: column;
- width: 180px;
- background-color: rgba(0,0,0,0.5);
- position: fixed;
- right: 10px;
- top: 10px;
- opacity: 1;
- transition: opacity 1s;
- .counter_container {
- display: flex;
- height: 45px;
- > div {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size:30px;
- color: white;
- background-color: rgba(0,0,0,0.5);
- }
- .team_counter {
- background-color: rgba(0,0,0,0.75);
- }
- .CT {
- color: var(--color-new-ct);
- }
- .T {
- color: var(--color-new-t);
- }
- }
- .title_container {
- color: white;
- text-transform: uppercase;
- text-align: center;
- height:20px;
- font-size:14px;
- display: flex;
- align-items: center;
- justify-content: center;
- background-color: rgba(0,0,0,0.75);
- }
- &.hide {
- opacity: 0;
- }
-}
diff --git a/src/assets/Icons.tsx b/src/assets/Icons.tsx
deleted file mode 100644
index 11baee3..0000000
--- a/src/assets/Icons.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ReactComponent as ArmorFull } from './../assets/images/icon_armor_full_default.svg';
-import { ReactComponent as ArmorHalf } from './../assets/images/icon_armor_half_default.svg';
-import { ReactComponent as ArmorHalfHelmet } from './../assets/images/icon_armor_half_helmet_default.svg';
-import { ReactComponent as ArmorHelmet } from './../assets/images/icon_armor_helmet_default.svg';
-import { ReactComponent as ArmorNone } from './../assets/images/icon_armor_none_default.svg';
-import { ReactComponent as Blind } from './../assets/images/icon_blind.svg';
-import { ReactComponent as Bomb } from './../assets/images/icon_bomb_default.svg';
-import { ReactComponent as BombExplosion } from './../assets/images/icon_bomb_explosion_default.svg';
-import { ReactComponent as Bullets } from './../assets/images/icon_bullets_default.svg';
-import { ReactComponent as Burning } from './../assets/images/icon_burning.svg';
-import { ReactComponent as C4 } from './../assets/images/icon_c4_default.svg';
-import { ReactComponent as Defuse } from './../assets/images/icon_defuse_default.svg';
-import { ReactComponent as Health } from './../assets/images/icon_health_default.svg';
-import { ReactComponent as HealthFull } from './../assets/images/icon_health_full_default.svg';
-import { ReactComponent as Hourglass } from './../assets/images/icon_hourglass_default.svg';
-import { ReactComponent as Microphone } from './../assets/images/icon_microphone.svg';
-import { ReactComponent as Pause } from './../assets/images/icon_pause_default.svg';
-import { ReactComponent as Skull } from './../assets/images/icon_skull_default.svg';
-import { ReactComponent as Timer } from './../assets/images/icon_timer_default.svg';
-import LogoCT from './../assets/images/logo_CT_default.png';
-import LogoT from './../assets/images/logo_T_default.png';
-import { ReactComponent as SmallBomb } from "./../assets/images/bomb.svg";
-
-
-export {
- SmallBomb,
- ArmorFull,
- ArmorHalf,
- ArmorHalfHelmet,
- ArmorHelmet,
- ArmorNone,
- Blind,
- Bomb,
- BombExplosion,
- Bullets,
- Burning,
- C4,
- Defuse,
- Health,
- HealthFull,
- Hourglass,
- Microphone,
- Pause,
- Skull,
- Timer,
- LogoCT,
- LogoT,
-}
-
\ No newline at end of file
diff --git a/src/assets/Weapons.tsx b/src/assets/Weapons.tsx
deleted file mode 100644
index 9cd5697..0000000
--- a/src/assets/Weapons.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { ReactComponent as ak47 } from './weapons/ak47.svg';
-import { ReactComponent as aug } from './weapons/aug.svg';
-import { ReactComponent as awp } from './weapons/awp.svg';
-import { ReactComponent as bayonet } from './weapons/bayonet.svg';
-import { ReactComponent as bizon } from './weapons/bizon.svg';
-import { ReactComponent as c4 } from './weapons/c4.svg';
-import { ReactComponent as cz75a } from './weapons/cz75a.svg';
-import { ReactComponent as deagle } from './weapons/deagle.svg';
-import { ReactComponent as decoy } from './weapons/decoy.svg';
-import { ReactComponent as elite } from './weapons/elite.svg';
-import { ReactComponent as famas } from './weapons/famas.svg';
-import { ReactComponent as fiveseven } from './weapons/fiveseven.svg';
-import { ReactComponent as flashbang } from './weapons/flashbang.svg';
-import { ReactComponent as g3sg1 } from './weapons/g3sg1.svg';
-import { ReactComponent as galilar } from './weapons/galilar.svg';
-import { ReactComponent as glock } from './weapons/glock.svg';
-import { ReactComponent as hegrenade } from './weapons/hegrenade.svg';
-import { ReactComponent as hkp2000 } from './weapons/hkp2000.svg';
-import { ReactComponent as incgrenade } from './weapons/incgrenade.svg';
-import { ReactComponent as inferno } from './weapons/inferno.svg';
-import { ReactComponent as knife } from './weapons/knife.svg';
-import { ReactComponent as knife_bayonet } from './weapons/knife_bayonet.svg';
-import { ReactComponent as knife_butterfly } from './weapons/knife_butterfly.svg';
-import { ReactComponent as knife_canis } from './weapons/knife_canis.svg';
-import { ReactComponent as knife_cord } from './weapons/knife_cord.svg';
-import { ReactComponent as knife_css } from './weapons/knife_css.svg';
-import { ReactComponent as knife_falchion } from './weapons/knife_falchion.svg';
-import { ReactComponent as knife_flip } from './weapons/knife_flip.svg';
-import { ReactComponent as knife_gut } from './weapons/knife_gut.svg';
-import { ReactComponent as knife_gypsy_jackknife } from './weapons/knife_gypsy_jackknife.svg';
-import { ReactComponent as knife_karambit } from './weapons/knife_karambit.svg';
-import { ReactComponent as knife_m9_bayonet } from './weapons/knife_m9_bayonet.svg';
-import { ReactComponent as knife_outdoor } from './weapons/knife_outdoor.svg';
-import { ReactComponent as knife_push } from './weapons/knife_push.svg';
-import { ReactComponent as knife_skeleton } from './weapons/knife_skeleton.svg';
-import { ReactComponent as knife_stiletto } from './weapons/knife_stiletto.svg';
-import { ReactComponent as knife_survival_bowie } from './weapons/knife_survival_bowie.svg';
-import { ReactComponent as knife_t } from './weapons/knife_t.svg';
-import { ReactComponent as knife_tactical } from './weapons/knife_tactical.svg';
-import { ReactComponent as knife_ursus } from './weapons/knife_ursus.svg';
-import { ReactComponent as knife_widowmaker } from './weapons/knife_widowmaker.svg';
-import { ReactComponent as m249 } from './weapons/m249.svg';
-import { ReactComponent as m4a1 } from './weapons/m4a1.svg';
-import { ReactComponent as m4a1_silencer } from './weapons/m4a1_silencer.svg';
-import { ReactComponent as m4a1_silencer_off } from './weapons/m4a1_silencer_off.svg';
-import { ReactComponent as mac10 } from './weapons/mac10.svg';
-import { ReactComponent as mag7 } from './weapons/mag7.svg';
-import { ReactComponent as molotov } from './weapons/molotov.svg';
-import { ReactComponent as mp5sd } from './weapons/mp5sd.svg';
-import { ReactComponent as mp7 } from './weapons/mp7.svg';
-import { ReactComponent as mp9 } from './weapons/mp9.svg';
-import { ReactComponent as negev } from './weapons/negev.svg';
-import { ReactComponent as nova } from './weapons/nova.svg';
-import { ReactComponent as out } from './weapons/out.svg';
-import { ReactComponent as p250 } from './weapons/p250.svg';
-import { ReactComponent as p90 } from './weapons/p90.svg';
-import { ReactComponent as revolver } from './weapons/revolver.svg';
-import { ReactComponent as sawedoff } from './weapons/sawedoff.svg';
-import { ReactComponent as scar20 } from './weapons/scar20.svg';
-import { ReactComponent as sg556 } from './weapons/sg556.svg';
-import { ReactComponent as smokegrenade } from './weapons/smokegrenade.svg';
-import { ReactComponent as ssg08 } from './weapons/ssg08.svg';
-import { ReactComponent as taser } from './weapons/taser.svg';
-import { ReactComponent as tec9 } from './weapons/tec9.svg';
-import { ReactComponent as trigger_hurt } from './weapons/trigger_hurt.svg';
-import { ReactComponent as ump45 } from './weapons/ump45.svg';
-import { ReactComponent as usp_silencer } from './weapons/usp_silencer.svg';
-import { ReactComponent as usp_silencer_off } from './weapons/usp_silencer_off.svg';
-import { ReactComponent as world } from './weapons/world.svg';
-import { ReactComponent as xm1014 } from './weapons/xm1014.svg';
-export {
- ak47,
- aug,
- awp,
- bayonet,
- bizon,
- c4,
- cz75a,
- deagle,
- decoy,
- elite,
- famas,
- fiveseven,
- flashbang,
- g3sg1,
- galilar,
- glock,
- hegrenade,
- hkp2000,
- incgrenade,
- inferno,
- knife,
- knife_bayonet,
- knife_butterfly,
- knife_canis,
- knife_cord,
- knife_css,
- knife_falchion,
- knife_flip,
- knife_gut,
- knife_gypsy_jackknife,
- knife_karambit,
- knife_m9_bayonet,
- knife_outdoor,
- knife_push,
- knife_skeleton,
- knife_stiletto,
- knife_survival_bowie,
- knife_t,
- knife_tactical,
- knife_ursus,
- knife_widowmaker,
- m249,
- m4a1,
- m4a1_silencer,
- m4a1_silencer_off,
- mac10,
- mag7,
- molotov,
- mp5sd,
- mp7,
- mp9,
- negev,
- nova,
- out,
- p250,
- p90,
- revolver,
- sawedoff,
- scar20,
- sg556,
- smokegrenade,
- ssg08,
- taser,
- tec9,
- trigger_hurt,
- ump45,
- usp_silencer,
- usp_silencer_off,
- world,
- xm1014,
-}
\ No newline at end of file
diff --git a/src/assets/bg.png b/src/assets/bg.png
deleted file mode 100644
index e01f481..0000000
Binary files a/src/assets/bg.png and /dev/null differ
diff --git a/src/assets/flash_assist.png b/src/assets/flash_assist.png
deleted file mode 100644
index 5314731..0000000
Binary files a/src/assets/flash_assist.png and /dev/null differ
diff --git a/src/assets/flashed_kill.png b/src/assets/flashed_kill.png
deleted file mode 100644
index ecbc3fd..0000000
Binary files a/src/assets/flashed_kill.png and /dev/null differ
diff --git a/src/assets/headshot.png b/src/assets/headshot.png
deleted file mode 100644
index 3f90d3c..0000000
Binary files a/src/assets/headshot.png and /dev/null differ
diff --git a/src/assets/images/bomb.svg b/src/assets/images/bomb.svg
deleted file mode 100644
index a1015f5..0000000
--- a/src/assets/images/bomb.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_armor_full_default.svg b/src/assets/images/icon_armor_full_default.svg
deleted file mode 100644
index 49baf9a..0000000
--- a/src/assets/images/icon_armor_full_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_armor_half_default.svg b/src/assets/images/icon_armor_half_default.svg
deleted file mode 100644
index 6797c4e..0000000
--- a/src/assets/images/icon_armor_half_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_armor_half_helmet_default.svg b/src/assets/images/icon_armor_half_helmet_default.svg
deleted file mode 100644
index c1de3d0..0000000
--- a/src/assets/images/icon_armor_half_helmet_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_armor_helmet_default.svg b/src/assets/images/icon_armor_helmet_default.svg
deleted file mode 100644
index 2b9370a..0000000
--- a/src/assets/images/icon_armor_helmet_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_armor_none_default.svg b/src/assets/images/icon_armor_none_default.svg
deleted file mode 100644
index a9bd87f..0000000
--- a/src/assets/images/icon_armor_none_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_blind.svg b/src/assets/images/icon_blind.svg
deleted file mode 100644
index 55b6504..0000000
--- a/src/assets/images/icon_blind.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_bomb_default.svg b/src/assets/images/icon_bomb_default.svg
deleted file mode 100644
index e3d65f4..0000000
--- a/src/assets/images/icon_bomb_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_bomb_explosion_default.svg b/src/assets/images/icon_bomb_explosion_default.svg
deleted file mode 100644
index 0b6ef6f..0000000
--- a/src/assets/images/icon_bomb_explosion_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_bullets_default.svg b/src/assets/images/icon_bullets_default.svg
deleted file mode 100644
index ac64297..0000000
--- a/src/assets/images/icon_bullets_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_burning.svg b/src/assets/images/icon_burning.svg
deleted file mode 100644
index 6cec928..0000000
--- a/src/assets/images/icon_burning.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_c4_default.svg b/src/assets/images/icon_c4_default.svg
deleted file mode 100644
index 41c483b..0000000
--- a/src/assets/images/icon_c4_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_defuse_default.svg b/src/assets/images/icon_defuse_default.svg
deleted file mode 100644
index 559464a..0000000
--- a/src/assets/images/icon_defuse_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_health_default.svg b/src/assets/images/icon_health_default.svg
deleted file mode 100644
index 70b972b..0000000
--- a/src/assets/images/icon_health_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_health_full_default.svg b/src/assets/images/icon_health_full_default.svg
deleted file mode 100644
index 17b09be..0000000
--- a/src/assets/images/icon_health_full_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_hourglass_default.svg b/src/assets/images/icon_hourglass_default.svg
deleted file mode 100644
index b75c4fc..0000000
--- a/src/assets/images/icon_hourglass_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_microphone.svg b/src/assets/images/icon_microphone.svg
deleted file mode 100644
index 6da5c55..0000000
--- a/src/assets/images/icon_microphone.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_pause_default.svg b/src/assets/images/icon_pause_default.svg
deleted file mode 100644
index a615edf..0000000
--- a/src/assets/images/icon_pause_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_skull_default.svg b/src/assets/images/icon_skull_default.svg
deleted file mode 100644
index 14598b4..0000000
--- a/src/assets/images/icon_skull_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/icon_timer_default.svg b/src/assets/images/icon_timer_default.svg
deleted file mode 100644
index d43f4b7..0000000
--- a/src/assets/images/icon_timer_default.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/images/logo_CT_default.png b/src/assets/images/logo_CT_default.png
deleted file mode 100644
index b0775b5..0000000
Binary files a/src/assets/images/logo_CT_default.png and /dev/null differ
diff --git a/src/assets/images/logo_T_default.png b/src/assets/images/logo_T_default.png
deleted file mode 100644
index fbaacdc..0000000
Binary files a/src/assets/images/logo_T_default.png and /dev/null differ
diff --git a/src/assets/noscope_kill.png b/src/assets/noscope_kill.png
deleted file mode 100644
index 219f6aa..0000000
Binary files a/src/assets/noscope_kill.png and /dev/null differ
diff --git a/src/assets/smoke_kill.png b/src/assets/smoke_kill.png
deleted file mode 100644
index 011a662..0000000
Binary files a/src/assets/smoke_kill.png and /dev/null differ
diff --git a/src/assets/wallbang.png b/src/assets/wallbang.png
deleted file mode 100644
index b63740c..0000000
Binary files a/src/assets/wallbang.png and /dev/null differ
diff --git a/src/assets/weapons/ak47.svg b/src/assets/weapons/ak47.svg
deleted file mode 100644
index 840fe3e..0000000
--- a/src/assets/weapons/ak47.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/aug.svg b/src/assets/weapons/aug.svg
deleted file mode 100644
index 4fe4f08..0000000
--- a/src/assets/weapons/aug.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/awp.svg b/src/assets/weapons/awp.svg
deleted file mode 100644
index 8bbdeac..0000000
--- a/src/assets/weapons/awp.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/bayonet.svg b/src/assets/weapons/bayonet.svg
deleted file mode 100644
index 4d746e7..0000000
--- a/src/assets/weapons/bayonet.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/bizon.svg b/src/assets/weapons/bizon.svg
deleted file mode 100644
index f8141a8..0000000
--- a/src/assets/weapons/bizon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/c4.svg b/src/assets/weapons/c4.svg
deleted file mode 100644
index 18c9c93..0000000
--- a/src/assets/weapons/c4.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/cz75a.svg b/src/assets/weapons/cz75a.svg
deleted file mode 100644
index 2c1727a..0000000
--- a/src/assets/weapons/cz75a.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/deagle.svg b/src/assets/weapons/deagle.svg
deleted file mode 100644
index cbfbfd1..0000000
--- a/src/assets/weapons/deagle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/decoy.svg b/src/assets/weapons/decoy.svg
deleted file mode 100644
index e2c0c6b..0000000
--- a/src/assets/weapons/decoy.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/elite.svg b/src/assets/weapons/elite.svg
deleted file mode 100644
index 0424256..0000000
--- a/src/assets/weapons/elite.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/famas.svg b/src/assets/weapons/famas.svg
deleted file mode 100644
index 831fcbb..0000000
--- a/src/assets/weapons/famas.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/fiveseven.svg b/src/assets/weapons/fiveseven.svg
deleted file mode 100644
index 45c0c20..0000000
--- a/src/assets/weapons/fiveseven.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/flashbang.svg b/src/assets/weapons/flashbang.svg
deleted file mode 100644
index 5cb9d65..0000000
--- a/src/assets/weapons/flashbang.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/src/assets/weapons/g3sg1.svg b/src/assets/weapons/g3sg1.svg
deleted file mode 100644
index 537bc62..0000000
--- a/src/assets/weapons/g3sg1.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/galilar.svg b/src/assets/weapons/galilar.svg
deleted file mode 100644
index 6fbd495..0000000
--- a/src/assets/weapons/galilar.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/glock.svg b/src/assets/weapons/glock.svg
deleted file mode 100644
index ad9b29a..0000000
--- a/src/assets/weapons/glock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/hegrenade.svg b/src/assets/weapons/hegrenade.svg
deleted file mode 100644
index f4bc3ae..0000000
--- a/src/assets/weapons/hegrenade.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/assets/weapons/hkp2000.svg b/src/assets/weapons/hkp2000.svg
deleted file mode 100644
index 260660b..0000000
--- a/src/assets/weapons/hkp2000.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/incgrenade.svg b/src/assets/weapons/incgrenade.svg
deleted file mode 100644
index 43e5d80..0000000
--- a/src/assets/weapons/incgrenade.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/inferno.svg b/src/assets/weapons/inferno.svg
deleted file mode 100644
index 4992b74..0000000
--- a/src/assets/weapons/inferno.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife.svg b/src/assets/weapons/knife.svg
deleted file mode 100644
index 3129f36..0000000
--- a/src/assets/weapons/knife.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_bayonet.svg b/src/assets/weapons/knife_bayonet.svg
deleted file mode 100644
index 4d746e7..0000000
--- a/src/assets/weapons/knife_bayonet.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_butterfly.svg b/src/assets/weapons/knife_butterfly.svg
deleted file mode 100644
index 3657a53..0000000
--- a/src/assets/weapons/knife_butterfly.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_canis.svg b/src/assets/weapons/knife_canis.svg
deleted file mode 100644
index a347233..0000000
--- a/src/assets/weapons/knife_canis.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_cord.svg b/src/assets/weapons/knife_cord.svg
deleted file mode 100644
index 7656eb7..0000000
--- a/src/assets/weapons/knife_cord.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_css.svg b/src/assets/weapons/knife_css.svg
deleted file mode 100644
index c0ab575..0000000
--- a/src/assets/weapons/knife_css.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_falchion.svg b/src/assets/weapons/knife_falchion.svg
deleted file mode 100644
index 77d2222..0000000
--- a/src/assets/weapons/knife_falchion.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_flip.svg b/src/assets/weapons/knife_flip.svg
deleted file mode 100644
index 7805419..0000000
--- a/src/assets/weapons/knife_flip.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_gut.svg b/src/assets/weapons/knife_gut.svg
deleted file mode 100644
index 59ea74d..0000000
--- a/src/assets/weapons/knife_gut.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_gypsy_jackknife.svg b/src/assets/weapons/knife_gypsy_jackknife.svg
deleted file mode 100644
index e6ae44a..0000000
--- a/src/assets/weapons/knife_gypsy_jackknife.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_karambit.svg b/src/assets/weapons/knife_karambit.svg
deleted file mode 100644
index 2d9b37a..0000000
--- a/src/assets/weapons/knife_karambit.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_m9_bayonet.svg b/src/assets/weapons/knife_m9_bayonet.svg
deleted file mode 100644
index 524e56b..0000000
--- a/src/assets/weapons/knife_m9_bayonet.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_outdoor.svg b/src/assets/weapons/knife_outdoor.svg
deleted file mode 100644
index e5ff3f2..0000000
--- a/src/assets/weapons/knife_outdoor.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_push.svg b/src/assets/weapons/knife_push.svg
deleted file mode 100644
index d1f6c9b..0000000
--- a/src/assets/weapons/knife_push.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_skeleton.svg b/src/assets/weapons/knife_skeleton.svg
deleted file mode 100644
index 31e2076..0000000
--- a/src/assets/weapons/knife_skeleton.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_stiletto.svg b/src/assets/weapons/knife_stiletto.svg
deleted file mode 100644
index 4ca01f7..0000000
--- a/src/assets/weapons/knife_stiletto.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_survival_bowie.svg b/src/assets/weapons/knife_survival_bowie.svg
deleted file mode 100644
index 8abc713..0000000
--- a/src/assets/weapons/knife_survival_bowie.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_t.svg b/src/assets/weapons/knife_t.svg
deleted file mode 100644
index f284ac6..0000000
--- a/src/assets/weapons/knife_t.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_tactical.svg b/src/assets/weapons/knife_tactical.svg
deleted file mode 100644
index 3474ad1..0000000
--- a/src/assets/weapons/knife_tactical.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_ursus.svg b/src/assets/weapons/knife_ursus.svg
deleted file mode 100644
index 8810f74..0000000
--- a/src/assets/weapons/knife_ursus.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/knife_widowmaker.svg b/src/assets/weapons/knife_widowmaker.svg
deleted file mode 100644
index 63b58ce..0000000
--- a/src/assets/weapons/knife_widowmaker.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/m249.svg b/src/assets/weapons/m249.svg
deleted file mode 100644
index 3a896ce..0000000
--- a/src/assets/weapons/m249.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/m4a1.svg b/src/assets/weapons/m4a1.svg
deleted file mode 100644
index 2e65f85..0000000
--- a/src/assets/weapons/m4a1.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/m4a1_silencer.svg b/src/assets/weapons/m4a1_silencer.svg
deleted file mode 100644
index 99c7c47..0000000
--- a/src/assets/weapons/m4a1_silencer.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/m4a1_silencer_off.svg b/src/assets/weapons/m4a1_silencer_off.svg
deleted file mode 100644
index 99c7c47..0000000
--- a/src/assets/weapons/m4a1_silencer_off.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/mac10.svg b/src/assets/weapons/mac10.svg
deleted file mode 100644
index 4dc0010..0000000
--- a/src/assets/weapons/mac10.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/mag7.svg b/src/assets/weapons/mag7.svg
deleted file mode 100644
index bb14624..0000000
--- a/src/assets/weapons/mag7.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/molotov.svg b/src/assets/weapons/molotov.svg
deleted file mode 100644
index 4992b74..0000000
--- a/src/assets/weapons/molotov.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/mp5sd.svg b/src/assets/weapons/mp5sd.svg
deleted file mode 100644
index ee84c97..0000000
--- a/src/assets/weapons/mp5sd.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/mp7.svg b/src/assets/weapons/mp7.svg
deleted file mode 100644
index 61007ae..0000000
--- a/src/assets/weapons/mp7.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/mp9.svg b/src/assets/weapons/mp9.svg
deleted file mode 100644
index 8867588..0000000
--- a/src/assets/weapons/mp9.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/negev.svg b/src/assets/weapons/negev.svg
deleted file mode 100644
index 2ed063f..0000000
--- a/src/assets/weapons/negev.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/nova.svg b/src/assets/weapons/nova.svg
deleted file mode 100644
index 33e2027..0000000
--- a/src/assets/weapons/nova.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/out.svg b/src/assets/weapons/out.svg
deleted file mode 100644
index 1b751ad..0000000
--- a/src/assets/weapons/out.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/p250.svg b/src/assets/weapons/p250.svg
deleted file mode 100644
index a1b800e..0000000
--- a/src/assets/weapons/p250.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/p90.svg b/src/assets/weapons/p90.svg
deleted file mode 100644
index df4f762..0000000
--- a/src/assets/weapons/p90.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/revolver.svg b/src/assets/weapons/revolver.svg
deleted file mode 100644
index da0001c..0000000
--- a/src/assets/weapons/revolver.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/sawedoff.svg b/src/assets/weapons/sawedoff.svg
deleted file mode 100644
index b231ad8..0000000
--- a/src/assets/weapons/sawedoff.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/scar20.svg b/src/assets/weapons/scar20.svg
deleted file mode 100644
index 729318c..0000000
--- a/src/assets/weapons/scar20.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/sg556.svg b/src/assets/weapons/sg556.svg
deleted file mode 100644
index 1661e5a..0000000
--- a/src/assets/weapons/sg556.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/smokegrenade.svg b/src/assets/weapons/smokegrenade.svg
deleted file mode 100644
index 9d3cf58..0000000
--- a/src/assets/weapons/smokegrenade.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/src/assets/weapons/ssg08.svg b/src/assets/weapons/ssg08.svg
deleted file mode 100644
index aae9fcb..0000000
--- a/src/assets/weapons/ssg08.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/taser.svg b/src/assets/weapons/taser.svg
deleted file mode 100644
index 895fcf3..0000000
--- a/src/assets/weapons/taser.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/tec9.svg b/src/assets/weapons/tec9.svg
deleted file mode 100644
index 00a5fe4..0000000
--- a/src/assets/weapons/tec9.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/trigger_hurt.svg b/src/assets/weapons/trigger_hurt.svg
deleted file mode 100644
index dd76282..0000000
--- a/src/assets/weapons/trigger_hurt.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/ump45.svg b/src/assets/weapons/ump45.svg
deleted file mode 100644
index 0ea443a..0000000
--- a/src/assets/weapons/ump45.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/usp_silencer.svg b/src/assets/weapons/usp_silencer.svg
deleted file mode 100644
index 2e8c8cf..0000000
--- a/src/assets/weapons/usp_silencer.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/usp_silencer_off.svg b/src/assets/weapons/usp_silencer_off.svg
deleted file mode 100644
index 2e8c8cf..0000000
--- a/src/assets/weapons/usp_silencer_off.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/world.svg b/src/assets/weapons/world.svg
deleted file mode 100644
index dd76282..0000000
--- a/src/assets/weapons/world.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/assets/weapons/xm1014.svg b/src/assets/weapons/xm1014.svg
deleted file mode 100644
index 1d8aaa5..0000000
--- a/src/assets/weapons/xm1014.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/dota2gsi/index.ts b/src/dota2gsi/index.ts
deleted file mode 100644
index f3a6144..0000000
--- a/src/dota2gsi/index.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-export interface Events {
- data: (data: any) => void;
- newListener: