diff --git a/scripts/client/server.js b/scripts/client/server.js index 11750c76..874acadc 100644 --- a/scripts/client/server.js +++ b/scripts/client/server.js @@ -71,6 +71,7 @@ function addAllNetworkHandlers() { addNetworkHandler("vrr.chatScrollLines", setChatScrollLines); addNetworkHandler("vrr.radioStream", playStreamingRadio); + addNetworkHandler("vrr.stopRadioStream", stopStreamingRadio); addNetworkHandler("vrr.radioVolume", setStreamingRadioVolume); addNetworkHandler("vrr.veh.lights", toggleVehicleLights); @@ -128,79 +129,7 @@ function onServerSpawnedPlayer(state) { logToConsole(LOG_DEBUG, `[VRR.Main] Setting spawned state to ${state}`); isSpawned = state; if(state) { - if(gta.game == GAME_GTA_III) { - gta.SET_PLAYER_NEVER_GETS_TIRED(gta.GET_PLAYER_ID(), 0); - gta.setGameStat(STAT_PROGRESSMADE, 9999); - gta.setGameStat(STAT_TOTALPROGRESSINGAME, 9999); - } - - if(gta.game == GAME_GTA_VC) { - gta.SET_PLAYER_NEVER_GETS_TIRED(gta.GET_PLAYER_ID(), 0); - gta.setGameStat(STAT_PROGRESSMADE, 9999); - gta.setGameStat(STAT_TOTALPROGRESSINGAME, 9999); - - gta.REQUEST_ANIMATION("bikev"); - gta.REQUEST_ANIMATION("bikeh"); - gta.REQUEST_ANIMATION("biked"); - gta.REQUEST_ANIMATION("knife"); - gta.REQUEST_ANIMATION("python"); - gta.REQUEST_ANIMATION("shotgun"); - gta.REQUEST_ANIMATION("buddy"); - gta.REQUEST_ANIMATION("tec"); - gta.REQUEST_ANIMATION("uzi"); - gta.REQUEST_ANIMATION("rifle"); - gta.REQUEST_ANIMATION("m60"); - gta.REQUEST_ANIMATION("sniper"); - gta.REQUEST_ANIMATION("grenade"); - gta.REQUEST_ANIMATION("flame"); - gta.REQUEST_ANIMATION("medic"); - gta.REQUEST_ANIMATION("sunbathe"); - //gta.REQUEST_ANIMATION("playidles"); - gta.REQUEST_ANIMATION("riot"); - gta.REQUEST_ANIMATION("strip"); - gta.REQUEST_ANIMATION("lance"); - gta.REQUEST_ANIMATION("skate"); - } - - if(gta.game == GAME_GTA_SA) { - gta.setGameStat(STAT_WEAPONTYPE_PISTOL_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_PISTOL_SILENCED_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_DESERT_EAGLE_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_SHOTGUN_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_SAWNOFF_SHOTGUN_SKILL, 1); - gta.setGameStat(STAT_WEAPONTYPE_SPAS12_SHOTGUN_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_MICRO_UZI_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_MP5_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_AK47_SKILL, 400); - gta.setGameStat(STAT_WEAPONTYPE_M4_SKILL, 400); - gta.setGameStat(STAT_DRIVING_SKILL, 9999); - gta.setGameStat(STAT_FAT, 0); - gta.setGameStat(STAT_ENERGY, 9999); - gta.setGameStat(STAT_CYCLE_SKILL, 9999); - gta.setGameStat(STAT_BIKE_SKILL, 9999); - gta.setGameStat(STAT_GAMBLING, 9999); - gta.setGameStat(STAT_PROGRESS_MADE, 9999); - gta.setGameStat(STAT_RESPECT, 0); - gta.setGameStat(STAT_RESPECT_TOTAL, 0); - gta.setGameStat(STAT_SEX_APPEAL, 0); - gta.setGameStat(STAT_STAMINA, 9999); - gta.setGameStat(STAT_TOTAL_PROGRESS, 100); - gta.setGameStat(STAT_UNDERWATER_STAMINA, 9999); - gta.setGameStat(STAT_BODY_MUSCLE, 0); - } - - if(getGame() == VRR_GAME_GTA_IV) { - natives.allowEmergencyServices(false); - natives.setCreateRandomCops(false); - natives.setMaxWantedLevel(0); - natives.setWantedMultiplier(0.0); - natives.allowPlayerToCarryNonMissionObjects(natives.getPlayerId(), true); - - natives.setPlayerTeam(natives.getPlayerId(), 0); - natives.usePlayerColourInsteadOfTeamColour(true); - natives.requestAnims("DANCING"); - natives.loadAllObjectsNow(); - } + setUpInitialGame } } @@ -262,6 +191,13 @@ function playStreamingRadio(url, loop, volume, element = false) { // =========================================================================== +function stopStreamingRadio() { + streamingRadio.stop(); + streamingRadio = null; +} + +// =========================================================================== + function setStreamingRadioVolume(volume) { if(streamingRadio != null) { streamingRadioVolume = volume; @@ -286,8 +222,10 @@ function setEnterPropertyKey(key) { function makePedPlayAnimation(pedId, animGroup, animId, animType, animSpeed, loop, loopNoControl, freezeLastFrame, returnToOriginalPosition) { if(getGame() < VRR_GAME_GTA_IV) { if(animType == VRR_ANIMTYPE_ADD) { + getElementFromId(pedId).position = getElementFromId(pedId).position; getElementFromId(pedId).addAnimation(animGroup, animId); } else if(animType == VRR_ANIMTYPE_BLEND) { + getElementFromId(pedId).position = getElementFromId(pedId).position; getElementFromId(pedId).blendAnimation(animGroup, animId, animSpeed); } } else { @@ -298,6 +236,17 @@ function makePedPlayAnimation(pedId, animGroup, animId, animType, animSpeed, loo // =========================================================================== +function forcePedAnimation(pedId, animGroup, animId, animType, animSpeed, loop, loopNoControl, freezeLastFrame, returnToOriginalPosition) { + if(getGame() < VRR_GAME_GTA_IV) { + forcedAnimation = [animGroup, animId]; + setLocalPlayerControlState(false, false); + getElementFromId(pedId).position = getElementFromId(pedId).position; + getElementFromId(pedId).addAnimation(animGroup, animId); + } +} + +// =========================================================================== + function hideAllGUI() { closeAllWindows(); setChatWindowEnabled(true);