diff --git a/client/index.mjs b/client/index.mjs index 8f5a21a..e1f8d25 100644 --- a/client/index.mjs +++ b/client/index.mjs @@ -13,4 +13,3 @@ alt.onServer('vehicle:setInto', (newVehicle) => { native.setPedIntoVehicle(localPlayer, newVehicle.scriptID, -1) }, 300) }) - diff --git a/server/config.mjs b/server/config.mjs index b65aa48..9f2cf4f 100644 --- a/server/config.mjs +++ b/server/config.mjs @@ -8,7 +8,6 @@ export default { { socialId: '370262977' } ], skins: [ - "A_C_Boar", "A_F_M_Beach_01", "A_F_M_BevHills_01", "A_F_M_BevHills_02", diff --git a/server/modules/commands/admin.mjs b/server/modules/commands/admin.mjs index ba2e3b3..b04c813 100644 --- a/server/modules/commands/admin.mjs +++ b/server/modules/commands/admin.mjs @@ -3,6 +3,8 @@ import * as chat from 'chat' import config from '../../config.mjs' import { isPlayerAdmin } from '../helpers/helpers.mjs' +import weapons from '../../weapons.json' + chat.registerCmd('pos', player => { if (!isPlayerAdmin(player)) return chat.send(player, `{EE9A00}[SERVER]: {FF0000}Вам недоступна эта команда!`) @@ -38,4 +40,19 @@ chat.registerCmd('car', (player, args) => { } catch (error) { chat.send(player, `{EE9A00}[SERVER]: {FF0000}Машины "${args[0]}" не существует!`) } +}) + +chat.registerCmd('weapon', (player, args) => { + if (!isPlayerAdmin(player)) return chat.send(player, `{EE9A00}[SERVER]: {FF0000}Вам недоступна эта команда!`) + + if (!args || !args[0]) { + return chat.send(player, `{EE9A00}[SERVER]: {FFF}/weapon [weapon name]`); + } + + Object.keys(weapons).map(category => { + if (weapons[category].hasOwnProperty(args[0])) { + player.giveWeapon(weapons[category][args[0]], 9999, true) + return + } + }) }) \ No newline at end of file diff --git a/server/modules/commands/player.mjs b/server/modules/commands/player.mjs index 6209b41..ed262ea 100644 --- a/server/modules/commands/player.mjs +++ b/server/modules/commands/player.mjs @@ -11,6 +11,18 @@ chat.registerCmd('online', (player, args) => { return chat.send(player, `{EE9A00}[SERVER]: {FFF}Онлайн сейчас: {3232FF}${alt.Player.all.length}`) }) +chat.registerCmd('skin', (player, args) => { + if (!args || !args[0] || isNaN(args[0])) { + return chat.send(player, `{EE9A00}[SERVER]: {FFF}/skin [0 - 700]`) + } + + if (args[0] > config.skins.length - 1 || args[0] < 0) { + return chat.send(player, `{EE9A00}[SERVER]: {FFF}/skin [0 - 700]`) + } + + player.model = config.skins[parseInt(args[0])] +}) + chat.registerCmd('scid', (player, args) => { return chat.send(player, `{EE9A00}[SERVER]: {FFF}SCID: ${player.socialId}`) }) \ No newline at end of file diff --git a/server/modules/events/events.mjs b/server/modules/events/events.mjs index bdacb8d..525110b 100644 --- a/server/modules/events/events.mjs +++ b/server/modules/events/events.mjs @@ -10,6 +10,7 @@ alt.on('playerConnect', (player) => { alt.on('playerDeath', (player) => { alt.setTimeout(() => { player.spawn(config.spawn.x, config.spawn.y,config.spawn.z) + player.removeAllWeapons() }, 3000); }) diff --git a/server/weapons.json b/server/weapons.json new file mode 100644 index 0000000..8f9ff14 --- /dev/null +++ b/server/weapons.json @@ -0,0 +1,117 @@ +{ + "melee": { + "dagger": "0x92A27487", + "bat": "0x958A4A8F", + "bottle": "0xF9E6AA4B", + "crowbar": "0x84BD7BFD", + "unarmed": "0xA2719263", + "flashlight": "0x8BB05FD7", + "golfclub": "0x440E4788", + "hammer": "0x4E875F73", + "hatchet": "0xF9DCBF2D", + "knuckle": "0xD8DF3C3C", + "knife": "0x99B507EA", + "machete": "0xDD5DF8D9", + "switchblade": "0xDFE37640", + "nightstick": "0x678B81B1", + "wrench": "0x19044EE0", + "battleaxe": "0xCD274149", + "poolcue": "0x94117305", + "stone_hatchet": "0x3813FC08" + }, + "handguns": { + "pistol": "0x1B06D571", + "pistol_mk2": "0xBFE256D4", + "combatpistol": "0x5EF9FEC4", + "appistol": "0x22D8FE39", + "stungun": "0x3656C8C1", + "pistol50": "0x99AEEB3B", + "snspistol": "0xBFD21232", + "snspistol_mk2": "0x88374054", + "heavypistol": "0xD205520E", + "vintagepistol": "0x83839C4", + "flaregun": "0x47757124", + "marksmanpistol": "0xDC4DB296", + "revolver": "0xC1B3C3D1", + "revolver_mk2": "0xCB96392F", + "doubleaction": "0x97EA20B8", + "raypistol": "0xAF3696A1", + "ceramicpistol": "0x2B5EF5EC", + "navyrevolver": "0x917F6C8C" + }, + "smg": { + "microsmg": "0x13532244", + "smg": "0x2BE6766B", + "smg_mk2": "0x78A97CD0", + "assaultsmg": "0xEFE7E2DF", + "combatpdw": "0xA3D4D34", + "machinepistol": "0xDB1AA450", + "minismg": "0xBD248B55", + "raycarbine": "0x476BF155" + }, + "shotguns": { + "pumpshotgun": "0x1D073A89", + "pumpshotgun_mk2": "0x555AF99A", + "sawnoffshotgun": "0x7846A318", + "assaultshotgun": "0xE284C527", + "bullpupshotgun": "0x9D61E50F", + "musket": "0xA89CB99E", + "heavyshotgun": "0x3AABBBAA", + "dbshotgun": "0xEF951FBB", + "autoshotgun": "0x12E82D3D" + }, + "assault_rifles": { + "assaultrifle": "0xBFEFFF6D", + "assaultrifle_mk2": "0x394F415C", + "carbinerifle": "0x83BF0278", + "carbinerifle_mk2": "0xFAD1F1C9", + "advancedrifle": "0xAF113F99", + "specialcarbine": "0xC0A3098D", + "specialcarbine_mk2": "0x969C3D67", + "bullpuprifle": "0x7F229F94", + "bullpuprifle_mk2": "0x84D6FAFD", + "compactrifle": "0x624FE830" + }, + "machine_guns": { + "mg": "0x9D07F764", + "combatmg": "0x7FD62962", + "combatmg_mk2": "0xDBBD7280", + "gusenberg": "0x61012683" + }, + "sniper_rifles": { + "sniperrifle": "0x5FC3C11", + "heavysniper": "0xC472FE2", + "heavysniper_mk2": "0xA914799", + "marksmanrifle": "0xC734385A", + "marksmanrifle_mk2": "0x6A6C02E0" + }, + "heavy_weapons": { + "rpg": "0xB1CA77B1", + "grenadelauncher": "0xA284510B", + "grenadelauncher_smoke": "0x4DD2DC56", + "minigun": "0x42BF8A85", + "firework": "0x7F7497E5", + "railgun": "0x6D544C99", + "hominglauncher": "0x63AB0442", + "compactlauncher": "0x781FE4A", + "rayminigun": "0xB62D1F67" + }, + "throwables": { + "grenade": "0x93E220BD", + "bzgas": "0xA0973D5E", + "smokegrenade": "0xFDBC8A50", + "flare": "0x497FACC3", + "molotov": "0x24B17070", + "stickybomb": "0x2C3731D9", + "proxmine": "0xAB564B93", + "snowball": "0x787F0BB", + "pipebomb": "0xBA45E8B8", + "ball": "0x23C9F95C" + }, + "misc": { + "petrolcan": "0x34A67B97", + "fireextinguisher": "0x60EC506", + "parachute": "0xFBAB5776", + "hazardcan": "0xBA536372" + } +} \ No newline at end of file