17 |
20 |
29 |
30 | );
31 | }
32 |
33 | export default App;
34 |
--------------------------------------------------------------------------------
/cef/src/Effects/ExpEffect.tsx:
--------------------------------------------------------------------------------
1 | import React, { MouseEvent } from 'react'
2 | import { makeStyles } from '@material-ui/core/styles'
3 | import Typography from '@material-ui/core/Typography'
4 | import clsx from 'clsx'
5 |
6 | const useStyles = makeStyles({
7 | root: {
8 | position: 'absolute',
9 | animationDuration: '.3s',
10 | animationFillMode: 'both',
11 | textShadow: '0px 0px 5px rgba(255,190,0,1)',
12 | color: 'rgba(255,190,0,1)',
13 | }
14 | })
15 |
16 | interface ExpEffect {
17 | message?: string
18 | on?: number
19 | }
20 |
21 | const Text = (props: ExpEffect) => {
22 | const classes = useStyles()
23 | const exp = props.message || "+120 xp"
24 | const rootClass = clsx(classes.root, props.on ? 'bounceIn' : 'bounceOut')
25 |
26 | return -
26 | {props.list.map((value: string, index: number) => {
27 | const weaponName = value.replace(/weapon_/, '')
28 | const src = `/assets/weapons/${weaponName}.webp`
29 | const isDisabled = props.choice.indexOf(value) !== -1
30 | const handleClick = () => props.handleClick(value)
31 |
32 | return
-
32 | {points.map((point, index) => (
33 |
53 | {lang.get(MSG.SPECTATE_CURRENT_TEXT)}
54 |
60 | )
61 | }
--------------------------------------------------------------------------------
/cef/src/GameMenu/History/HistoryDetailWrapper.tsx:
--------------------------------------------------------------------------------
1 | import React from 'react'
2 | import { callServer } from 'rage-rpc'
3 | import { RPC } from '../../events'
4 | import { StyledButton } from '../../Theme/Dark/ButtonComponents'
5 | import ArrowBackIcon from '@material-ui/icons/ArrowBack'
6 | import HistoryDetail from './HistoryDetail'
7 |
8 | interface HistoryDetailProps {
9 | id: string
10 | onClick: (event: React.MouseEvent, id?: string) => void
11 | }
12 |
13 | /**
14 | * Player detail component
15 | * @param {HistoryDetailProps} props
16 | */
17 | export default function HistoryDetailWrapper(props: HistoryDetailProps) {
18 | const { onClick, id } = props
19 |
20 | const [matchProps, setProps] = React.useState
55 | {data.players.map((nickname, index) => (
56 | {nickname}
57 | ))}
58 |
59 |
52 | {killer.name}
53 | 
54 | {victim.name}
55 |
56 | 8 | + Added mongodb database
9 | + Rewriting repositories and models for new database
10 | + Added installing instruction to README.md in the github repository
11 | + Added in-game effects
12 | Round start notify
13 | Winning round notify
14 | Death notify
15 | Damage notify
16 | + Added refresh button to history, to player's top
17 | + Added player's top page in the gamemenu
18 | + Added detail history page
19 | + Added pagination to players, history, top players pages in the gamemenu
20 | + Updated info panel, from this moment shows current score of teams when round is not running
21 | + Updated weapon dialog design
22 | + Fix deathlog bug, when a new message erase others messages
23 | + Refactoring hud manager
24 | + Refactoring abstract class hud
25 | + Optimize setInterval calls (reduce huds' count)
26 | + Fixed isVisible method in nametag hud element (thanks to hromik)
27 | + Fixed freeze player method
28 | + Fixed round states (Added prepare state)
29 | + Fixed saving stats when a player has changed a team
30 | + Added configurable damage from config
31 | + Added autologin option
32 |
59 | {data.nickname}
60 | id: {data.id}
61 | K:{data.kill} D:{data.death} A:{data.assist}
62 |
64 | )
65 | }
--------------------------------------------------------------------------------
/clientside/src/hud/Hud.ts:
--------------------------------------------------------------------------------
1 | import { DummyConfigManager, DummyLanguageManager, DialogManager } from "../managers"
2 | import { ErrorHandler } from "../core/ErrorHandler"
3 | import { Tickable } from "../utils/Tickable"
4 |
5 | /**
6 | * Base class of a hud element
7 | */
8 | abstract class Hud extends Tickable implements INTERFACES.HudElement {
9 | protected _textParams?: INTERFACES.TextParams
10 |
11 | constructor(
12 | readonly dummyConfig: DummyConfigManager,
13 | readonly lang: DummyLanguageManager,
14 | readonly errHandler: ErrorHandler,
15 | ) {
16 | super(errHandler)
17 |
18 | this.render = this.render.bind(this)
19 |
20 | mp.events.add(SHARED.EVENTS.CLIENT_DUMMIES_READY, () => this.prepare())
21 | }
22 |
23 | /**
24 | * Event
25 | *
26 | * Fires when all dummies has registered and hud element has created
27 | */
28 | protected prepare() {}
29 |
30 | /**
31 | * @inheritdoc
32 | */
33 | abstract start(...args: any[]): void
34 |
35 | /**
36 | * @inheritdoc
37 | */
38 | abstract stop(...args: any[]): void
39 |
40 | /**
41 | * Render a hud element
42 | */
43 | render(...args: any[]): void {}
44 |
45 | /**
46 | * Get default text params for the function mp.game.graphics.drawText
47 | */
48 | get textParams(): INTERFACES.TextParams {
49 | if (!this._textParams) {
50 | const { TEXT: { FONT, CENTRE, COLOR, SCALE, OUTLINE } } = this.dummyConfig.getGlobalHudConfig()
51 |
52 | this._textParams = {
53 | font: FONT,
54 | centre: CENTRE,
55 | color: COLOR || [255, 255, 255, 255],
56 | scale: SCALE,
57 | outline: OUTLINE,
58 | }
59 | }
60 |
61 | return this._textParams
62 | }
63 | }
64 |
65 | export { Hud }
--------------------------------------------------------------------------------
/serverside/src/managers/DbManager.ts:
--------------------------------------------------------------------------------
1 | import { singleton, injectable, container } from "tsyringe"
2 | import { Config } from "../core/Config"
3 | import { statSync } from "fs"
4 | import { resolve } from 'path'
5 | import { createConnection, Connection } from 'typeorm'
6 | import { ErrorHandler } from "../core/ErrorHandler"
7 | import { logMethod } from "../utils"
8 | import { DEBUG } from "../bootstrap"
9 |
10 | /**
11 | * Class to manage database connection
12 | */
13 | @singleton()
14 | @injectable()
15 | class DbManager implements INTERFACES.Manager {
16 | constructor(
17 | readonly config: Config,
18 | readonly errHandler: ErrorHandler,
19 | ) {}
20 |
21 | /**
22 | * Load the database
23 | */
24 | @logMethod(DEBUG)
25 | async load(): Promise8 | + Moved lang from clientside to serverside
9 | Now available adding new language(s) without build gamemode.
10 | Just create a file in the lang folder calls e.g. "custom.json" and set up config with the new language "custom"
11 | + HUD for team selecting (params are editable in config)
12 | + HUD for vote map (params are editable in config)
13 | + HUD for Nametag with team color (params are editable in config)
14 | + HUD for round info panel
15 | + HUD for any notify messages
16 | + Text chat
17 | + Added RCON password in config.json
18 | You should change rcon password otherwise you will have an error
19 | + Add groups system [USER, MODERATORS, ADMIN, ROOT]
20 | Commands:
21 | /g rcon [password] - grant super privileges
22 | /g login [password] - login as admin or moderator
23 | /g addadm [id] [password] - (root only) add a new admin by id
24 | /g addmod [id] [password] - (root and admin) add a new moderator by id
25 | /g pwd [password] - change a password for login
26 | /g user [id] - set a user group for player by id
27 | + Added admin/root access to commands:
28 | /roundstart
29 | /roundend
30 | + Fixed cmdlist command
31 | + Refactoring some parts of code in clientside, serverside
32 | + Added kick command
33 | /kick [idOrName] [reason] (root and admin and moderator only) - Kick player by reason
34 | + Added mute command (root and admin and moderator only) - Mute player by reason
35 | /mute [idOrName] [minutes] [reason]
36 | + Added unmute command (root and admin and moderator only) - Unmute player
37 | /unmute [idOrName]
38 |
10 | Open [http://localhost:3000](http://localhost:3000) to view it in the browser. 11 | 12 | The page will reload if you make edits.
13 | You will also see any lint errors in the console. 14 | 15 | ### `yarn test` 16 | 17 | Launches the test runner in the interactive watch mode.
18 | See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. 19 | 20 | ### `yarn build` 21 | 22 | Builds the app for production to the `build` folder.
23 | It correctly bundles React in production mode and optimizes the build for the best performance. 24 | 25 | The build is minified and the filenames include the hashes.
26 | Your app is ready to be deployed! 27 | 28 | See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. 29 | 30 | ### `yarn eject` 31 | 32 | **Note: this is a one-way operation. Once you `eject`, you can’t go back!** 33 | 34 | If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. 35 | 36 | Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. 37 | 38 | You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. 39 | 40 | ## Learn More 41 | 42 | You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). 43 | 44 | To learn React, check out the [React documentation](https://reactjs.org/). 45 | -------------------------------------------------------------------------------- /cef/src/MapEditor/SpawnVectorList.tsx: -------------------------------------------------------------------------------- 1 | import React from 'react' 2 | import List from '@material-ui/core/List' 3 | import ListItem from '@material-ui/core/ListItem' 4 | import ListItemText from '@material-ui/core/ListItemText' 5 | import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction' 6 | import IconButton from '@material-ui/core/IconButton' 7 | import DeleteIcon from '@material-ui/icons/Delete' 8 | import { callClient } from 'rage-rpc' 9 | import { RPC_DIALOG } from '../events' 10 | import { SpawnVector } from './MapEditor' 11 | 12 | interface Props { 13 | className: string 14 | disabled: boolean 15 | points: SpawnVector 16 | } 17 | /** 18 | * SpawnVector list component 19 | * @param {Props} props 20 | */ 21 | export default function SpawnVectorList(props: Props) { 22 | const { className, disabled, points: { 23 | ATTACKERS, 24 | DEFENDERS, 25 | } } = props 26 | 27 | if (!ATTACKERS.length && !DEFENDERS.length) return <> 28 | 29 | const removePointRequest = (team: 'ATTACKERS' | 'DEFENDERS', index: number) => { 30 | callClient(RPC_DIALOG.CEF_MAP_EDITOR_REMOVE_SPAWN_POINT, [team, index]) 31 | } 32 | 33 | return ( 34 |
-
35 | {ATTACKERS.map((point, index) => (
36 |
8 | + Fixed bug when round timer was not being synced with client/server
9 | + Added Controls hud element
10 | + Added Gamemode hud element
11 | + Added Deathlog hud element
12 | + Added round pause and unpause commands:
13 | /pause - Pause a round when the round is running
14 | /unpause - Unpause a round when the round is running
15 | + Added change team command:
16 | /ct [id|nickname] [att|def|spec] - Change a team by player id/nickname, alias /changeteam
17 | + Added add/remove in/from a round:
18 | /add [id|nickname] - Add a player to the round
19 | /remove [id|nickname] - Remove a player from the round
20 | + Added Gamemenu tabs:
21 | 1. Profile tab - a tab with profile information of player
22 | 2. Players tab - a tab with list of current players (clickable to a player to get a profile)
23 | 3. History tab - a tab with history of matches (at this moment not clickable, soon)
24 | 4. Vote tab - a tab with voting for the map
25 | 5. Top tab - a tab with top of players, sorted by mmr (at this moment no finished, soon)
26 | 6. Credits tab - a tab with information about gamemode author, changelog
27 | Gamemenu available by F2 button
28 | + Rework round players' statistic, moved from round players teamId to sharedData
29 | Breaking changes: round stats now saved with another json object which looks like:
30 | winner, created_at, ATTACKERS: [], DEFENDERS: []
31 | + Fixed teamId state in Scoreboard tab
32 | + Fixed changelang description
33 | + Fixed error on client when round is running stats has been saving
34 | + Fixed assist calculation on clientside
35 | + Fixed bug with checking state of a player (typeof undefined)
36 | + Added player join/quit notifications in chat
37 | + Fixed vote bug, when player has voted but at finished time round has not started
38 |
36 |
37 | 0.5.0 changes
41 |
42 |
43 |
45 |
46 |
47 | 0.4.0 changes
51 |
52 |
53 |
55 |
56 |
57 | 0.3.0 changes
61 |
62 |
63 |
65 |
66 |
67 | 0.2.0 changes
71 |
72 |
73 |
75 |
76 |
77 | )
78 | }
--------------------------------------------------------------------------------
/serverside/src/managers/dummies/DummyLanguageManager.ts:
--------------------------------------------------------------------------------
1 | import { resolve } from "path"
2 | import { sync } from 'glob'
3 | import { getProjectDir, getJsonFromFileSync } from "../../utils"
4 | import { Dummy } from "../../entities/Dummy"
5 | import { IsNotExistsError } from "../../errors/LogErrors"
6 | import { format } from "util"
7 | import { singleton } from "tsyringe"
8 |
9 | /**
10 | * Class to manage languages
11 | */
12 | @singleton()
13 | class DummyLanguageManager implements INTERFACES.Manager {
14 | static readonly LANGUAGE_FOLDER = resolve(getProjectDir(), 'lang')
15 |
16 | private _dummy?: Dummy
87 | {maps.map((mapProps, index) => (
88 |
91 |
100 | {controls.map(({ input, label, disabled }, index) => (
101 |
107 | )
108 | }
--------------------------------------------------------------------------------
/serverside/src/managers/WeaponManager.ts:
--------------------------------------------------------------------------------
1 | import { app } from "../bootstrap"
2 | import { singleton, inject, injectable, delay } from "tsyringe"
3 | import { Config } from "../core/Config"
4 | import { NotFoundNotifyError } from "../errors/PlayerErrors"
5 |
6 | /**
7 | * Class to manage the weapons
8 | */
9 | @injectable()
10 | @singleton()
11 | class WeaponManager {
12 | static readonly MAX_AMMO: number = app.getConfig().get('MAX_AMMO') || 1000
13 | static readonly MAX_WEAPON_SLOTS: number = app.getConfig().get('MAX_WEAPON_SLOTS') || 3
14 |
15 | private weapons: any
16 | private weaponsSetCategories: string[][]
17 | public readonly weaponSet: string[][]
18 |
19 | constructor(@inject(Config) readonly config: Config) {
20 |
21 | this.weaponRequest = this.weaponRequest.bind(this)
22 |
23 | this.weapons = this.config.get("WEAPONS")
24 | this.weaponsSetCategories = this.config.get('WEAPONS_SET')
25 | this.weaponSet = this.getWeaponSet()
26 | }
27 |
28 | /**
29 | * Rpc call
30 | *
31 | * Fires when the player has made the choice
32 | * @param {string[]} choice
33 | * @param {rpc.ProcedureListenerInfo} param1
34 | */
35 | weaponRequest(choice: string[], { player }: rpc.ProcedureListenerInfo): void {
36 | if (this.isCorrectChoice(choice)) {
37 | this.giveWeapons(player as PlayerMp, choice)
38 | } else {
39 | throw new NotFoundNotifyError(SHARED.MSG.ERR_WEAPON_NOT_FOUND, player as PlayerMp)
40 | }
41 | }
42 |
43 | /**
44 | * Give the weapons to the player
45 | * @param {PlayerMp} player
46 | * @param {string[]} choice - array of weapon hashes
47 | */
48 | giveWeapons(player: PlayerMp, choice: string[]) : void {
49 | player.removeAllWeapons()
50 | choice.forEach(hash => player.giveWeapon(mp.joaat(hash), WeaponManager.MAX_AMMO))
51 | }
52 |
53 | /**
54 | * Check if the choice is correct
55 | * @param {string[]} choice - array of weapon hashes
56 | */
57 | isCorrectChoice(choice: string[]) : boolean {
58 | const list = this.getList()
59 |
60 | return choice.length <= WeaponManager.MAX_WEAPON_SLOTS && choice.every(hash => list.indexOf(hash) !== -1)
61 | }
62 |
63 | /**
64 | * Get weapon list from the config
65 | */
66 | getList(): string[] {
67 | return Object
68 | .entries(this.weapons)
69 | .reduce((carry, currentValue) => {
70 | const [_, weapons]: [any, any] = currentValue
71 |
72 | return [...carry, ...weapons] as any
73 | }, [])
74 | }
75 |
76 | /**
77 | * Set the weapon list
78 | */
79 | private getWeaponSet(): string[][] {
80 | const weaponSet: string[][] = []
81 |
82 | if (Array.isArray(this.weaponsSetCategories) && typeof this.weapons === 'object') {
83 | this.weaponsSetCategories.forEach((packs, index) => {
84 | if (weaponSet[index] === undefined) weaponSet[index] = []
85 | packs.forEach(pack => {
86 | if (Array.isArray(this.weapons[pack])) weaponSet[index] = [...weaponSet[index], ...this.weapons[pack]]
87 | })
88 | })
89 | }
90 |
91 | return weaponSet
92 | }
93 | }
94 |
95 | export { WeaponManager }
--------------------------------------------------------------------------------
/cef/src/MapEditor/MapEditor.tsx:
--------------------------------------------------------------------------------
1 | import React from 'react'
2 | import { makeStyles } from '@material-ui/core/styles'
3 | import Paper from '@material-ui/core/Paper'
4 | import Grid from '@material-ui/core/Grid'
5 | import Header from './Header'
6 | import Body from './Body'
7 | import Footer from './Footer'
8 | import { register, callClient } from 'rage-rpc'
9 | import { RPC_DIALOG } from '../events'
10 |
11 | const useStyles = makeStyles({
12 | root: {
13 | borderTop: '10px solid black',
14 | position: 'absolute',
15 | right: '5vmin',
16 | flexGrow: 1,
17 | padding: 15,
18 | maxWidth: 460,
19 | background: 'rgba(255 255 255 / 75%)',
20 | '&:focus': {
21 | outline: 'none',
22 | },
23 | },
24 | header: {
25 | fontWeight: 600,
26 | fontSize: 24,
27 | textDecoration: 'underline',
28 | textDecorationStyle: 'dotted',
29 | textDecorationColor: 'crimson',
30 | },
31 | title: {
32 | marginTop: 15,
33 | },
34 | list: {
35 | maxHeight: 100,
36 | overflow: 'auto',
37 | }
38 | })
39 |
40 | export interface Point {
41 | name: string
42 | coord: any
43 | }
44 | export type SpawnVector = {
45 | 'ATTACKERS': Point[]
46 | 'DEFENDERS': Point[]
47 | }
48 |
49 | export interface MapEditorState {
50 | open: boolean
51 | editing: boolean
52 | path: Point[]
53 | spawn: SpawnVector
54 | team: 'ATTACKERS' | 'DEFENDERS'
55 | mapName: string
56 | focus: boolean
57 | }
58 |
59 | export const initialMapEditorState: MapEditorState = {
60 | open: false,
61 | editing: false,
62 | path: [],
63 | spawn: {
64 | 'ATTACKERS': [],
65 | 'DEFENDERS': [],
66 | },
67 | team: 'ATTACKERS',
68 | mapName: '',
69 | focus: false,
70 | }
71 |
72 | /**
73 | * The map editor form
74 | */
75 | export default function MapEditor() {
76 | const [render, setRender] = React.useState(false)
77 | const [state, setState] = React.useState
102 | {input && renderInputs(input, classes.span)}
103 | {label && {lang.get(label)} }
104 |
105 | ))}
106 |