diff --git a/ReallifeGamemode.Client/util/freeze.ts b/ReallifeGamemode.Client/util/freeze.ts index 4b654bfb..4d8f6b2f 100644 --- a/ReallifeGamemode.Client/util/freeze.ts +++ b/ReallifeGamemode.Client/util/freeze.ts @@ -28,5 +28,335 @@ player.vehicle.freezePosition(false); player.freezePosition(false); }); + var ped + mp.events.add("CLIENT:AddPed", (model, positionx, positiony, positionz, heading, dimension) => { + if (model < 1) { + return; + } + if (model == 1) { + ped = mp.peds.new( + mp.game.joaat('a_c_chickenhawk'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 2) { + ped = mp.peds.new( + mp.game.joaat('a_c_boar'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 3) { + ped = mp.peds.new( + mp.game.joaat('cs_bradcadaver'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 4) { + ped = mp.peds.new( + mp.game.joaat('a_c_cat_01'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 5) { + ped = mp.peds.new( + mp.game.joaat('a_c_chimp'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 6) { + ped = mp.peds.new( + mp.game.joaat('a_c_chop'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 7) { + ped = mp.peds.new( + mp.game.joaat('a_c_cormorant'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 8) { + ped = mp.peds.new( + mp.game.joaat('a_c_cow'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 9) { + ped = mp.peds.new( + mp.game.joaat('a_c_coyote'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 10) { + ped = mp.peds.new( + mp.game.joaat('a_c_crow'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 11) { + ped = mp.peds.new( + mp.game.joaat('a_c_deer'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 12) { + ped = mp.peds.new( + mp.game.joaat('a_c_dolphin'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 13) { + ped = mp.peds.new( + mp.game.joaat('a_c_fish'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 14) { + ped = mp.peds.new( + mp.game.joaat('a_c_sharkhammer'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 15) { + ped = mp.peds.new( + mp.game.joaat('a_c_humpback'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 16) { + ped = mp.peds.new( + mp.game.joaat('a_c_husky'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 17) { + ped = mp.peds.new( + mp.game.joaat('ig_johnnyklebitz'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 18) { + ped = mp.peds.new( + mp.game.joaat('a_c_killerwhale'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 19) { + ped = mp.peds.new( + mp.game.joaat('mp_m_marston_01'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 20) { + ped = mp.peds.new( + mp.game.joaat('a_c_mtlion'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 21) { + ped = mp.peds.new( + mp.game.joaat('s_m_m_movalien_01'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 22) { + ped = mp.peds.new( + mp.game.joaat('mp_m_niko_01'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 23) { + ped = mp.peds.new( + mp.game.joaat('a_c_pig'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 24) { + ped = mp.peds.new( + mp.game.joaat('a_c_pigeon'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 25) { + ped = mp.peds.new( + mp.game.joaat('a_c_poodle'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 26) { + ped = mp.peds.new( + mp.game.joaat('a_c_pug'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 27) { + ped = mp.peds.new( + mp.game.joaat('a_c_rabbit_01'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 28) { + ped = mp.peds.new( + mp.game.joaat('a_c_rat'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 29) { + ped = mp.peds.new( + mp.game.joaat('a_c_retriever'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 30) { + ped = mp.peds.new( + mp.game.joaat('a_c_rhesus'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 31) { + ped = mp.peds.new( + mp.game.joaat('a_c_rottweiler'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 32) { + ped = mp.peds.new( + mp.game.joaat('a_c_seagull'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 33) { + ped = mp.peds.new( + mp.game.joaat('a_c_shepherd'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 34) { + ped = mp.peds.new( + mp.game.joaat('a_c_stingray'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 35) { + ped = mp.peds.new( + mp.game.joaat('a_c_sharktiger'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 36) { + ped = mp.peds.new( + mp.game.joaat('a_c_westy'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 37) { + ped = mp.peds.new( + mp.game.joaat('ig_barry'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 38) { + ped = mp.peds.new( + mp.game.joaat('cs_barry'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 39) { + ped = mp.peds.new( + mp.game.joaat('ig_bankman'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + if (model == 40) { + ped = mp.peds.new( + mp.game.joaat('cs_bankman'), + new mp.Vector3(positionx, positiony, positionz), + heading, + dimension + ); + } + //ped.setAlpha(255); + ped.freezePosition(false); + ped.setInvincible(false); + ped.setProofs(false, false, false, false, false, false, false, false); + }); } diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 79c3bd15..21d5ef36 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -851,6 +851,16 @@ namespace ReallifeGamemode.Server.Commands } } + [Command("addped", "~m~Benutzung: ~s~/addped [model] [dimension]")] + public void CmdAdminSetSkill(Player player, int model, int dimension = 0) + { + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) + { + ChatService.NotAuthorized(player); + return; + } + player.TriggerEvent("CLIENT:AddPed", model, player.Position.X, player.Position.Y, player.Position.Z, player.Heading, dimension); + } [Command("setskill", "~m~Benutzung: ~s~/setskill [Playerid] [Bus/Pilot] [Menge]")] public void CmdAdminSetSkill(Player player, string name, string Skill, int SkillLevel) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 6b609588..77aa7f41 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -9,7 +9,6 @@ using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Managers; -using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; using ReallifeGamemode.Server.Services;