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

Merge branch 'develop' into 'master'

Browse Source 
[HOTFIX] v0.0.3-h1

See merge request log-gtav/reallife-gamemode!41
This commit is contained in:
Siga
2021-04-08 00:04:05 +00:00
parent 243a2d2e0f a016a5e065
commit 818ce57b9a
5 changed files with 47 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -35,9 +35,7 @@ export default function factionInteraction(globalData: IGlobalData) {
var reviveTaskMenuMedic; var reviveTaskMenuMedic;
var insDate; var insDate;
/*mp.events.add("updateFactionBlips", (type, taskList) => { /*mp.events.add("updateFactionBlips", (type, taskList) => {
}); });
});*/ });*/
mp.events.add("showFactionInteractionLSPD", (userFactionId, isDuty, userFactionName, isFactionLeader) => { mp.events.add("showFactionInteractionLSPD", (userFactionId, isDuty, userFactionName, isFactionLeader) => {
//LSPD //LSPD
@@ -64,8 +62,6 @@ export default function factionInteraction(globalData: IGlobalData) {
TaskMenuLSPD.SetRightLabel(""); TaskMenuLSPD.SetRightLabel("");
factionInteractionMenu.AddItem(TaskMenuLSPD);*/ //weiteres factionInteractionMenu.AddItem(TaskMenuLSPD);*/ //weiteres
let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion."); let cancelItem = new UIMenuItem("Schlie\u00dfen", "Schlie\u00dft die Fraktionsinteraktion.");
cancelItem.BackColor = new Color(213, 0, 0); cancelItem.BackColor = new Color(213, 0, 0);
cancelItem.HighlightedBackColor = new Color(229, 57, 53); cancelItem.HighlightedBackColor = new Color(229, 57, 53);
@@ -108,7 +104,7 @@ export default function factionInteraction(globalData: IGlobalData) {
factionInteractionMenu.Visible = false; factionInteractionMenu.Visible = false;
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
mp.events.callRemote("CLIENT:wantedlist"); mp.events.callRemote("CLIENT:wantedlist");
break; break;
} }
}); });
@@ -172,7 +168,6 @@ export default function factionInteraction(globalData: IGlobalData) {
var wList; var wList;
mp.events.add("showWantedlist", (playersJson) => { mp.events.add("showWantedlist", (playersJson) => {
if (wantedlistBrowser !== null) { if (wantedlistBrowser !== null) {
wantedlistBrowser.destroy(); wantedlistBrowser.destroy();
wantedlistBrowser = null; wantedlistBrowser = null;
@@ -193,7 +188,6 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add("removeWantedlist", () => { mp.events.add("removeWantedlist", () => {
if (wantedlistBrowser == null) { if (wantedlistBrowser == null) {
return; return;
} }
@@ -212,7 +206,6 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
globalData.InMenu = true; globalData.InMenu = true;
var rPM = ((reviveTaskCountMedic === "0") ? "~r~" : "~g~"); var rPM = ((reviveTaskCountMedic === "0") ? "~r~" : "~g~");
var hPM = ((healTaskCountMedic === "0") ? "~r~" : "~g~"); var hPM = ((healTaskCountMedic === "0") ? "~r~" : "~g~");
var fPM = ((fireTaskCountMedic === "0") ? "~r~" : "~g~"); var fPM = ((fireTaskCountMedic === "0") ? "~r~" : "~g~");
@@ -238,7 +231,6 @@ export default function factionInteraction(globalData: IGlobalData) {
fireTaskMenuMedic.SetRightLabel(fPM + fireTaskCountMedic); fireTaskMenuMedic.SetRightLabel(fPM + fireTaskCountMedic);
factionInteractionMenu.AddItem(fireTaskMenuMedic); factionInteractionMenu.AddItem(fireTaskMenuMedic);
*/ */
} }
} }
@@ -277,9 +269,7 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
}); });
mp.events.add("showMedicTasks", (type, taskList) => { mp.events.add("showMedicTasks", (type, taskList) => {
tasks = JSON.parse(taskList); tasks = JSON.parse(taskList);
//mp.events.call("sortFactionTasks", false); //mp.events.call("sortFactionTasks", false);
@@ -316,12 +306,12 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.callRemote("updateMedicTask", 0, tasks[index].Victim); mp.events.callRemote("updateMedicTask", 0, tasks[index].Victim);
mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);
activeCheckpoint = mp.checkpoints.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, activeCheckpoint = mp.checkpoints.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0,
{ {
direction: new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 5), direction: new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 5),
color: [255, 0, 0, 150], color: [255, 0, 0, 150],
visible: true, visible: true,
dimension: 0 dimension: 0
}); });
reviveTaskMenuMedic.Close(); reviveTaskMenuMedic.Close();
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
@@ -370,12 +360,12 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.events.callRemote("updateMedicTask", 1, tasks[index].Victim); mp.events.callRemote("updateMedicTask", 1, tasks[index].Victim);
mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y); mp.game.ui.setNewWaypoint(tasks[index].Position.x, tasks[index].Position.y);
activeCheckpoint = mp.checkpoints.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0, activeCheckpoint = mp.checkpoints.new(1, new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 2), 3.0,
{ {
direction: new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 5), direction: new mp.Vector3(tasks[index].Position.x, tasks[index].Position.y, tasks[index].Position.z - 5),
color: [255, 0, 0, 150], color: [255, 0, 0, 150],
visible: true, visible: true,
dimension: 0 dimension: 0
}); });
healTaskMenuMedic.Close(); healTaskMenuMedic.Close();
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
globalData.InMenu = false; globalData.InMenu = false;
@@ -469,7 +459,7 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add("destroyMedicTaskCheckpoint", () => { mp.events.add("destroyMedicTaskCheckpoint", () => {
if (activeCheckpoint) { if (activeCheckpoint && mp.checkpoints.exists(activeCheckpoint)) {
activeCheckpoint.destroy(); activeCheckpoint.destroy();
activeCheckpoint = null; activeCheckpoint = null;
activeTask = null; activeTask = null;
@@ -486,7 +476,7 @@ export default function factionInteraction(globalData: IGlobalData) {
activeTask = null; activeTask = null;
deadRespawned = false; deadRespawned = false;
timeLeft = null; timeLeft = null;
} else if (activeTask.Type == 1){ } else if (activeTask.Type == 1) {
activeCheckpoint.destroy(); activeCheckpoint.destroy();
activeCheckpoint = null; activeCheckpoint = null;
mp.events.callRemote("delHealTaskAsMedic", activeTask.Victim); mp.events.callRemote("delHealTaskAsMedic", activeTask.Victim);
@@ -502,7 +492,6 @@ export default function factionInteraction(globalData: IGlobalData) {
}); });
mp.events.add('render', () => { mp.events.add('render', () => {
if (activeTask) { if (activeTask) {
rangeLeft = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, taskFinish.x, taskFinish.y, taskFinish.z, true).toFixed(2); rangeLeft = mp.game.gameplay.getDistanceBetweenCoords(player.position.x, player.position.y, player.position.z, taskFinish.x, taskFinish.y, taskFinish.z, true).toFixed(2);
if (rangeLeft > 1.9) { if (rangeLeft > 1.9) {

23
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -14,7 +14,6 @@ let screenRes = mp.game.graphics.getScreenResolution(0, 0);
import { getStreetName, getZoneName } from '../streetnames'; import { getStreetName, getZoneName } from '../streetnames';
export default function (globalData: IGlobalData) { export default function (globalData: IGlobalData) {
var menuClose = false; var menuClose = false;
var accountItem = new UIMenuItem("Account", "Account Informationen"); var accountItem = new UIMenuItem("Account", "Account Informationen");
@@ -44,8 +43,6 @@ export default function (globalData: IGlobalData) {
var groupRank = null; var groupRank = null;
mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, jobDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, house: boolean) => { mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, jobDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, house: boolean) => {
var accountData: AccountData = JSON.parse(accountDataJson); var accountData: AccountData = JSON.parse(accountDataJson);
var jobData: JobData = JSON.parse(jobDataJson); var jobData: JobData = JSON.parse(jobDataJson);
//var ticket_amount = JSON.parse(ticket_amountJson); //var ticket_amount = JSON.parse(ticket_amountJson);
@@ -88,10 +85,7 @@ export default function (globalData: IGlobalData) {
menu.AddItem(groupItem); menu.AddItem(groupItem);
menu.BindMenuToItem(getGroupMenu(group, menu), groupItem); menu.BindMenuToItem(getGroupMenu(group, menu), groupItem);
} }
menu.AddItem(HouseItem); menu.AddItem(HouseItem);
if (accountData.paycheck) { if (accountData.paycheck) {
var p = accountData.paycheck; var p = accountData.paycheck;
@@ -242,7 +236,7 @@ export default function (globalData: IGlobalData) {
return accountMenu; return accountMenu;
} }
function getLicenseMenu(accdata: AccountData, data: Licenses, parentMenu: NativeUI.Menu, ): NativeUI.Menu { function getLicenseMenu(accdata: AccountData, data: Licenses, parentMenu: NativeUI.Menu,): NativeUI.Menu {
var licenseMenu = new NativeUI.Menu("Lizenzen", mp.players.local.name, new Point(0, screenRes.y / 3), null, null); var licenseMenu = new NativeUI.Menu("Lizenzen", mp.players.local.name, new Point(0, screenRes.y / 3), null, null);
var menuItem = new UIMenuItem("Auto Führerschein"); var menuItem = new UIMenuItem("Auto Führerschein");
@@ -305,17 +299,14 @@ export default function (globalData: IGlobalData) {
globalData.InMenu = false; globalData.InMenu = false;
}); });
} }
}); });
return licenseMenu; return licenseMenu;
} }
function getFactionMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getFactionMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null); var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null);
factionMenu.Visible = false; factionMenu.Visible = false;
if (vehData.length > 0) { if (vehData.length > 0) {
@@ -327,7 +318,6 @@ export default function (globalData: IGlobalData) {
return factionMenu; return factionMenu;
} }
function getFactionLeaderMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getFactionLeaderMenu(faction: string, vehData: VehicleData[], stateFaction: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null); var factionMenu = new NativeUI.Menu("Fraktion", faction, new Point(0, screenRes.y / 3), null, null);
factionMenu.AddItem(new UIMenuItem("Spieler einladen")); factionMenu.AddItem(new UIMenuItem("Spieler einladen"));
@@ -340,7 +330,6 @@ export default function (globalData: IGlobalData) {
factionMenu.BindMenuToItem(getVehiclesMenu(vehData, "CLIENT:InteractionMenu_FactionVehicleInteraction", !stateFaction, parentMenu), factionVehicleItem); factionMenu.BindMenuToItem(getVehiclesMenu(vehData, "CLIENT:InteractionMenu_FactionVehicleInteraction", !stateFaction, parentMenu), factionVehicleItem);
} }
factionMenu.ItemSelect.on((item, index) => { factionMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Inviten if (index === 0) { // Inviten
globalData.InMenu = true; globalData.InMenu = true;
@@ -396,7 +385,7 @@ export default function (globalData: IGlobalData) {
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300") pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300")
break; break;
case 2: case 2:
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/MAX") pilotSkillItem.SetRightLabel("MAX")
break; break;
} }
jobMenu.AddItem(pilotSkillItem); jobMenu.AddItem(pilotSkillItem);
@@ -410,7 +399,7 @@ export default function (globalData: IGlobalData) {
busSkillItem.SetRightLabel(jobdata.busskill + "/800") busSkillItem.SetRightLabel(jobdata.busskill + "/800")
break; break;
case 3: case 3:
busSkillItem.SetRightLabel(jobdata.busskill + "/MAX") busSkillItem.SetRightLabel("MAX")
break; break;
} }
jobMenu.AddItem(busSkillItem); jobMenu.AddItem(busSkillItem);
@@ -490,7 +479,6 @@ export default function (globalData: IGlobalData) {
mp.events.callRemote("CLIENT:InteractionMenu_DeleteGroup", "Gruppe"); mp.events.callRemote("CLIENT:InteractionMenu_DeleteGroup", "Gruppe");
break; break;
} }
}); });
return groupMenu; return groupMenu;
} }
@@ -505,11 +493,9 @@ export default function (globalData: IGlobalData) {
servicesMenu.ItemSelect.on((item, index) => { servicesMenu.ItemSelect.on((item, index) => {
if (index === 0) { // Taxi if (index === 0) { // Taxi
mp.events.callRemote("CLIENT:InteractionMenu_CallService_Taxi", getStreetName(), getZoneName()); mp.events.callRemote("CLIENT:InteractionMenu_CallService_Taxi", getStreetName(), getZoneName());
} }
else if (index === 1) { // Sanitäter else if (index === 1) { // Sanitäter
mp.events.callRemote("CLIENT:InteractionMenu_CallService_Sani"); mp.events.callRemote("CLIENT:InteractionMenu_CallService_Sani");
} }
parentMenu.Close(true); parentMenu.Close(true);
}); });
@@ -551,7 +537,6 @@ export default function (globalData: IGlobalData) {
function getVehiclesMenuFaction(vehicles: VehicleData[], eventName: string, allowSell: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getVehiclesMenuFaction(vehicles: VehicleData[], eventName: string, allowSell: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var desc = "Finden"; var desc = "Finden";
var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null); var menu = new Menu("Fahrzeuge", desc, new Point(0, screenRes.y / 3), null, null);
var items: string[] = ["Finden"]; var items: string[] = ["Finden"];

8
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -16,14 +16,6 @@ namespace ReallifeGamemode.Server.Commands
{ {
internal class UserCommands : Script internal class UserCommands : Script
{ {
[Command("skill")]
public void CmdUserSkill(Player player)
{
User user = player.GetUser(new DatabaseContext());
player.SendChatMessage($"~c~BusSkill = {user.BusSkill}/800, PilotSkill = {user.PilotSkill}/300.");
}
[Command("id", "~m~Benutzung: ~s~/id [Name]")] [Command("id", "~m~Benutzung: ~s~/id [Name]")]
public void CmdUserId(Player player, String targetname) public void CmdUserId(Player player, String targetname)
{ {

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

@@ -76,15 +76,18 @@ namespace ReallifeGamemode.Server.Events
bool copNearby = NAPI.Pools.GetAllPlayers().Any(u => u.IsDuty() && u.IsAlive() && u.Position.DistanceToSquared(player.Position) <= 200 * 200); bool copNearby = NAPI.Pools.GetAllPlayers().Any(u => u.IsDuty() && u.IsAlive() && u.Position.DistanceToSquared(player.Position) <= 200 * 200);
if (copNearby) if (user.Wanteds > 0)
{ {
user.SetJailTime(true); if (copNearby)
Jail.Check_PutBehindBars(user); {
ChatService.HQMessage(user.Name + " wurde ins Gefängnis eingeliefert."); user.SetJailTime(true);
} Jail.Check_PutBehindBars(user);
else ChatService.HQMessage(user.Name + " wurde ins Gefängnis eingeliefert.");
{ }
ChatService.HQMessage(user.Name + " wurde soeben ins Krankenhaus eingeliefert."); else
{
ChatService.HQMessage(user.Name + " wurde soeben ins Krankenhaus eingeliefert.");
}
} }
if (user.JailTime <= 0) if (user.JailTime <= 0)

6
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -272,11 +272,13 @@ namespace ReallifeGamemode.Server.Gangwar
Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray(); Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray();
foreach (var o in owners) foreach (var o in owners)
{ {
o.TriggerEvent("CLIENT:loose"); if (o != null)
o.TriggerEvent("CLIENT:loose");
} }
foreach (var a in attackers) foreach (var a in attackers)
{ {
a.TriggerEvent("CLIENT:win"); if (a != null)
a.TriggerEvent("CLIENT:win");
} }
this.Owner = FactionName; this.Owner = FactionName;
ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte erfolgreich das Gebiet ~g~" + getName() + "~w~ erobern.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault()); ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte erfolgreich das Gebiet ~g~" + getName() + "~w~ erobern.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault());