aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalize Surgery

Browse Source
This commit is contained in:
VegaZ
2021-05-03 21:33:56 +02:00
parent 19f0810918 a6e7afd0ba
commit 442903a091
81 changed files with 3654 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReallifeGamemode.Server/Events/Connect.cs
View File

@@ -77,6 +77,13 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("CLIENT:AddPed", 2, "player_two", 1706.76953125, 3277.220947265625, 41.1555061340332, -159.447998046875, 0, false, true, 0, "none", true, true, true);//Ped_Pilot Sandyshores
player.TriggerEvent("CLIENT:AddPed", 3, "s_m_m_pilot_01", -1621.4542236328125, -3152.724365234375, 13.991769790649414, 50.73009490966797, 0, false, true, 0, "none", true, true, true);//Ped_Pilot LS Airport
player.TriggerEvent("CLIENT:AddPed", 4, "u_m_o_finguru_01", -534.4425659179688, -2145.747314453125, 5.992100715637207, 53.96156692504883, 0, false, true, 0, "none", true, true, true);//Ped Busfahrer
player.TriggerEvent("CLIENT:AddPed", 5, "csb_prolsec", 1690.84, 2591.17 , 45.91, -2.66, 0, false, true, 0, "none", true, true, true);//Ped Knast
player.TriggerEvent("CLIENT:AddPed", 6, "ig_siemonyetarian", -1023.1589, -2693.6948, 13.98, 173.95613, 0, false, true, 0, "none", true, true, true);//Ped Rentcar NoobSpawn
player.TriggerEvent("CLIENT:AddPed", 7, "ig_siemonyetarian", -369.1589, -230.92816, 36.028805, 150.26433, 0, false, true, 0, "none", true, true, true);//Ped Rentcar KH/Stadthalle
player.TriggerEvent("CLIENT:AddPed", 8, "ig_siemonyetarian", 1222.0868, 2726.5286, 38.00415, 113.77263, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Knast
player.TriggerEvent("CLIENT:AddPed", 9, "ig_siemonyetarian", -215.4218292236328, 6218.90478515625, 31.491567611694336, -135.07437133789062, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Paleto
player.TriggerEvent("CLIENT:AddPed", 10, "ig_siemonyetarian", 818.239990234375, -1040.833984375, 26.750696182250977, 3.0542829036712646, 0, false, true, 0, "none", true, true, true);//Ped Rentcar Lamesa
TimeSpan currentTime = TimeManager.CurrentTime;
bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo;

5
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -79,6 +79,7 @@ namespace ReallifeGamemode.Server.Events
var playerInGangwar = player.HasData("inGangWar");
var killerInGangwar = killer.HasData("inGangWar");
NAPI.Util.ConsoleOutput($"OnPlayerDeath - Player {player.Name} died - PlayerInGangwar = {playerInGangwar}, KillerInGangwar = {killerInGangwar}");
if (playerInGangwar && killerInGangwar)
{
@@ -148,7 +149,7 @@ namespace ReallifeGamemode.Server.Events
if (copNearby)
{
user.SetJailTime(true, dbContext);
Jail.Check_PutBehindBars(user);
Jail.Check_PutBehindBars(user, JailInLocations.InCell);
ChatService.HQMessage(user.Name + " wurde ins Gefängnis eingeliefert.");
}
else
@@ -163,7 +164,7 @@ namespace ReallifeGamemode.Server.Events
{
user.Dead = true;
if (!player.HasData("reviveSperre") && player.GetData<bool>("isDead") == false && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false)
if (user.Wanteds == 0 && !player.HasData("reviveSperre") && player.GetData<bool>("isDead") == false && !player.HasData("inGangWar") && player.GetData<bool>("SAdminduty") == false)
{
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()

5
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -127,6 +127,11 @@ namespace ReallifeGamemode.Server.Events
}
}
if (Rentcar.mapPlayerRentcarBill.ContainsKey(player.Name))
{
Rentcar.cancelRent(player);
}
//Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
if (job != null)

91
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
@@ -34,7 +35,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:NUM2")]
public void KeyPressNUM2(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
if (player.GetData<bool>("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true)
{
var saveMode = player.GetData<string>("quicksavemode");
@@ -91,7 +92,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:RIGHT_ARROW")]
public void KeyPressRightArrow(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
User user = player.GetUser();
if (!player.IsDuty())
@@ -116,10 +117,10 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:M")]
public void KeyPressM(Player player)
{
if (!player.IsLoggedIn()) return;
using var dbContext = new DatabaseContext();
User u = player.GetUser(dbContext);
if (u == null) return;
if (player.GetData<bool>("isDead")) return;
var vehicles = dbContext.UserVehicles.Where(veh => veh.UserId == u.Id).OrderBy(veh => veh.Id).Select(v => new
{
@@ -135,7 +136,6 @@ namespace ReallifeGamemode.Server.Events
Price = f.BuyPrice
});
Paycheck paycheck = null;
if (Economy.Paychecks.ContainsKey(u.Id)) paycheck = Economy.Paychecks[u.Id];
@@ -189,6 +189,7 @@ namespace ReallifeGamemode.Server.Events
int ticket_amount = 0;
int pay_amount = 0;
bool house = false;
bool hasRentcar = player.GetData<bool>("hasRentcar") == true;
if (u.House != null)
{
@@ -204,13 +205,14 @@ namespace ReallifeGamemode.Server.Events
{
pay_amount = player.GetData<int>("pay_amount");
}
player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), factionleader, JsonConvert.SerializeObject(memberList), JsonConvert.SerializeObject(jobData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount, pay_amount, house);
player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), factionleader, JsonConvert.SerializeObject(memberList), JsonConvert.SerializeObject(jobData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount, pay_amount, JsonConvert.SerializeObject(hasRentcar), house);
}
[RemoteEvent("keyPress:E")]
public void KeyPressE(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead") || player.IsInVehicle) return;
var user = player.GetUser();
if (player.HasData("nearATM"))
@@ -219,12 +221,9 @@ namespace ReallifeGamemode.Server.Events
return;
}
if (!player.IsInVehicle)
if (GroundItem.PickUpGroundItem(player))
{
if (GroundItem.PickUpGroundItem(player))
{
return;
}
return;
}
DutyPoint nearestDuty = PositionManager.DutyPoints.Find(d => d.Position.DistanceTo(player.Position) <= 1.5 && d.FactionId == user.FactionId);
@@ -237,6 +236,7 @@ namespace ReallifeGamemode.Server.Events
JobPoint nearestJobPoint = PositionManager.JobPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.6);
Player nearestCuffPlayer = PositionManager.cuffPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.6 && user.GetData<bool>("duty"));
AmmunationPoint nearestAmmunationPoint = PositionManager.AmmunationPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5);
RentcarPoint nearestRentcarPoint = PositionManager.rentcarPoints.Find(s => s.Position.DistanceTo(player.Position) <= 1.5);
if (user?.FactionId != null)
{
@@ -355,6 +355,41 @@ namespace ReallifeGamemode.Server.Events
user.SetBlipAndNametagColor();
}
//Rentcar Points
if (nearestRentcarPoint != null)
{
if (player.IsInVehicle)
{
return;
}
//Noobspawn
if (player.Position.DistanceTo(PositionManager.rentcarPoints[0].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.noobspawnVehicleProperties), "noobspawn");
}
//Stadthalle
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[1].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.stadthalleVehicleProperties), "stadthalle");
}
//Knast
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[2].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.knastVehicleProperties), "knast");
}
//Paleto
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[3].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "paleto");
}
//Lamesa
else if (player.Position.DistanceTo(PositionManager.rentcarPoints[4].Position) <= 1.5)
{
player.TriggerEvent("showRentcarMenu", JsonConvert.SerializeObject(Rentcar.paletoVehicleProperties), "lamesa");
}
}
if (nearestWeapon != null) // Weapon Point
{
List<string> primarys = new List<string>();
@@ -466,9 +501,7 @@ namespace ReallifeGamemode.Server.Events
});
}
player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), JsonConvert.SerializeObject(amountInfos));
}
}
if (nearestJailReleasePoint != null)
@@ -558,7 +591,8 @@ namespace ReallifeGamemode.Server.Events
ChatService.ErrorMessage(player, "Du benötigst $15.000 auf dem Bankkonto um die Operation durchzuführen");
return;
}
ChatService.SendMessage(player, "~r~ACHTUNG! Dadurch wird dein alter Charakter gelöscht. Du kannst dir hiermit einen neuen erstellen.\nBeim Wechsel des Geschlechts verlierst du ebenfalls deine gekaufte Kleidung");
ChatService.SendMessage(player, "~r~ACHTUNG! Dadurch wird dein alter Charakter gelöscht. Du kannst dir hiermit einen neuen erstellen.");
ChatService.SendMessage(player, "Beim Wechsel des Geschlechts verlierst du ebenfalls deine gekaufte Kleidung");
if (freeSurgery == true)
{
ChatService.SendMessage(player, "Du kannst deinen Charakter dieses mal kostenlos erstellen");
@@ -567,8 +601,15 @@ namespace ReallifeGamemode.Server.Events
{
ChatService.SendMessage(player, "Die Änderung des Charakters kostet ~g~$15.000");
}
ChatService.SendMessage(player, "Du kannst die Charaktererstellung wieder verlassen und behältst deinen alten Charakter! Bitte starte mit ~g~J");
ChatService.SendMessage(player, "Du kannst die Charaktererstellung wieder verlassen und behältst deinen alten Charakter!");
ChatService.SendMessage(player, "Bitte starte mit ~g~J");
player.SetData<bool>("charSurgery", true);
NAPI.Task.Run(() =>
{
if (player.GetData<bool>("charSurgery") == true) player.ResetData("charSurgery");
player.SendNotification("~r~Chirurg-Angebot abgebrochen.");
}, 30000);
}
if (user.FactionLeader)
{
@@ -628,7 +669,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:I")]
public void KeyPressI(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
if (player.GetData<bool>("isDead")) return;
player.TriggerEvent("inventoryShow");
@@ -638,7 +679,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:J")]
public void KeyPressJ(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
if (player.GetData<bool>("healDecision") == true)
{
player.ResetData("healDecision");
@@ -646,18 +687,18 @@ namespace ReallifeGamemode.Server.Events
return;
}
if(player.GetData<bool>("SellVehicleDecision") == true && player.HasData("VehicleToSell"))
if (player.GetData<bool>("SellVehicleDecision") == true && player.HasData("VehicleToSell"))
{
InteractionManager.SellServerVehicle(player, player.GetData<int>("VehicleToSell"));
player.ResetData("SellVehicleDecision");
player.ResetData("VehicleToSell");
player.ResetData("VehicleToSell");
return;
}
if(player.GetData<bool>("charSurgery") == true)
{
CharacterCreator.StartSurgery(player);
player.ResetData("charSurgery");
player.SetData("charSurgery",false);
}
User u = player.GetUser();
@@ -740,7 +781,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:K")]
public void KeyPressK(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
var user = player.GetUser();
if (user == null)
{
@@ -800,14 +841,14 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("keyPress:L")]
public void KeyPressL(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
DoorManager.ChangeDoorState(player);
}
[RemoteEvent("keyPress:N")]
public void KeyPressN(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
if (player.GetData<bool>("healDecision") == true)
{
@@ -898,10 +939,10 @@ namespace ReallifeGamemode.Server.Events
VehicleStreaming.SetEngineState(v, !state);
}
[RemoteEvent("keyPress:X")]
[RemoteEvent("keyPress:Z")]
public void KeyPressX(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsLoggedIn() || player.GetData<bool>("isDead")) return;
if (!player.IsInVehicle)
{

8
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
@@ -82,6 +82,7 @@ namespace ReallifeGamemode.Server.Events
player.SetData("Adminduty", false);
player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0);
player.TriggerEvent("headshotoff");
player.SetData("togdeath", true);
Gangwar.Gangwar.loadPlayer(player);
if (user.FactionLeader)
{
@@ -164,7 +165,7 @@ namespace ReallifeGamemode.Server.Events
}
else
{
Jail.Check_PutBehindBars(user);
Jail.Check_PutBehindBars(user, JailInLocations.InCell);
}
player.Dimension = 0;
@@ -183,6 +184,9 @@ namespace ReallifeGamemode.Server.Events
}
}
player.TriggerEvent("loadInventoryCEF");
player.TriggerEvent("loadPlayerListCEF");
player.TriggerEvent("draw", player.Name, player.Handle.Value);
NAPI.Task.Run(() =>
{