").append(m.parseHTML(a)).find(d) : a)
+ }).complete(c && function (a, b) {
+ g.each(c, e || [a.responseText, b, a])
+ }), this
+ }, m.each(["ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend"], function (a, b) {
+ m.fn[b] = function (a) {
+ return this.on(b, a)
+ }
+ }), m.expr.filters.animated = function (a) {
+ return m.grep(m.timers, function (b) {
+ return a === b.elem
+ }).length
+ };
+ var cc = a.document.documentElement;
+
+ function dc(a) {
+ return m.isWindow(a) ? a : 9 === a.nodeType ? a.defaultView || a.parentWindow : !1
+ }
+ m.offset = {
+ setOffset: function (a, b, c) {
+ var d, e, f, g, h, i, j, k = m.css(a, "position"),
+ l = m(a),
+ n = {};
+ "static" === k && (a.style.position = "relative"), h = l.offset(), f = m.css(a, "top"), i = m.css(a, "left"), j = ("absolute" === k || "fixed" === k) && m.inArray("auto", [f, i]) > -1, j ? (d = l.position(), g = d.top, e = d.left) : (g = parseFloat(f) || 0, e = parseFloat(i) || 0), m.isFunction(b) && (b = b.call(a, c, h)), null != b.top && (n.top = b.top - h.top + g), null != b.left && (n.left = b.left - h.left + e), "using" in b ? b.using.call(a, n) : l.css(n)
+ }
+ }, m.fn.extend({
+ offset: function (a) {
+ if (arguments.length) return void 0 === a ? this : this.each(function (b) {
+ m.offset.setOffset(this, a, b)
+ });
+ var b, c, d = {
+ top: 0,
+ left: 0
+ },
+ e = this[0],
+ f = e && e.ownerDocument;
+ if (f) return b = f.documentElement, m.contains(b, e) ? (typeof e.getBoundingClientRect !== K && (d = e.getBoundingClientRect()), c = dc(f), {
+ top: d.top + (c.pageYOffset || b.scrollTop) - (b.clientTop || 0),
+ left: d.left + (c.pageXOffset || b.scrollLeft) - (b.clientLeft || 0)
+ }) : d
+ },
+ position: function () {
+ if (this[0]) {
+ var a, b, c = {
+ top: 0,
+ left: 0
+ },
+ d = this[0];
+ return "fixed" === m.css(d, "position") ? b = d.getBoundingClientRect() : (a = this.offsetParent(), b = this.offset(), m.nodeName(a[0], "html") || (c = a.offset()), c.top += m.css(a[0], "borderTopWidth", !0), c.left += m.css(a[0], "borderLeftWidth", !0)), {
+ top: b.top - c.top - m.css(d, "marginTop", !0),
+ left: b.left - c.left - m.css(d, "marginLeft", !0)
+ }
+ }
+ },
+ offsetParent: function () {
+ return this.map(function () {
+ var a = this.offsetParent || cc;
+ while (a && !m.nodeName(a, "html") && "static" === m.css(a, "position")) a = a.offsetParent;
+ return a || cc
+ })
+ }
+ }), m.each({
+ scrollLeft: "pageYOffset",
+ scrollTop: "pageXOffset"
+ }, function (a, b) {
+ var c = /Y/.test(b);
+ m.fn[a] = function (d) {
+ return V(this, function (a, d, e) {
+ var f = dc(a);
+ return void 0 === e ? f ? b in f ? f[b] : f.document.documentElement[d] : a[d] : void (f ? f.scrollTo(c ? m(f).scrollLeft() : e, c ? e : m(f).scrollTop()) : a[d] = e)
+ }, a, d, arguments.length, null)
+ }
+ }), m.each(["top", "left"], function (a, b) {
+ m.cssHooks[b] = La(k.pixelPosition, function (a, c) {
+ return c ? (c = Ja(a, b), Ha.test(c) ? m(a).position()[b] + "px" : c) : void 0
+ })
+ }), m.each({
+ Height: "height",
+ Width: "width"
+ }, function (a, b) {
+ m.each({
+ padding: "inner" + a,
+ content: b,
+ "": "outer" + a
+ }, function (c, d) {
+ m.fn[d] = function (d, e) {
+ var f = arguments.length && (c || "boolean" != typeof d),
+ g = c || (d === !0 || e === !0 ? "margin" : "border");
+ return V(this, function (b, c, d) {
+ var e;
+ return m.isWindow(b) ? b.document.documentElement["client" + a] : 9 === b.nodeType ? (e = b.documentElement, Math.max(b.body["scroll" + a], e["scroll" + a], b.body["offset" + a], e["offset" + a], e["client" + a])) : void 0 === d ? m.css(b, c, g) : m.style(b, c, d, g)
+ }, b, f ? d : void 0, f, null)
+ }
+ })
+ }), m.fn.size = function () {
+ return this.length
+ }, m.fn.andSelf = m.fn.addBack, "function" == typeof define && define.amd && define("jquery", [], function () {
+ return m
+ });
+ var ec = a.jQuery,
+ fc = a.$;
+ return m.noConflict = function (b) {
+ return a.$ === m && (a.$ = fc), b && a.jQuery === m && (a.jQuery = ec), m
+ }, typeof b === K && (a.jQuery = a.$ = m), m
+});
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/chat/js/main.js b/ReallifeGamemode.Client/assets/chat/js/main.js
new file mode 100644
index 00000000..6cacec5d
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/chat/js/main.js
@@ -0,0 +1,191 @@
+let chat =
+{
+ size: 0,
+ history_limit: 50,
+ container: null,
+ input: null,
+ enabled: false,
+ active: true,
+ historyMsgs: [],
+ currentIndex: 0
+};
+
+const MAX_MSG_HISTORY = 12;
+
+function enableChatInput(enable) {
+ if (chat.active == false
+ && enable == true)
+ return;
+
+ if (enable != (chat.input != null)) {
+ mp.invoke("focus", enable);
+
+ if (enable) {
+ chat.input = $("#chat").append('
').children(":last");
+ chat.input.children("input").focus();
+ }
+ else {
+ chat.input.fadeOut('fast', function () {
+ chat.input.remove();
+ chat.input = null;
+ });
+ }
+ }
+}
+
+var chatAPI =
+{
+ push: (text) => {
+ let colorPositions = [];
+ let colors = [];
+ let chatElement = "
";
+
+
+
+ for (let i = 0; i < text.length; i++) {
+ let colorCheck = `${text[i]}${text[i + 1]}${text[i + 2]}`;
+
+ if (colorCheck === "!{#") {
+ colorPositions.push(i);
+ }
+ }
+
+ colorPositions.forEach(el => {
+ let sub = text.slice(el, -1);
+ colors.push(sub.slice(3, 9));
+ });
+
+ colorPositions.forEach((el, i) => {
+ let sub = text.slice(colorPositions[i] + 10, colorPositions[i + 1]);
+ chatElement += `${sub}`;
+ });
+
+ var elmnt = document.getElementById("chat_messages");
+
+ chatElement += "";
+
+ var today = new Date();
+
+
+ if (chatElement === "
") {
+ if (chat.input == null || elmnt.scrollTop == elmnt.scrollHeight - elmnt.clientHeight) {
+ chat.container.append("
" + "[" + today.toLocaleTimeString('de-DE') + "] " + text + "");
+ elmnt.scrollTop = elmnt.scrollHeight - elmnt.clientHeight;
+ } else {
+ chat.container.append("
" + "[" + today.toLocaleTimeString('de-DE') + "] " + text + "");
+ }
+ } else {
+ chat.container.append(chatElement);
+ }
+
+ chat.size++;
+
+ if (chat.size >= chat.history_limit) {
+ chat.container.children(":first").remove();
+ }
+ },
+
+ clear: () => {
+ chat.container.html("");
+ },
+
+ activate: (toggle) => {
+ if (toggle == false
+ && (chat.input != null))
+ enableChatInput(false);
+
+ chat.active = toggle;
+ },
+
+ show: (toggle) => {
+ if (toggle)
+ $("#chat").show();
+ else
+ $("#chat").hide();
+
+ chat.active = toggle;
+ }
+};
+
+let api = { "chat:push": chatAPI.push, "chat:clear": chatAPI.clear, "chat:activate": chatAPI.activate, "chat:show": chatAPI.show };
+
+for (let fn in api) {
+ mp.events.add(fn, api[fn]);
+}
+
+$(document).ready(function () {
+ chat.container = $("#chat ul#chat_messages");
+
+ $(".ui_element").show();
+ chatAPI.push("Multiplayer started");
+
+ $("body").keyup(function (event) {
+ if (event.which == 84 && chat.input == null
+ && chat.active == true) {
+ chat.currentIndex = 0;
+ enableChatInput(true);
+ event.preventDefault();
+ } else if (event.which == 38) {
+ if (chat.historyMsgs.length === 0)
+ return;
+
+ const previousMessages = chat.historyMsgs;
+
+ if (previousMessages.length === chat.currentIndex)
+ return;
+
+ chat.input.children("input").val(previousMessages[chat.currentIndex]);
+
+ setTimeout(() => {
+ chat.input.children("input").setSelectionRange(previousMessages[chat.currentIndex].length, previousMessages[chat.currentIndex].length);
+ }, 1);
+
+ chat.currentIndex = chat.currentIndex + 1;
+ } else if (event.which == 40) {
+ if (chat.historyMsgs.length === 0)
+ return;
+
+ const previousMessages = chat.historyMsgs;
+
+ if (chat.currentIndex === -1) {
+ chat.input.children("input").val("")
+ return;
+ }
+
+ chat.currentIndex = chat.currentIndex - 1;
+ chat.input.children("input").val(previousMessages[chat.currentIndex]);
+
+ setTimeout(() => {
+ chat.input.children("input").setSelectionRange(previousMessages[chat.currentIndex].length, previousMessages[chat.currentIndex].length);
+ }, 1);
+ }
+ else if (event.which == 13 && chat.input != null) {
+ var value = chat.input.children("input").val();
+
+ if (value.length > 0) {
+ if (chat.historyMsgs.length >= MAX_MSG_HISTORY) {
+ chat.historyMsgs.pop();
+ }
+
+ chat.historyMsgs.unshift(value);
+ chat.currentIndex = 0;
+ var elmnt = document.getElementById("chat_messages");
+
+ if (value[0] == "/") {
+ value = value.substr(1);
+
+ if (value.length > 0)
+ mp.invoke("command", value);
+ elmnt.scrollTop = elmnt.scrollHeight - elmnt.clientHeight;
+ }
+ else {
+ mp.invoke("chatMessage", value);
+
+ elmnt.scrollTop = elmnt.scrollHeight - elmnt.clientHeight;
+ }
+ }
+
+ enableChatInput(false);
+ }
+ });
+});
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/chat/style/checkbox.css b/ReallifeGamemode.Client/assets/chat/style/checkbox.css
new file mode 100644
index 00000000..53fddb26
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/chat/style/checkbox.css
@@ -0,0 +1 @@
+input[type=checkbox].css-checkbox{position:absolute;z-index:-1000;left:-1000px;overflow:hidden;clip:rect(0 0 0 0);height:1px;width:1px;margin:-1px;padding:0;border:0;}input[type=checkbox].css-checkbox+label.css-label{height:20px;width:20px;display:inline-block;background-repeat:no-repeat;background-position:0 0;cursor:pointer;}input[type=checkbox].css-checkbox:checked+label.css-label:after{content:'x';color:white;}label.css-label{background:#7b3784;border-radius:2px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/chat/style/main.css b/ReallifeGamemode.Client/assets/chat/style/main.css
new file mode 100644
index 00000000..e05649cb
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/chat/style/main.css
@@ -0,0 +1,89 @@
+*, body, html {
+ padding: 0;
+ margin: 0
+}
+
+#chat, a, body, html {
+ color: #fff
+}
+
+body, html {
+ -webkit-font-smoothing: antialiased;
+ overflow: hidden;
+ font-size: 14px;
+ -webkit-user-select: none
+}
+
+a {
+ text-decoration: none
+}
+
+.ui_element {
+ display: none;
+ position: absolute;
+ width: 100vw;
+ height: 100vh;
+ z-index: 2
+}
+
+#chat {
+ display: block;
+ z-index: 0;
+ line-height: 24px;
+ font-weight: 700;
+ text-shadow: 1px 1px 0 #000,-1px -1px 0 #000,1px -1px 0 #000,-1px 1px 0 #000,1px 1px 0 #000;
+ font-family: Myriad Pro,Segoe UI,Verdana,sans-serif;
+ font-size: 16px;
+ letter-spacing: .4px;
+ margin-left: 15px
+}
+
+@media screen and (min-height:1080px) {
+ #chat {
+ font-size: 14px !important;
+ font-weight: 700
+ }
+}
+
+#chat ul#chat_messages {
+ direction: ltr;
+ overflow-y: auto;
+ overflow-x: hidden;
+ height: 285px;
+ margin-top: 2vh; /*2vh*/
+ transform: rotate(0deg);
+ /*width:37vw; /* old: 37vw*/
+ max-width: 85%;
+ padding: 10px 20px; /* old padding: 10px 20px*/
+ list-style-type: none
+}
+
+ #chat ul#chat_messages > li {
+ transform: rotate(0deg)
+ }
+
+#chat input#chat_msg {
+ color: #fff;
+ background: rgba(0,0,0,.5);
+ outline: 0;
+ border: none;
+ font-family: Myriad Pro,Open Sans,sans-serif;
+ font-size: 18px;
+ line-height: 35px;
+ width: 35vw;
+ padding: 5px 5px 5px 15px
+}
+
+::-webkit-scrollbar {
+ width: 11px;
+ direction: ltr;
+}
+
+::-webkit-scrollbar-thumb {
+ background: rgba(255, 17, 0, 0);
+ border-radius: 20px
+}
+
+ ::-webkit-scrollbar-thumb:hover {
+ background: rgba(255, 17, 0, 0)
+ }
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/104.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/104.svg
new file mode 100644
index 00000000..52ebf76b
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/104.svg
@@ -0,0 +1,96 @@
+
+
+
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/12.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/13.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg
new file mode 100644
index 00000000..9a66c011
--- /dev/null
+++ b/ReallifeGamemode.Client/assets/html/inventory/img/inventory/14.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/assets/sound/music/login.mp3 b/ReallifeGamemode.Client/assets/sound/music/login.mp3
index 724d2fb2..86df7baf 100644
Binary files a/ReallifeGamemode.Client/assets/sound/music/login.mp3 and b/ReallifeGamemode.Client/assets/sound/music/login.mp3 differ
diff --git a/ReallifeGamemode.Client/global.d.ts b/ReallifeGamemode.Client/global.d.ts
index 118dc77c..2242dd17 100644
--- a/ReallifeGamemode.Client/global.d.ts
+++ b/ReallifeGamemode.Client/global.d.ts
@@ -64,6 +64,14 @@ declare type FactionRanks = {
ranks: FactionRank[]
}
+declare type FactionMember = {
+ username: string;
+ factionRank: number;
+ factionRankName: string;
+ isLeader: boolean;
+ isOnline: boolean;
+}
+
declare type FactionRank = {
}
\ No newline at end of file
diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts
index 6dd166b9..303729b5 100644
--- a/ReallifeGamemode.Client/index.ts
+++ b/ReallifeGamemode.Client/index.ts
@@ -37,6 +37,10 @@ game.events.onPlayerCommand((cmd) => {
mp.game.vehicle.defaultEngineBehaviour = false;
+mp.gui.chat.show(false);
+const chatbox = mp.browsers.new("package://assets/chat/index.html");
+chatbox.markAsChat();
+
require('./Gui/house');
import vehicleEntering from './vehiclesync/entering';
@@ -251,6 +255,9 @@ gangwarHandle(globalData);
import animationSync from './util/animationSync';
animationSync();
+import antiCheat from './admin/anticheat';
+antiCheat(globalData);
+
require('./Gui/policedepartment');
require('./Gui/helptext');
diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts
index c60d0c01..0838a977 100644
--- a/ReallifeGamemode.Client/util/weapondamage.ts
+++ b/ReallifeGamemode.Client/util/weapondamage.ts
@@ -45,6 +45,14 @@
modifier = 0.25;
meelemodifier = 1;
break;
+ case 0x0A3D4D34: //Combat PDW
+ modifier = 0.185;
+ meelemodifier = 1;
+ break;
+ case 0xBFEFFF6D: //assaultrifle
+ modifier = 0.225;
+ meelemodifier = 1;
+ break;
case 0x1D073A89: //Pumpshotgun
modifier = 0.2;
meelemodifier = 1;
diff --git a/ReallifeGamemode.Client/vehiclesync/smoothtrottle.ts b/ReallifeGamemode.Client/vehiclesync/smoothtrottle.ts
index e11a060e..884c1faa 100644
--- a/ReallifeGamemode.Client/vehiclesync/smoothtrottle.ts
+++ b/ReallifeGamemode.Client/vehiclesync/smoothtrottle.ts
@@ -9,7 +9,7 @@
export default function smoothThrottle() {
let GlobalDisable = false;
- let DisableAntiReverse = false;
+ let DisableAntiReverse = true;
let DisableSmoothThrottle = false;
let BrakeSystem = false;
diff --git a/ReallifeGamemode.Server.Core/Managers/HouseManager.cs b/ReallifeGamemode.Server.Core/Managers/HouseManager.cs
index f20fc600..aaf43688 100644
--- a/ReallifeGamemode.Server.Core/Managers/HouseManager.cs
+++ b/ReallifeGamemode.Server.Core/Managers/HouseManager.cs
@@ -67,7 +67,7 @@ namespace ReallifeGamemode.Server.Core.Managers
else
{
//houseBlips[house.Id] = NAPI.Blip.CreateBlip(40, house.Position, 0.7f, 11, "Haus", shortRange: true); too many blips
- houseBlips[house.Id] = Api.Blip.CreateBlip(40, house.Position, "Haus", 11, 0.7f, shortRange: true);
+ houseBlips[house.Id] = Api.Blip.CreateBlip(40, house.Position, "Haus", 11, 0.5f, shortRange: true);
}
houseLabels[house.Id] = Api.TextLabel.CreateTextLabel(text, housePos, 10f, 1f, 0, new Color(255, 255, 255));
diff --git a/ReallifeGamemode.Server/Admin/AntiCheat.cs b/ReallifeGamemode.Server/Admin/AntiCheat.cs
new file mode 100644
index 00000000..1dc48cce
--- /dev/null
+++ b/ReallifeGamemode.Server/Admin/AntiCheat.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GTANetworkAPI;
+using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Managers;
+using ReallifeGamemode.Server.Services;
+using ReallifeGamemode.Server.Types;
+
+namespace ReallifeGamemode.Server.Admin
+{
+ public class AntiCheat : Script
+ {
+ private static TimeSpan antiCheatMessageCooldown = new TimeSpan(0, 0, 30);
+ private static Dictionary<(string, string), DateTime> lastAntiCheatBroadcastTime = new Dictionary<(string, string), DateTime>();
+
+ [ServerEvent(Event.PlayerWeaponSwitch)]
+ public void OnAntiCheatPlayerWeeaponSwitch(Player player, WeaponHash oldWeapon, WeaponHash newWeapon)
+ {
+ player.TriggerEvent("SERVER:AntiCheat:weaponSwap");
+ }
+
+ [RemoteEvent("CLIENT:CheatDetection")]
+ public void OnAntiCheatCheatDetected(Player cheater, string cheat)
+ {
+ if (!cheater.IsLoggedIn())
+ {
+ cheater.Kick();
+ }
+
+ if(cheater.IsAdminDuty())
+ {
+ return;
+ }
+
+ if (lastAntiCheatBroadcastTime.Any(a => a.Key.Item1 == cheater.Name && a.Key.Item2 == cheat)
+ && DateTime.Now - lastAntiCheatBroadcastTime[(cheater.Name, cheat)] < antiCheatMessageCooldown)
+ {
+ return;
+ }
+ lastAntiCheatBroadcastTime[(cheater.Name, cheat)] = DateTime.Now;
+ ChatService.BroadcastAdmin($"~r~[ANTICHEAT]~s~ Verdacht auf ~y~{cheat}~s~ bei ~y~{cheater.Name}~s~ (~y~{cheater.Handle.Value}~s~)", AdminLevel.ADMIN);
+ }
+
+ internal static void NoTpAntiCheatForPlayer(string name)
+ {
+ lastAntiCheatBroadcastTime[(name, "Flyhack/Teleport")] = DateTime.Now.Subtract(antiCheatMessageCooldown).Add(TimeSpan.FromSeconds(5));
+ }
+
+ internal static void NoHealthAntiCheatForPlayer(string name)
+ {
+ lastAntiCheatBroadcastTime[(name, "Healkey (unexpected HP added)")] = DateTime.Now.Subtract(antiCheatMessageCooldown).Add(TimeSpan.FromSeconds(5));
+ }
+ }
+}
diff --git a/ReallifeGamemode.Server/Bank/bank.cs b/ReallifeGamemode.Server/Bank/bank.cs
index 47d9aca4..1781103e 100644
--- a/ReallifeGamemode.Server/Bank/bank.cs
+++ b/ReallifeGamemode.Server/Bank/bank.cs
@@ -5,6 +5,7 @@
*/
using GTANetworkAPI;
using Newtonsoft.Json;
+using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Finance;
@@ -60,11 +61,14 @@ namespace ReallifeGamemode.Server.Bank
{
if (client.IsInVehicle || !client.IsLoggedIn() || client.GetUser().FactionId is null) return;
- if (client.GetUser().FactionLeader == true)
+ User user = client.GetUser();
+
+ if (user.FactionLeader == true)
{
- client.TriggerEvent("showFactionBankMenuLeader", client.GetUser().Faction.BankAccount.Balance.ToString());
+ client.TriggerEvent("showFactionBankMenuLeader", user.Faction.BankAccount.Balance.ToString());
+ return;
}
- client.TriggerEvent("showFactionBankMenu", client.GetUser().Faction.BankAccount.Balance.ToString());
+ client.TriggerEvent("showFactionBankMenu", user.Faction.BankAccount.Balance.ToString());
}
private static void EntityExitFactionBankColShape(ColShape colShape, Player client)
diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index 041f31dc..fb46010a 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -232,7 +232,7 @@ namespace ReallifeGamemode.Server.Commands
#region Support
- [Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~IP~s~, ~g~deathlogs~s~, ~g~LC~s~]", GreedyArg = true)]
+ [Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~IP~s~, ~g~deathlogs~s~, ~g~LC~s~, ~g~Connect~s~]", GreedyArg = true)]
public void CmdTog(Player player, string typ, string option1 = null, string option2 = null)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
@@ -281,6 +281,18 @@ namespace ReallifeGamemode.Server.Commands
player.SendNotification("~g~[Info]~w~ Leaderchat wird nun angezeigt.");
}
break;
+ case "connect":
+ if (player.HasData("togconnect"))
+ {
+ player.ResetData("togconnect");
+ player.SendNotification("~g~[Info]~w~ Connect-Logs werden nun ausgeblendet.");
+ }
+ else
+ {
+ player.SetData("togconnect", true);
+ player.SendNotification("~g~[Info]~w~ Connect-Logs werden nun angezeigt.");
+ }
+ break;
}
}
@@ -390,7 +402,7 @@ namespace ReallifeGamemode.Server.Commands
player.Vehicle.Position = target.Position;
NAPI.Entity.SetEntityVelocity(player.Vehicle, new Vector3());
}
- else player.Position = target.Position;
+ else player.SafeTeleport(target.Position);
ChatService.SendMessage(player, "~c~* Du hast dich teleportiert.");
}
@@ -416,7 +428,7 @@ namespace ReallifeGamemode.Server.Commands
target.Vehicle.Position = player.Position;
NAPI.Entity.SetEntityVelocity(target.Vehicle, new Vector3());
}
- else target.Position = player.Position;
+ else target.SafeTeleport(player.Position);
ChatService.SendMessage(target, "~c~* Du wurdest teleportiert.");
}
@@ -468,16 +480,18 @@ namespace ReallifeGamemode.Server.Commands
if (target.GetData
("duty") == true)
{
target.SetData("duty", false);
- Medic.UpdateDutyMedics(-1);
+ Medic.UpdateDutyMedics();
}
- string targetPlayername = NAPI.Player.GetPlayerName(target);
string adminPlayername = NAPI.Player.GetPlayerName(player);
-
ChatService.SendMessage(target, "~r~KICKINFO: ~w~Du wurdest von " + adminPlayername + " vom Server gekickt: " + reason);
- target.Kick();
- ChatService.BroadcastAdmin("~y~SKICK: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason, AdminLevel.SUPPORTER);
+ NAPI.Task.Run(() =>
+ {
+ target.Kick();
+ }, 2500);
+
+ ChatService.BroadcastAdmin("~y~SKICK: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason, AdminLevel.SUPPORTER);
}
[Command("clearchat", "~m~Benutzung: ~s~/clearchat")]
@@ -542,6 +556,9 @@ namespace ReallifeGamemode.Server.Commands
return;
}
+ GlobalHelper.CountdownUntil = DateTime.Now + TimeSpan.FromSeconds(timer);
+ GlobalHelper.CountdownText = text;
+
NAPI.ClientEvent.TriggerClientEventForAll("countdown", timer, text);
}
@@ -609,7 +626,7 @@ namespace ReallifeGamemode.Server.Commands
}
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = player.GetData("mark");
- else player.Position = player.GetData("mark");
+ else player.SafeTeleport(player.GetData("mark"));
}
[Command("flip", "")]
@@ -646,7 +663,7 @@ namespace ReallifeGamemode.Server.Commands
}
else
{
- player.Position = new Vector3(player.Position.X, player.Position.Y, player.Position.Z + value);
+ player.SafeTeleport(new Vector3(player.Position.X, player.Position.Y, player.Position.Z + value));
}
}
@@ -665,7 +682,7 @@ namespace ReallifeGamemode.Server.Commands
}
else
{
- player.Position = new Vector3(player.Position.X, player.Position.Y, player.Position.Z - value);
+ player.SafeTeleport(new Vector3(player.Position.X, player.Position.Y, player.Position.Z - value));
}
}
@@ -684,25 +701,25 @@ namespace ReallifeGamemode.Server.Commands
{
Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
else if (playerHeading < 315 && playerHeading >= 225)
{
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
else if (playerHeading >= 135 && playerHeading < 225)
{
Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
else if (playerHeading >= 45 && playerHeading < 135)
{
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
}
@@ -721,25 +738,25 @@ namespace ReallifeGamemode.Server.Commands
{
Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
else if (playerHeading < 315 && playerHeading >= 225)
{
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
else if (playerHeading >= 135 && playerHeading < 225)
{
Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
else if (playerHeading >= 45 && playerHeading < 135)
{
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
- else player.Position = playerPosition;
+ else player.SafeTeleport(playerPosition);
}
}
@@ -782,17 +799,19 @@ namespace ReallifeGamemode.Server.Commands
if (target.GetData("duty") == true)
{
target.SetData("duty", false);
- Medic.UpdateDutyMedics(-1);
+ Medic.UpdateDutyMedics();
}
- string targetPlayername = NAPI.Player.GetPlayerName(target);
string adminPlayername = NAPI.Player.GetPlayerName(player);
ChatService.SendMessage(target, "~r~KICKINFO: ~w~Du wurdest von " + adminPlayername + " vom Server gekickt: " + reason);
- target.Kick();
+ NAPI.Task.Run(() =>
+ {
+ target.Kick();
+ }, 2500);
- ChatService.Broadcast("~y~INFO: ~w~" + targetPlayername + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason);
+ ChatService.Broadcast("~y~INFO: ~w~" + target.Name + " wurde von " + player.GetUser().AdminLevel.GetName() + " " + adminPlayername + " gekickt: " + reason);
}
[Command("warn", "~m~Benutzung: ~s~/warn [Player] [Grund]", GreedyArg = true)]
@@ -850,7 +869,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("ban", "~m~Benutzung: ~s~/ban [User] [Grund] [Zeit in Minuten(0 für Permanent)]", GreedyArg = true)]
- public void CmdAdminBan(Player admin, string user, string reason, int mins = 0)
+ public void CmdAdminBan(Player admin, string user, string reason, string strmins = "0")
{
if (!admin.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{
@@ -858,6 +877,12 @@ namespace ReallifeGamemode.Server.Commands
return;
}
+ if (!int.TryParse(strmins, out int mins) && mins < 0)
+ {
+ ChatService.ErrorMessage(admin, "Ungültige Zeitangabe");
+ return;
+ }
+
Player target = PlayerService.GetPlayerByNameOrId(user);
if (target == null || !target.IsLoggedIn())
@@ -869,12 +894,25 @@ namespace ReallifeGamemode.Server.Commands
if (target.GetData("duty") == true)
{
target.SetData("duty", false);
- Medic.UpdateDutyMedics(-1);
+ Medic.UpdateDutyMedics();
}
reason = Regex.Replace(reason, "(~[a-zA-Z]~)|(!{(.*)})", "");
- target.GetUser().BanPlayer(admin, reason, mins);
+ string adminPlayername = NAPI.Player.GetPlayerName(admin);
+ String banMessage = "~r~BANINFO: ~w~Du wurdest von " + adminPlayername + " vom Server gebannt: " + reason;
+
+ if (mins > 0)
+ {
+ banMessage = "~r~BANINFO: ~w~Du wurdest von " + adminPlayername + " für " + mins + " Minuten vom Server gebannt: " + reason;
+ }
+
+ ChatService.SendMessage(target, banMessage);
+
+ NAPI.Task.Run(() =>
+ {
+ target.GetUser().BanPlayer(admin, reason, mins);
+ }, 2500);
}
[Command("unban", "~m~Benutzung: ~s~/unban [Name] ")]
@@ -953,7 +991,7 @@ namespace ReallifeGamemode.Server.Commands
player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z);
NAPI.Entity.SetEntityVelocity(player.Vehicle, new Vector3());
}
- else player.Position = new Vector3(p.X, p.Y, p.Z);
+ else player.SafeTeleport(new Vector3(p.X, p.Y, p.Z));
}
}
@@ -1068,7 +1106,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = new Vector3(x, y, z);
- else player.Position = new Vector3(x, y, z);
+ else player.SafeTeleport(new Vector3(x, y, z));
}
[Command("slap", "~m~Benutzung: ~s~/slap [Spieler] (Höhe)")]
@@ -1089,7 +1127,7 @@ namespace ReallifeGamemode.Server.Commands
Vector3 oldPos = target.Position;
- target.Position = new Vector3(oldPos.X, oldPos.Y, oldPos.Z + wert);
+ target.SafeTeleport(new Vector3(oldPos.X, oldPos.Y, oldPos.Z + wert));
ChatService.SendMessage(player, "Du hast " + target.Name + " geslappt. Höhe: " + wert + "");
}
@@ -1128,7 +1166,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
- player.Position = v.Position.Add(new Vector3(0, 0, 2));
+ player.SafeTeleport(v.Position.Add(new Vector3(0, 0, 2)));
}
[Command("ghv", "~m~Benutzung: ~s~/ghv [Fahrzeug ID]")]
@@ -1148,7 +1186,7 @@ namespace ReallifeGamemode.Server.Commands
}
v.Position = player.Position;
- player.Position = player.Position.Add(new Vector3(0, 0, 2));
+ player.SafeTeleport(player.Position.Add(new Vector3(0, 0, 2)));
}
[Command("factionlist", "~m~Benutzung: ~s~/factionlist")]
@@ -1301,7 +1339,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
- target.Health = hp;
+ target.SafeSetHealth(hp);
ChatService.SendMessage(target, "~b~Deine HP wurden von " + player.Name + " auf " + hp + " gesetzt.");
ChatService.SendMessage(player, "~b~Du hast die HP von " + target.Name + " auf " + hp + " gesetzt.");
}
@@ -1420,8 +1458,8 @@ namespace ReallifeGamemode.Server.Commands
u.Dead = false;
dbContext.SaveChanges();
}
- NAPI.Player.SpawnPlayer(target, target.Position);
- target.Health = 100;
+ target.SafeTeleport(target.Position, 0, true);
+ target.SafeSetHealth(100);
Medic.delReviveTask(target);
}
@@ -1442,7 +1480,7 @@ namespace ReallifeGamemode.Server.Commands
return;
}
- target.Armor = armor;
+ target.SafeSetArmor(armor);
ChatService.SendMessage(target, "~b~Deine Rüstung wurde von " + player.Name + " auf " + armor + " gesetzt.");
ChatService.SendMessage(player, "~b~Du hast die Rüstung von " + target.Name + " auf " + armor + " gesetzt.");
}
@@ -1968,7 +2006,7 @@ namespace ReallifeGamemode.Server.Commands
foreach (var managedPlayer in peopleInRange)
{
if (!managedPlayer.IsLoggedIn()) return;
- managedPlayer.Armor = Armor;
+ managedPlayer.SafeSetArmor(Armor);
ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die Rüstung auf " + Armor + " gesetzt.");
}
ChatService.SendMessage(player, "~b~Die Rüstung von " + peopleInRange.Count + " Spielern wurde auf " + Armor + " gesetzt.");
@@ -1987,7 +2025,7 @@ namespace ReallifeGamemode.Server.Commands
foreach (var managedPlayer in peopleInRange)
{
if (!managedPlayer.IsLoggedIn()) return;
- managedPlayer.Health = hp;
+ managedPlayer.SafeSetHealth(hp);
ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt.");
}
ChatService.SendMessage(player, "~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt.");
@@ -2161,7 +2199,7 @@ namespace ReallifeGamemode.Server.Commands
public void sendCPfunc(Player user, int x, int y, int z)
{
Vector3 pos = new Vector3(x, y, z);
- user.Position = pos;
+ user.SafeTeleport(pos);
}
[Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")]
@@ -2391,8 +2429,8 @@ namespace ReallifeGamemode.Server.Commands
managedPlayer.SendNotification(toPlayerNotification);
ChatService.SendMessage(managedPlayer, toPlayerChat);
- NAPI.Player.SpawnPlayer(managedPlayer, managedPlayer.Position);
- managedPlayer.Health = 100;
+ managedPlayer.SafeTeleport(managedPlayer.Position, 0, true);
+ managedPlayer.SafeSetHealth(100);
Medic.delReviveTask(managedPlayer);
}
@@ -2648,7 +2686,7 @@ namespace ReallifeGamemode.Server.Commands
Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), business, price);
player.SendNotification("Shopfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true);
Vector3 oldPos = player.Position;
- player.Position = new Vector3(oldPos.X, oldPos.Y, oldPos.Z + 2.5);
+ player.SafeTeleport(new Vector3(oldPos.X, oldPos.Y, oldPos.Z + 2.5));
}
else ChatService.SendMessage(player, "~m~Du sitzt in keinem Fahrzeug!");
break;
diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index 358cb273..e423885c 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -6,6 +6,7 @@ using GTANetworkAPI;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
+using ReallifeGamemode.Server.Admin;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Factions.Medic;
using ReallifeGamemode.Server.Managers;
@@ -223,7 +224,7 @@ namespace ReallifeGamemode.Server.Commands
NAPI.Pools.GetAllPlayers().ForEach(p =>
{
User pUser = p.GetUser();
- if ((pUser?.FactionLeader ?? false) || pUser.IsAdmin(AdminLevel.ADMIN))
+ if ((pUser?.FactionLeader ?? false) || (pUser.IsAdmin(AdminLevel.ADMIN) && !p.HasData("toglc")))
{
ChatService.SendMessage(p, broadcastMsg);
}
@@ -343,8 +344,8 @@ namespace ReallifeGamemode.Server.Commands
u.Dead = false;
dbContext.SaveChanges();
}
- NAPI.Player.SpawnPlayer(deadPlayer, deadPlayer.Position);
- deadPlayer.Health = 50;
+ deadPlayer.SafeTeleport(deadPlayer.Position, 0, true);
+ deadPlayer.SafeSetHealth(50);
MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == deadPlayer.Name);
Medic.RemoveTaskFromList(task);
@@ -398,6 +399,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.SendMessage(target, "~g~" + player.Name + " ~s~möchte dich für ~g~$" + price + " ~s~heilen. Drücke ~g~J~s~ zum Erlauben oder ~r~N ~s~zum Verbieten");
player.SendNotification("Du hast " + target.Name + " einen Heal angeboten", false);
target.SetData("healDecision", true);
+ Medic.delHealTask(target);
Medic.HealDecisions.Add(new Medic.HealDecision { dMedic = player, dTarget = target, dPrice = price });
}
diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
index d88b8ce9..9163cc08 100644
--- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
+++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
@@ -190,7 +190,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
veh.Position = sVeh.Position;
veh.Rotation = new Vector3(0, 0, sVeh.Heading);
- user.Position = new Vector3(-814.39, -1336.76, 5.15);
+ user.SafeTeleport(new Vector3(-814.39, -1336.76, 5.15));
}
[RemoteEvent("drivingSchoolEvent")]
@@ -304,7 +304,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
veh.Position = sVeh.Position;
veh.Rotation = new Vector3(0, 0, sVeh.Heading);
- user.Position = new Vector3(-814.39, -1336.76, 5.15);
+ user.SafeTeleport(new Vector3(-814.39, -1336.76, 5.15));
}
[RemoteEvent("bikeSchoolEvent")]
diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
index 3a1cce79..310860ec 100644
--- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
+++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
@@ -128,7 +128,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
dbContext.SaveChanges();
}
user.ResetData("ActiveSchool");
- user.Position = new Vector3(-1083.96, -2476.96, 13.07);
+ user.SafeTeleport(new Vector3(-1083.96, -2476.96, 13.07));
}
[RemoteEvent("planeSchoolEvent")]
diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs
index becbb3b9..7852a425 100644
--- a/ReallifeGamemode.Server/Events/Connect.cs
+++ b/ReallifeGamemode.Server/Events/Connect.cs
@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("CLIENT:StopSound");
//player.SetSharedData("vehicleAdminSpeed2", 1.0);
player.SetData("isLoggedIn", false);
- player.Position = new Vector3(-1883.736, -781.4911, -10);
+ player.SafeTeleport(new Vector3(-1883.736, -781.4911, -10));
bool registered = false;
@@ -80,11 +80,16 @@ namespace ReallifeGamemode.Server.Events
bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo;
player.TriggerEvent("SERVER:Login_ShowBrowser", registered, disableLightMode);
- string msg = "~m~*** " + player.Name + " [" + player.SocialClubName + "] [ID: " + player.Handle.Value + "] (" + player.Address + ")";
- if (player.HasData("togip"))
- {
- ChatService.SendMessage(player, msg);
- }
+ string msg = "~m~*** " + player.Name + " [" + player.SocialClubName + "] [ID: " + player.Handle.Value + "]";
+ string ipMsg = " (" + player.Address + ")";
+ ChatService.BroadcastAdmin(msg, AdminLevel.SUPPORTER, getAddInfoMessage: admin =>
+ {
+ return admin.HasData("togip") ? ipMsg : string.Empty;
+ },
+ shouldSendMessage: admin =>
+ {
+ return admin.HasData("togconnect");
+ });
}
private bool IsPlayerBanned(Player player)
diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index 60da325f..5dff77b5 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -13,6 +13,7 @@ using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
+using ReallifeGamemode.Services;
/**
* @overview Life of German Reallife - Events Death (Death.cs)
@@ -69,7 +70,10 @@ namespace ReallifeGamemode.Server.Events
{
Autowanted.Check_AutoWanted(killer, player);
string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason) + ")";
- ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
+ ChatService.BroadcastAdmin(message, AdminLevel.ADMIN, shouldSendMessage: admin =>
+ {
+ return admin.HasData("togdeath");
+ });
}
}
}
@@ -92,11 +96,9 @@ namespace ReallifeGamemode.Server.Events
if (user.JailTime <= 0)
{
- player.SetData("isDead", true);
-
user.Dead = true;
- if (!player.HasData("reviveSperre"))
+ if (!player.HasData("reviveSperre") && player.GetData("isDead") == false && !player.HasData("inGangWar") && player.GetData("SAdminduty") == false)
{
//MEDIC AUFTRAG
MedicTask reviveTask = new MedicTask()
@@ -115,6 +117,8 @@ namespace ReallifeGamemode.Server.Events
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " ist soeben verstorben.", new List() { 2 });
}
+ player.SetData("isDead", true);
+
if (player.GetUser().IsAdmin(AdminLevel.ADMIN) == true)
{
player.TriggerEvent("startDeathTimer", true);
@@ -233,8 +237,11 @@ namespace ReallifeGamemode.Server.Events
dbContext.SaveChanges();
}
player.RemoveAllWeapons();
- //Medic.delReviveTask(player);
- NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5), -98.36f);
+ MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
+ Player medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
+ Medic.RemoveTaskFromList(task);
+
+ player.SafeTeleport(new Vector3(-495.45, -336.33, 34.5), 0, true);
}
}
}
diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs
index 6b502572..de3dd8c8 100644
--- a/ReallifeGamemode.Server/Events/Disconnect.cs
+++ b/ReallifeGamemode.Server/Events/Disconnect.cs
@@ -134,18 +134,25 @@ namespace ReallifeGamemode.Server.Events
user.PositionZ = pos.Z;
saveUser.SaveChanges();
user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false;
+
+ if (user.Wanteds > 0)
+ {
+ ChatService.HQMessage("Der Straftäter " + player.GetUser().Name + " ist vom Radar verschwunden");
+ }
+
}
player.SetData("isLoggedIn", false);
player.TriggerEvent("CLIENT:DestroyPed", 1);
player.TriggerEvent("CLIENT:DestroyPed", 2);
- player.TriggerEvent("CLIENT:DestroyPed", 3);
+ player.TriggerEvent("CLIENT:DestroyPed", 3);
player.TriggerEvent("CLIENT:DestroyPed", 4);
+
Medic.delHealTask(player);
Medic.delReviveTask(player);
if (player.GetData("duty") == true)
{
player.SetData("duty", false);
- Medic.UpdateDutyMedics(-1);
+ Medic.UpdateDutyMedics();
}
}
}
diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs
index 12bc6306..b6e0187a 100644
--- a/ReallifeGamemode.Server/Events/ExitVehicle.cs
+++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs
@@ -51,7 +51,7 @@ namespace ReallifeGamemode.Server.Events
client.WarpOutOfVehicle();
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(vehicle);
ServerVehicleExtensions.Spawn(sVeh, vehicle);
- client.Position = sVeh.Position;
+ client.SafeTeleport(sVeh.Position);
CheckPointHandle.DeleteCheckpoints(client);
}
}
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 70012ea6..92737c1e 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -135,6 +135,7 @@ namespace ReallifeGamemode.Server.Events
Price = f.BuyPrice
});
+
Paycheck paycheck = null;
if (Economy.Paychecks.ContainsKey(u.Id)) paycheck = Economy.Paychecks[u.Id];
@@ -169,6 +170,15 @@ namespace ReallifeGamemode.Server.Events
wage = u.Wage,
};
+ var memberList = dbContext.Users.Where(f => f.FactionId == u.FactionId && u.FactionId != 0).OrderByDescending(f => f.FactionRank.Order).ThenBy(f => f.Name).Select(m => new
+ {
+ username = m.Name,
+ factionRank = m.FactionRank.Order,
+ factionRankName = m.FactionRank.RankName,
+ isLeader = m.FactionLeader,
+ isOnline = m.Player.IsLoggedIn(),
+ });
+
string faction = u.Faction?.Name ?? "Zivilist";
string factionleader = u.FactionLeader ? u.Faction.Name : null;
string group = u.Group != null ? u.Group.Name : null;
@@ -193,8 +203,7 @@ namespace ReallifeGamemode.Server.Events
{
pay_amount = player.GetData("pay_amount");
}
-
- player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), factionleader, 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, house);
}
[RemoteEvent("keyPress:E")]
@@ -233,60 +242,59 @@ namespace ReallifeGamemode.Server.Events
if (nearestBehindVehiclePoint != null)
{
if (player.HasAttachment("ammobox")) return;
- using (var dbContext = new DatabaseContext())
+ using var dbContext = new DatabaseContext();
+ List vehicleItems = dbContext.VehicleItems.ToList().Where(f => f.GetVehicle().GetVehicle() == nearestBehindVehiclePoint.vehicle && InventoryManager.GetItemById(f.ItemId) is IWeaponDealItem).ToList();
+ if (vehicleItems.Count == 0)
{
- List vehicleItems = dbContext.VehicleItems.ToList().Where(f => f.GetVehicle().GetVehicle() == nearestBehindVehiclePoint.vehicle && InventoryManager.GetItemById(f.ItemId) is IWeaponDealItem).ToList();
- if (vehicleItems.Count == 0)
+ GTANetworkAPI.Vehicle vehicle = nearestBehindVehiclePoint.vehicle;
+
+ if (vehicle.HasAttachment("weapondeal"))
{
- GTANetworkAPI.Vehicle vehicle = nearestBehindVehiclePoint.vehicle;
-
- if (vehicle.HasAttachment("weapondeal"))
- {
- vehicle.AddAttachment("weapondeal", true);
- vehicle.AddAttachment("weapondeal1", true);
- vehicle.AddAttachment("weapondeal2", true);
- }
-
- if (WeaponDealManager.checkWeaponDbyVehicle(vehicle))
- {
- vehicle.ResetData("WeaponDealLoad");
- vehicle.ResetData("weaponDeal");
- vehicle.ResetData("dealPoint");
- }
-
- nearestBehindVehiclePoint.vehicle.RemoveMarkerBehind();
-
- return;
+ vehicle.AddAttachment("weapondeal", true);
+ vehicle.AddAttachment("weapondeal1", true);
+ vehicle.AddAttachment("weapondeal2", true);
}
- foreach (var v in vehicleItems)
+
+ if (WeaponDealManager.checkWeaponDbyVehicle(vehicle))
{
- int itemToAdd = 0;
- for (int i = 1; i <= v.Amount; i++)
+ vehicle.ResetData("WeaponDealLoad");
+ vehicle.ResetData("weaponDeal");
+ vehicle.ResetData("dealPoint");
+ }
+
+ nearestBehindVehiclePoint.vehicle.RemoveMarkerBehind();
+ ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(vehicle);
+ sVeh.Spawn(vehicle);
+ return;
+ }
+ foreach (var v in vehicleItems)
+ {
+ int itemToAdd = 0;
+ for (int i = 1; i <= v.Amount; i++)
+ {
+ if (InventoryManager.GetUserInventoryWeight(player) + (i * InventoryManager.GetItemById(v.ItemId).Gewicht) > 40000)
{
- if (InventoryManager.GetUserInventoryWeight(player) + (i * InventoryManager.GetItemById(v.ItemId).Gewicht) > 40000)
- {
- break;
- }
- else
- {
- itemToAdd = i;
- }
- }
- if (itemToAdd == 0)
break;
-
- v.Amount -= itemToAdd;
- if (v.Amount <= 0)
- {
- itemToAdd += v.Amount;
- dbContext.VehicleItems.Remove(v);
}
-
- InventoryManager.AddItemToInventory(player, v.ItemId, itemToAdd);
- nearestBehindVehiclePoint.usePoint(player);
- dbContext.SaveChanges();
- return;
+ else
+ {
+ itemToAdd = i;
+ }
}
+ if (itemToAdd == 0)
+ break;
+
+ v.Amount -= itemToAdd;
+ if (v.Amount <= 0)
+ {
+ itemToAdd += v.Amount;
+ dbContext.VehicleItems.Remove(v);
+ }
+
+ InventoryManager.AddItemToInventory(player, v.ItemId, itemToAdd);
+ nearestBehindVehiclePoint.usePoint(player);
+ dbContext.SaveChanges();
+ return;
}
}
if (nearestDuty != null)// Duty Point
@@ -300,7 +308,7 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("toggleDutyMode", true);
if (player.GetUser().FactionId == 2) //Fire Department
{
- Medic.UpdateDutyMedics(1);
+ Medic.UpdateDutyMedics();
}
switch (factionId)
{
@@ -338,7 +346,7 @@ namespace ReallifeGamemode.Server.Events
user.SetData("duty", false);
player.SendNotification("Du bist nun ~r~außer Dienst.");
player.TriggerEvent("toggleDutyMode", false);
- Medic.UpdateDutyMedics(-1);
+ Medic.UpdateDutyMedics();
UpdateCharacterCloth.LoadCharacterDefaults(player);
}
user.SetBlipAndNametagColor();
@@ -352,17 +360,6 @@ namespace ReallifeGamemode.Server.Events
List specials = new List();
List armor = new List();
List timer = new List();
- int pistol_Amount = 0;
- int pistol50_Amount = 0;
- int Pistol_mk2_Amount = 0;
- int Combatpistol_Amount = 0;
- int SMG_Amount = 0;
- int Carbinerifle_Amount = 0;
- int Compactrifle_Amount = 0;
- int sniperrifle_Amount = 0;
- int Pumpshotgun_Amount = 0;
- int Schutzweste_Amount = 0;
- int Stungun_Amount = 0;
string dealTime = "Starten";
primarys.Add("Keine");
secondarys.Add("Keine");
@@ -445,56 +442,31 @@ namespace ReallifeGamemode.Server.Events
break;
}
}
- foreach (var weapon in weapons)
- {
- if (weapon.WeaponModel == "Pistol")
- {
- pistol_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "Pistol50")
- {
- pistol50_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "Pistol_MK2")
- {
- Pistol_mk2_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "Combatpistol")
- {
- Combatpistol_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "SMG")
- {
- SMG_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "CarbineRifle")
- {
- Carbinerifle_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "CompactRifle")
- {
- Compactrifle_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "sniperrifle")
- {
- sniperrifle_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "PumpShotgun")
- {
- Pumpshotgun_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "Schutzweste")
- {
- Schutzweste_Amount = weapon.Ammount;
- }
- else if (weapon.WeaponModel == "Stungun")
- {
- Stungun_Amount = weapon.Ammount;
- }
- }
- }
- player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), pistol_Amount.ToString(), pistol50_Amount.ToString(), Pistol_mk2_Amount.ToString(), Combatpistol_Amount.ToString(), SMG_Amount.ToString(), Carbinerifle_Amount.ToString(), Compactrifle_Amount.ToString(), sniperrifle_Amount.ToString(), Pumpshotgun_Amount.ToString(), Schutzweste_Amount.ToString(), Stungun_Amount.ToString()); ;
+ List allWeapons = context.FactionWeapons.Select(w => w.WeaponModel).Distinct().ToList();
+ List amountInfos = new List();
+
+ foreach (var weapon in allWeapons)
+ {
+ int amount = 0;
+
+ var tempFactionWeapon = weapons.Where(f => f.WeaponModel == weapon).FirstOrDefault();
+ if(tempFactionWeapon != null)
+ {
+ amount = tempFactionWeapon.Ammount;
+ }
+
+ amountInfos.Add(new WeaponRackWeaponAmountInfo()
+ {
+ WeaponModel = weapon,
+ Amount = amount
+ });
+ }
+
+
+ player.TriggerEvent("showWeaponMenu", primarys.ToArray(), secondarys.ToArray(), melees.ToArray(), specials.ToArray(), armor.ToArray(), JsonConvert.SerializeObject(timer.ToArray()), JsonConvert.SerializeObject(amountInfos));
+
+ }
}
if (nearestJailReleasePoint != null)
{
@@ -553,57 +525,31 @@ namespace ReallifeGamemode.Server.Events
{
if (player.Vehicle != null) return;
Job.JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
- JobManager jobb = new JobManager();
- if (nearestJobPoint.jobId != 3 && nearestJobPoint.jobId == player.GetUser().JobId)
+ JobManager jobManager = new JobManager();
+ if (nearestJobPoint.jobId == player.GetUser().JobId)
{
if (job.GetUsersInJob().Contains(player))
{
- jobb.StopJob(player);
+ jobManager.StopJob(player);
return;
}
if (!job.GetUsersInJob().Contains(player))
{
- jobb.StartJobEvent(player);
- player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
- return;
- }
- }
- else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
- {
- if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
- {
- if (job.GetUsersInJob().Contains(player))
+ if (player.GetUser().JobId == 3)
{
- player.SetData("PilotenBase", 1);
- jobb.StopJob(player);
- return;
+ if (nearestJobPoint.Skill > user.PilotSkill)
+ {
+ player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
+ return;
+ }
+ jobManager.StartJobEvent(player);
+ job.StartJob(player);
+ JobManager.GetJob().StartPilotRoute(player, nearestJobPoint.Skill);
}
- if (!job.GetUsersInJob().Contains(player))
+ else
{
- player.SetData("PilotenBase", 1);
- jobb.StartJobEvent(player);
- player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
- return;
+ jobManager.StartJobEvent(player);
}
- }
- if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
- {
- if (job.GetUsersInJob().Contains(player))
- {
- player.SetData("PilotenBase", 2);
- jobb.StopJob(player);
- return;
- }
- if (!job.GetUsersInJob().Contains(player))
- {
- player.SetData("PilotenBase", 2);
- jobb.StartJobEvent(player);
- player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
- return;
- }
- }
- {
- player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return;
}
}
@@ -850,88 +796,6 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~y~[JOB] ~w~Du musst den Job vorher starten!");
return;
}
- else
- {
- /*if(player.IsAdminDuty())
- {
- player.SendChatMessage("");
- }*/
- if (jV.JobId == 3 && player.GetUser().JobId == 3 && jV.GetJob().GetUsersInJob().Contains(player))
- {
- Job.PilotJob c = new Job.PilotJob();
- if ((VehicleHash)jV.Model == VehicleHash.Cuban800 && !state)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartPilotRoute(player, "RouteStart");
- }
- }
- if ((VehicleHash)jV.Model == VehicleHash.Velum && !state || (VehicleHash)jV.Model == VehicleHash.Velum2 && !state)
- {
- if (player.GetUser().PilotSkill >= 300)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartPilotRoute(player, "RouteStart");
- }
- }
- else
- {
- player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skilllevel(2) ");
- return;
- }
- }
- }
- if (jV.JobId == 4 && player.GetUser().JobId == 4 && jV.GetJob().GetUsersInJob().Contains(player))
- {
- Job.BusDriverJob c = new Job.BusDriverJob();
- if ((VehicleHash)jV.Model == VehicleHash.Bus && !state)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartBusRoute(player, "RouteStart");
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 45);
- }
- }
- if ((VehicleHash)jV.Model == VehicleHash.Coach && !state)
- {
- if (player.GetUser().BusSkill >= 300)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartBusRoute(player, "RouteStart");
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 45);
- }
- }
- else
- {
- player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skilllevel(2) ");
- return;
- }
- }
- if ((VehicleHash)jV.Model == VehicleHash.Tourbus && !state)
- {
- if (player.GetUser().BusSkill >= 800)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartBusRoute(player, "RouteStart");
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 45);
- }
- }
- else
- {
- player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skilllevel(3) ");
- return;
- }
- }
- }
- }
}
}
else if (sV is UserVehicle uV)
diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index 1da5ec9f..0d46c49c 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -10,7 +10,7 @@ using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Server.Wanted;
using ReallifeGamemode.Database.Entities;
-
+using System;
/**
* @overview Life of German Reallife - Event Login (Login.cs)
@@ -37,117 +37,141 @@ namespace ReallifeGamemode.Server.Events
if (user == null)
{
player.TriggerEvent("SERVER:Login_Error", "Der Benutzer existiert nicht! Registriere dich zuerst!");
+ return;
+ }
+
+ if (user.SocialClubName != player.SocialClubName && user.Password == NAPI.Util.GetHashSha256(password))
+ {
+ player.TriggerEvent("SERVER:Login_Error", "Dieser Benutzer gehört dir nicht!");
+ //TODO ?? Log einbauen für den bösen Bub.
+ player.Kick();
+ return;
+ }
+
+ if (user.Password != NAPI.Util.GetHashSha256(password))
+ {
+ player.TriggerEvent("SERVER:Login_Error", "Passwort inkorrekt!");
+ return;
+ }
+
+ player.SetData("dbId", user.Id);
+ player.Name = username;
+ player.TriggerEvent("SERVER:Login_Success");
+ player.TriggerEvent("CLIENT:StopSound");
+ player.SetData("isLoggedIn", true);
+ player.SetSharedData("isLoggedIn", JsonConvert.SerializeObject(true));
+ player.SetData("spec", true);
+ player.SetData("duty", false);
+ player.SetData("Adminduty", false);
+ player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0);
+ player.TriggerEvent("headshotoff");
+ Gangwar.Gangwar.loadPlayer(player);
+ if (user.FactionLeader)
+ {
+ player.TriggerEvent("CLIENT:Turf_LoadLeaderBlip");
+ }
+ if (user.IsAdmin(AdminLevel.HEADADMIN))
+ {
+ player.SetData("editmode", false);
+ player.SetData("quicksavemode", "none");
+ }
+
+ var userBankAccount = user.BankAccount;
+ userBankAccount.Balance = userBankAccount.Balance;
+
+ user.Wanteds = user.Wanteds;
+
+ if (user.Wanteds > 0)
+ {
+ ChatService.HQMessage("Der Straftäter" + user.Name + " hat sich mit " + user.Wanteds + " Wanteds eingeloggt.");
+ }
+
+ if (user.Group != null)
+ {
+ string msg = $"{player.Name} ist wieder online.";
+ ChatService.BroadcastGroup(msg, user.Group);
+ }
+
+ string message = string.Empty;
+
+ if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName))
+ {
+ message = "!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")";
+ }
+ else if (user.IsAdmin(AdminLevel.MAPPING))
+ {
+ message = "!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!";
+ }
+
+ string addInfoStr = " (IP: " + player.Address + ")";
+
+ if(!string.IsNullOrEmpty(message))
+ {
+ ChatService.BroadcastAdmin(message, AdminLevel.MAPPING, admin =>
+ {
+ if(admin.HasData("togip"))
+ {
+ return addInfoStr;
+ }
+ return "";
+ });
+ }
+
+ var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();
+ player.SetData("items", userItems);
+
+ user.SetBlipAndNametagColor();
+
+ if (user.CharacterId == null)
+ {
+ var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension");
+ currentPlayerCreatorDimension++;
+ NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension);
+ player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension");
+ player.SafeTeleport(new Vector3(402.8664, -996.4108, -99.00027));
+ player.Rotation = new Vector3(0, 0, 180);
+ player.TriggerEvent("toggleCreator");
}
else
{
- if (user.SocialClubName != player.SocialClubName && user.Password == NAPI.Util.GetHashSha256(password))
+ CharacterCreator.ApplyCharacter(player);
+ UpdateCharacterCloth.LoadCharacterDefaults(player);
+ if (user.JailTime <= 0)
{
- player.TriggerEvent("SERVER:Login_Error", "Dieser Benutzer gehört dir nicht!");
- //TODO ?? Log einbauen für den bösen Bub.
- player.Kick();
- return;
- }
-
- if (user.Password != NAPI.Util.GetHashSha256(password))
- {
- player.TriggerEvent("SERVER:Login_Error", "Passwort inkorrekt!");
+ player.SafeTeleport(new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0, true);
}
else
{
- player.SetData("dbId", user.Id);
- player.Name = username;
- player.TriggerEvent("SERVER:Login_Success");
- player.TriggerEvent("CLIENT:StopSound");
- player.SetData("isLoggedIn", true);
- player.SetSharedData("isLoggedIn", JsonConvert.SerializeObject(true));
- player.SetData("spec", true);
- player.SetData("duty", false);
- player.SetData("Adminduty", false);
- player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0);
- player.TriggerEvent("headshotoff");
- Gangwar.Gangwar.loadPlayer(player);
- if (user.FactionLeader)
- {
- player.TriggerEvent("CLIENT:Turf_LoadLeaderBlip");
- }
- if (user.IsAdmin(AdminLevel.HEADADMIN))
- {
- player.SetData("editmode", false);
- player.SetData("quicksavemode", "none");
- }
-
- var userBankAccount = user.BankAccount;
- userBankAccount.Balance = userBankAccount.Balance;
-
- user.Wanteds = user.Wanteds;
-
-
- if (user.Group != null)
- {
- string msg = $"{player.Name} ist wieder online.";
- ChatService.BroadcastGroup(msg, user.Group);
- }
-
- if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName))
- {
- ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " [ID: " + player.Handle.Value + "] (" + user.AdminLevel.GetName() + ")", AdminLevel.MAPPING);
- }
- else if (user.IsAdmin(AdminLevel.MAPPING))
- {
- ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name + " [ID: " + player.Handle.Value + "]" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.MAPPING);
- }
-
-
- var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();
- player.SetData("items", userItems);
-
- user.SetBlipAndNametagColor();
-
- if (user.CharacterId == null)
- {
- var currentPlayerCreatorDimension = (uint)NAPI.Data.GetWorldData("playerCreatorDimension");
- currentPlayerCreatorDimension++;
- NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension);
- player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension");
- player.Position = new Vector3(402.8664, -996.4108, -99.00027);
- player.Rotation = new Vector3(0, 0, 180);
- player.TriggerEvent("toggleCreator");
- }
- else
- {
- CharacterCreator.ApplyCharacter(player);
- UpdateCharacterCloth.LoadCharacterDefaults(player);
- if (user.JailTime <= 0)
- {
- NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0);
- }
- else
- {
- Jail.Check_PutBehindBars(user);
- }
- }
-
- player.TriggerEvent("draw", player.Name, player.Handle.Value);
- if (user.Dead == true)
- {
- if (user.IsAdmin(AdminLevel.ADMIN) == true)
- {
- player.TriggerEvent("startDeathTimer", true);
- player.Health = 0;
- }
- else
- {
- player.TriggerEvent("startDeathTimer", false);
- player.Health = 0;
- }
- player.SetData("isDead", true);
- }
- else
- {
- player.SetData("isDead", false);
- }
+ Jail.Check_PutBehindBars(user);
}
}
+
+ player.TriggerEvent("draw", player.Name, player.Handle.Value);
+ NAPI.Task.Run(() =>
+ {
+ if (user.Dead == true)
+ {
+ if (user.IsAdmin(AdminLevel.ADMIN) == true)
+ {
+ player.TriggerEvent("startDeathTimer", true);
+ }
+ else
+ {
+ player.TriggerEvent("startDeathTimer", false);
+ }
+ player.SafeSetHealth(0);
+ player.SetData("isDead", true);
+ }
+ else
+ {
+ player.SetData("isDead", false);
+ }
+ }, delayTime: 1000);
+
+ if(GlobalHelper.CountdownUntil > DateTime.Now)
+ {
+ player.TriggerEvent("countdown", (GlobalHelper.CountdownUntil - DateTime.Now).TotalSeconds, GlobalHelper.CountdownText);
+ }
}
}
}
diff --git a/ReallifeGamemode.Server/Events/PlayerEvent.cs b/ReallifeGamemode.Server/Events/PlayerEvent.cs
index abd12a3c..4f6ed48b 100644
--- a/ReallifeGamemode.Server/Events/PlayerEvent.cs
+++ b/ReallifeGamemode.Server/Events/PlayerEvent.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
+using ReallifeGamemode.Server.Extensions;
namespace ReallifeGamemode.Server.Events
{
@@ -10,7 +11,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("CLIENT:SET_InFrontOfPos")]
public void SetFrontOfPos(Player player, Vector3 pos)
{
- player.Position = pos;
+ player.SafeTeleport(pos);
}
}
}
diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs
index 8536642b..1ec96ced 100644
--- a/ReallifeGamemode.Server/Events/Register.cs
+++ b/ReallifeGamemode.Server/Events/Register.cs
@@ -3,6 +3,9 @@ using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Models;
+using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Util;
+using System;
/**
* @overview Life of German Reallife - Event Register (Register.cs)
@@ -63,8 +66,13 @@ namespace ReallifeGamemode.Server.Events
NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension);
player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension");
player.TriggerEvent("toggleCreator");
- player.Position = new Vector3(402.8664, -996.4108, -99.00027);
+ player.SafeTeleport(new Vector3(402.8664, -996.4108, -99.00027));
//player.Position = new Vector3(user.PositionX, user.PositionY, user.PositionZ);
+
+ if (GlobalHelper.CountdownUntil > DateTime.Now)
+ {
+ player.TriggerEvent("countdown", (GlobalHelper.CountdownUntil - DateTime.Now).TotalSeconds, GlobalHelper.CountdownText);
+ }
}
else
{
diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs b/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs
index 33955c27..f7947846 100644
--- a/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs
+++ b/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs
@@ -1,4 +1,5 @@
using GTANetworkAPI;
+using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Events
@@ -11,7 +12,7 @@ namespace ReallifeGamemode.Server.Events
ElevatorPoint elevator = PositionManager.ElevatorPoints.Find(e => e.Stage == stage);
if (elevator != null)
{
- client.Position = elevator.Position;
+ client.SafeTeleport(elevator.Position);
}
}
}
diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
index 5b51c3e6..00de3e94 100644
--- a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
+++ b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
@@ -43,7 +43,7 @@ namespace ReallifeGamemode.Server.Events
}
if (slot == 5)
{
- client.Armor = 100;
+ client.SafeSetArmor(100);
}
}
@@ -81,11 +81,10 @@ namespace ReallifeGamemode.Server.Events
melee = NAPI.Util.GetHashKey($"weapon_{meleeModel}");
}
- client.GiveWeapon((WeaponHash)primary, 300);
- client.GiveWeapon((WeaponHash)secondary, 100);
+ client.GiveWeapon((WeaponHash)primary, 500);
+ client.GiveWeapon((WeaponHash)secondary, 250);
client.GiveWeapon((WeaponHash)melee, 1);
-
if (!uint.TryParse(specialModel, out uint special))
{
if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2");
@@ -95,7 +94,7 @@ namespace ReallifeGamemode.Server.Events
if (armor == "Schutzweste")
{
- client.Armor = 100;
+ client.SafeSetArmor(100);
}
using (var context = new DatabaseContext())
diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs
index c336fe3f..263b8f8a 100644
--- a/ReallifeGamemode.Server/Events/Vehicle.cs
+++ b/ReallifeGamemode.Server/Events/Vehicle.cs
@@ -77,88 +77,6 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~y~[JOB] ~w~Du musst den Job vorher starten!");
return;
}
- else
- {
- /*if(player.IsAdminDuty())
- {
- player.SendChatMessage("");
- }*/
- if (jV.JobId == 3 && player.GetUser().JobId == 3 && jV.GetJob().GetUsersInJob().Contains(player))
- {
- Job.PilotJob c = new Job.PilotJob();
- if ((VehicleHash)jV.Model == VehicleHash.Cuban800 && !state)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartPilotRoute(player, "RouteStart");
- }
- }
- if ((VehicleHash)jV.Model == VehicleHash.Velum && !state || (VehicleHash)jV.Model == VehicleHash.Velum2 && !state)
- {
- if (player.GetUser().PilotSkill >= 300)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartPilotRoute(player, "RouteStart");
- }
- }
- else
- {
- player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skilllevel(2) ");
- return;
- }
- }
- }
- if (jV.JobId == 4 && player.GetUser().JobId == 4 && jV.GetJob().GetUsersInJob().Contains(player))
- {
- Job.BusDriverJob c = new Job.BusDriverJob();
- if ((VehicleHash)jV.Model == VehicleHash.Bus && !state)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartBusRoute(player, "RouteStart");
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 45);
- }
- }
- if ((VehicleHash)jV.Model == VehicleHash.Coach && !state)
- {
- if (player.GetUser().BusSkill >= 300)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartBusRoute(player, "RouteStart");
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 45);
- }
- }
- else
- {
- player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skilllevel(2) ");
- return;
- }
- }
- if ((VehicleHash)jV.Model == VehicleHash.Tourbus && !state)
- {
- if (player.GetUser().BusSkill >= 800)
- {
- if (!player.HasData("HatRoute") || player.GetData("HatRoute") == false)
- {
- player.SetData("HatRoute", true);
- c.StartBusRoute(player, "RouteStart");
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 45);
- }
- }
- else
- {
- player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skilllevel(3) ");
- return;
- }
- }
- }
- }
}
}
else if (sV is UserVehicle uV)
@@ -170,7 +88,6 @@ namespace ReallifeGamemode.Server.Events
}
}
VehicleStreaming.SetEngineState(v, !state);
-
}
}
@@ -227,8 +144,8 @@ namespace ReallifeGamemode.Server.Events
{
ServerVehicle carlocked = v.GetServerVehicle(dbContext);
- if(state == true)
- {
+ if (state == true)
+ {
carlocked.Locked = true;
dbContext.SaveChanges();
}
@@ -238,7 +155,7 @@ namespace ReallifeGamemode.Server.Events
dbContext.SaveChanges();
}
}
- player.SendNotification(msg);
+ player.SendNotification(msg);
}
else if (!player.IsInVehicle)
{
diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index e20a998e..140d180e 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
+using ReallifeGamemode.Server.Admin;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
@@ -59,6 +60,33 @@ namespace ReallifeGamemode.Server.Extensions
}
}
+ public static void SafeTeleport(this Player player, Vector3 position, float heading = 0, bool spawn = false)
+ {
+ AntiCheat.NoTpAntiCheatForPlayer(player.Name);
+ if (spawn)
+ {
+ AntiCheat.NoHealthAntiCheatForPlayer(player.Name);
+ NAPI.Player.SpawnPlayer(player, position, heading);
+ }
+ else
+ {
+ player.Position = position;
+ player.Heading = heading;
+ }
+ }
+
+ public static void SafeSetHealth(this Player player, int health)
+ {
+ AntiCheat.NoHealthAntiCheatForPlayer(player.Name);
+ player.Health = health;
+ }
+
+ public static void SafeSetArmor(this Player player, int armor)
+ {
+ AntiCheat.NoHealthAntiCheatForPlayer(player.Name);
+ player.Armor = armor;
+ }
+
public static void SetJailTime(this User user, bool killed)
{
if (user == null)
@@ -179,7 +207,7 @@ namespace ReallifeGamemode.Server.Extensions
dbContext.SaveChanges();
}
ChatService.SendMessage(user.Player, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : ""));
- ChatService.SendMessage(user.Player, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds);
+ ChatService.SendMessage(user.Player, " !{#FFFF00}Fahndungslevel:~s~ " + newWanteds);
foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{
diff --git a/ReallifeGamemode.Server/Extensions/IntegerExtension.cs b/ReallifeGamemode.Server/Extensions/IntegerExtension.cs
index 6a62a509..743f06ad 100644
--- a/ReallifeGamemode.Server/Extensions/IntegerExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/IntegerExtension.cs
@@ -11,5 +11,10 @@
{
return "$" + string.Format(Main.SERVER_CULTURE, "{0:C0}", money).Replace("€", "").Trim();
}
+
+ public static string ToMoneyString(this double money)
+ {
+ return ((int)money).ToMoneyString();
+ }
}
}
diff --git a/ReallifeGamemode.Server/Extensions/ListExtensions.cs b/ReallifeGamemode.Server/Extensions/ListExtensions.cs
index ae9c665f..cf0cf8df 100644
--- a/ReallifeGamemode.Server/Extensions/ListExtensions.cs
+++ b/ReallifeGamemode.Server/Extensions/ListExtensions.cs
@@ -6,9 +6,27 @@ namespace ReallifeGamemode.Server.Extensions
{
internal static class ListExtensions
{
- public static bool Contains(this List list, Player client)
+ public static bool VectorEquals(this List vector3s, List compareToList)
{
- return list.Any(l => l.Handle.Value == client.Handle.Value);
+ if (compareToList is null || vector3s is null)
+ return false;
+ if (vector3s.Count != compareToList.Count)
+ return false;
+
+ for (int i = 0; i < vector3s.Count; i++)
+ {
+ Vector3 vector = vector3s[i];
+ Vector3 compareTo = compareToList[i];
+
+ if (vector.X != compareTo.X)
+ return false;
+ if (vector.Y != compareTo.Y)
+ return false;
+ if (vector.Z != compareTo.Z)
+ return false;
+ }
+
+ return true;
}
}
}
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index 41447614..9fac5d0f 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static List HealDecisions = new List();
public static int ReviveIncome = 100;
public static int dutyMedics = 0;
- public static int reviveTaskTime = 240;
+ public static int reviveTaskTime = 120;
public class HealDecision
{
@@ -146,24 +146,24 @@ namespace ReallifeGamemode.Server.Factions.Medic
dbContext.SaveChanges();
}
- activeDecision.dTarget.Health = 100;
+ activeDecision.dTarget.SafeSetHealth(100);
activeDecision.dTarget.SendNotification($"Du wurdest von ~g~{activeDecision.dMedic.Name} ~s~ für ~g~{activeDecision.dPrice.ToMoneyString()} geheilt", false);
activeDecision.dMedic.SendNotification($"Du hast ~g~{activeDecision.dTarget.Name} ~s~ für {activeDecision.dPrice.ToMoneyString()} geheilt", false);
- delHealTask(activeDecision.dTarget);
+ delHealTask(activeDecision.dTarget);
}
HealDecisions.Remove(activeDecision);
}
public static void UpdateTaskTimeLeft()
{
- DateTime actualTime = DateTime.Now;
if (ReviveTasks.Count != 0)
{
+ DateTime actualTime = DateTime.Now;
foreach (var task in ReviveTasks)
{
- if (task.MedicName != null)
+ if (task.MedicName != "none")
{
- var taskTimeLeft = Math.Abs((Int32)(((DateTimeOffset)actualTime).ToUnixTimeSeconds() - ((DateTimeOffset)task.Time).ToUnixTimeSeconds() - reviveTaskTime));
+ var taskTimeLeft = Math.Abs((int)(((DateTimeOffset)actualTime).ToUnixTimeSeconds() - ((DateTimeOffset)task.Time).ToUnixTimeSeconds() - reviveTaskTime));
task.TimeLeft = taskTimeLeft;
var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
if(medic != null) medic.TriggerEvent("setTaskTimeLeft", taskTimeLeft);
@@ -172,6 +172,23 @@ namespace ReallifeGamemode.Server.Factions.Medic
}
}
+ public static void UpdateHealTaskCheckpoint()
+ {
+ if (HealTasks.Count != 0)
+ {
+ foreach(var task in HealTasks)
+ {
+ if(task.MedicName != "none")
+ {
+ var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
+ var victim = PlayerService.GetPlayerByNameOrId(task.Victim);
+ task.Position = victim.Position;
+ medic.TriggerEvent("updateHealCheckpoint", victim.Position.X, victim.Position.Y, victim.Position.Z);
+ }
+ }
+ }
+ }
+
[RemoteEvent("loadMedicTasks")]
public void LoadMedicTasks(Player player, int type)
{
@@ -192,23 +209,38 @@ namespace ReallifeGamemode.Server.Factions.Medic
}
[RemoteEvent("updateMedicTask")]
- public void UpdateMedicTasks(Player player, int type, string victim)
+ public void UpdateMedicTasks(Player player, int type, string victim, bool isRemoved)
{
Player target = PlayerService.GetPlayerByNameOrId(victim);
switch (type)
{
case 0:
var reviveTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim);
- reviveTask.MedicName = player.Name;
+ if (isRemoved)
+ {
+ reviveTask.MedicName = "none";
+ }
+ else
+ {
+ reviveTask.MedicName = player.Name;
+ }
+
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Reviveauftrag von " + victim + " angenommen.", new List() { 2 });
target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ eilt zur Rettung.");
break;
case 1:
- var healTask = ReviveTasks.FirstOrDefault(t => t.Victim == victim);
- healTask.MedicName = player.Name;
- ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victim + " angenommen.", new List() { 2 });
- target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen.");
+ var healTask = HealTasks.FirstOrDefault(t => t.Victim == victim);
+ if (isRemoved)
+ {
+ healTask.MedicName = "none";
+ }
+ else
+ {
+ healTask.MedicName = player.Name;
+ ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat den Healauftrag von " + victim + " angenommen.", new List() { 2 });
+ target.SendNotification("~w~Sanitäter~g~ " + player.Name + "~w~ hat deinen Auftrag angenommen.");
+ }
break;
case 2:
@@ -221,8 +253,16 @@ namespace ReallifeGamemode.Server.Factions.Medic
public static void delHealTask(Player player)
{
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == player.Name);
- if(task != null) RemoveTaskFromList(task);
- player.SetData("healauftrag", false);
+ if (task != null)
+ {
+ player.SetData("healauftrag", false);
+ var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
+ if (task.MedicName != "none")
+ {
+ medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
+ }
+ RemoveTaskFromList(task);
+ }
}
[RemoteEvent("delHealTaskAsMedic")]
@@ -231,60 +271,27 @@ namespace ReallifeGamemode.Server.Factions.Medic
MedicTask task = HealTasks.FirstOrDefault(t => t.Victim == victimName);
RemoveTaskFromList(task);
player.SetData("healauftrag", false);
+
}
- [RemoteEvent("delReviveTask")]
- public static void delReviveTask(Player player)
+ public static void delReviveTask(Player target)
{
- MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
- RemoveTaskFromList(task);
- }
- [RemoteEvent("delReviveTaskMedic")]
- public static void delReviveTaskMedic(Player player)
- {
- MedicTask task = ReviveTasks.FirstOrDefault(t => t.MedicName == player.Name);
- RemoveTaskFromList(task);
- }
-
- [RemoteEvent("CutMedicEarnings")]
- public void CutMedicEarnings(Player player)
- {
- MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == player.Name);
- var medic = PlayerService.GetPlayerByNameOrId(task.MedicName);
- medic.TriggerEvent("cutMedicEarnings");
- }
- [RemoteEvent("PayCutMedicEarnings")]
- public void PayCutMedicEarnings(Player player)
- {
- using var dbContext = new DatabaseContext();
+ MedicTask task = ReviveTasks.FirstOrDefault(t => t.Victim == target.Name);
+ if (task != null)
{
- dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome / 4;
- player.SendNotification($"Du hast den Einsatzort erreicht und ~g~{Medic.ReviveIncome / 4}$ ~s~für die Fraktion verdient.");
- Medic.delReviveTaskMedic(player);
- dbContext.SaveChanges();
+ var medicPlayer = PlayerService.GetPlayerByNameOrId(task.MedicName);
+ if (task.MedicName != "none")
+ {
+ medicPlayer.TriggerEvent("destroyMedicTaskCheckpoint");
+ }
+ RemoveTaskFromList(task);
}
}
-
- [RemoteEvent("MedicTaskTimeout")]
- public void RemoveMedicTask(Player player)
+ [RemoteEvent("GetDutyMedics")]
+ public static void UpdateDutyMedics()
{
- Medic.delReviveTaskMedic(player);
- }
- [RemoteEvent("getTaskTimeLeft")]
- public void GetTaskTimeLeft(Player player, string victimName)
- {
- using var dbContext = new DatabaseContext();
- {
- var activeTaskTime = ReviveTasks.FirstOrDefault(t => t.MedicName == player.Name && t.Victim == victimName).TimeLeft;
-
- player.TriggerEvent("setTaskTimeLeft", activeTaskTime);
- }
- }
-
- public static void UpdateDutyMedics(int modifier)
- {
- dutyMedics = dutyMedics + modifier;
+ dutyMedics = NAPI.Pools.GetAllPlayers().Where(c => c.GetData("duty") == true && c.GetUser().FactionId == 2).ToList().Count;
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", dutyMedics);
}
}
diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs
index 1ff424a2..78284419 100644
--- a/ReallifeGamemode.Server/Finance/Economy.cs
+++ b/ReallifeGamemode.Server/Finance/Economy.cs
@@ -66,7 +66,6 @@ namespace ReallifeGamemode.Server.Finance
return propertyTaxation;
}
-
public static void SetPaycheck(Player client, bool minusJail = true)
{
User user = client.GetUser();
@@ -76,7 +75,7 @@ namespace ReallifeGamemode.Server.Finance
int vehicleTaxation = GetVehicleTaxation(client);
int rentalFees = GetRentalFees(client);
- int healthInsurance = (int)((bankAccount + user.Handmoney)* 0.001);
+ int healthInsurance = (int)((bankAccount + user.Handmoney) * 0.001);
if (healthInsurance < 0)
{
healthInsurance = 0;
@@ -86,7 +85,17 @@ namespace ReallifeGamemode.Server.Finance
if (user.Faction != null && user.FactionRank != null)
{
- factionMoney = user.FactionRank.Order * 500;
+ using var dbContext = new DatabaseContext();
+ int factionRankCount = dbContext.FactionRanks.Where(r => r.FactionId == user.FactionId).Count();
+
+ int factionWage = (3000 / factionRankCount) * user.FactionRank.Order;
+
+ if (wage > 2500)
+ {
+ factionWage /= 2;
+ }
+
+ factionMoney = factionWage;
}
int otheramount = user.otheramount;
int amount = wage - (int)(wage * financialInterest) - vehicleTaxation - (int)propertyTax + (int)financialHelp - rentalFees - healthInsurance + (factionMoney ?? 0) + otheramount;
@@ -178,21 +187,23 @@ namespace ReallifeGamemode.Server.Finance
public static void Timer_Elapsed()
{
using var dbContext = new DatabaseContext();
- foreach (var player in NAPI.Pools.GetAllPlayers())
+ foreach (var player in NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn()))
{
User user = player.GetUser(dbContext);
- if (player.IsLoggedIn())
+ if(user == null)
{
- user.PlayedMinutes += 1;
- if (user.PaydayTimer <= 0)
- {
- Economy.SetPaycheck(player);
- user.PaydayTimer = 60;
- }
- else if (user.PaydayTimer > 0)
- {
- user.PaydayTimer -= 1;
- }
+ continue;
+ }
+
+ user.PlayedMinutes += 1;
+ if (user.PaydayTimer <= 0)
+ {
+ Economy.SetPaycheck(player);
+ user.PaydayTimer = 60;
+ }
+ else if (user.PaydayTimer > 0)
+ {
+ user.PaydayTimer -= 1;
}
}
dbContext.SaveChanges();
diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs
index 335920fa..825fe065 100644
--- a/ReallifeGamemode.Server/Gangwar/Turf.cs
+++ b/ReallifeGamemode.Server/Gangwar/Turf.cs
@@ -199,6 +199,7 @@ namespace ReallifeGamemode.Server.Gangwar
});
}
+
public void enter(Player client)
{
User user = client.GetUser();
diff --git a/ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs b/ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs
new file mode 100644
index 00000000..ba5ded6a
--- /dev/null
+++ b/ReallifeGamemode.Server/Inventory/Items/AssaultRifle.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ReallifeGamemode.Server.Inventory.Items
+{
+ class AssaultRifle : WeaponDealItem
+ {
+ public override int Id => 13;
+ public override string Name => "AssaultRifle";
+ public override string Description => "Waffe";
+ public override int Gewicht => 500;
+ public override string Einheit => "g";
+ public override uint Object => 3666746839; //3061944032
+ public override int Price => 0;
+ }
+}
+
diff --git a/ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs b/ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs
new file mode 100644
index 00000000..573b8349
--- /dev/null
+++ b/ReallifeGamemode.Server/Inventory/Items/AssaultSmg.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ReallifeGamemode.Server.Inventory.Items
+{
+ class AssaultSmg : WeaponDealItem
+ {
+ public override int Id => 14;
+ public override string Name => "AssaultSmg";
+ public override string Description => "Waffe";
+ public override int Gewicht => 500;
+ public override string Einheit => "g";
+ public override uint Object => 3666746839; //3061944032
+ public override int Price => 0;
+ }
+}
+
diff --git a/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs b/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs
new file mode 100644
index 00000000..e663d6cb
--- /dev/null
+++ b/ReallifeGamemode.Server/Inventory/Items/AviateChips.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ReallifeGamemode.Server.Inventory.Items
+{
+ class AChips : FoodItem
+ {
+ public override int Id => 104;
+ public override string Name => "Aviates Chips";
+ public override string Description => "aviate liebt sie.";
+ public override int Gewicht => 10;
+ public override string Einheit => "g";
+ public override int HpAmount => 10;
+ public override uint Object => 2240524752;
+ public override int Price => 20;
+ }
+}
diff --git a/ReallifeGamemode.Server/Inventory/Items/CombatPDW.cs b/ReallifeGamemode.Server/Inventory/Items/CombatPDW.cs
new file mode 100644
index 00000000..7247cbcd
--- /dev/null
+++ b/ReallifeGamemode.Server/Inventory/Items/CombatPDW.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ReallifeGamemode.Server.Inventory.Items
+{
+ class CombatPDW : WeaponDealItem
+ {
+ public override int Id => 12;
+ public override string Name => "CombatPDW";
+ public override string Description => "Waffe";
+ public override int Gewicht => 500;
+ public override string Einheit => "g";
+ public override uint Object => 3666746839; //3061944032
+ public override int Price => 0;
+ }
+}
+
diff --git a/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs b/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs
index 43faf49f..2db9394c 100644
--- a/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs
+++ b/ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs
@@ -9,7 +9,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
public override int Id => 7;
public override string Name => "CompactRifle";
public override string Description => "Waffe";
- public override int Gewicht => 3080;
+ public override int Gewicht => 500;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
diff --git a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
index 77f76cd4..03073fb5 100644
--- a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
+++ b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
@@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
amountToAdd = 100 - player.Health;
}
- player.Health += amountToAdd;
+ player.SafeSetHealth(player.Health + amountToAdd);
player.SendNotification("Du hast ein/einen ~y~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~gegessen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
}
diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs
index 617978c3..e8eee500 100644
--- a/ReallifeGamemode.Server/Job/BusDriverJob.cs
+++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs
@@ -1,15 +1,13 @@
using System;
using System.Collections.Generic;
using GTANetworkAPI;
-using Newtonsoft.Json;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Models;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Database.Entities;
-
+using System.Linq;
namespace ReallifeGamemode.Server.Job
{
@@ -19,628 +17,633 @@ namespace ReallifeGamemode.Server.Job
public override string Name => "Busfahrer";
- private const int MARKER_DELAY = 4000;
- private const int MARKER_ID = 1;
- private const int MARKER_SIZE = 7;
- private const int MARKER_DIST = 6;
- private const string MARKER_EVENT = "busDriverJob";
+ public static Dictionary> playerRoutePair1 = new Dictionary>(); //skill 1
+ public static Dictionary> playerRoutePair2 = new Dictionary>(); //skill 2
+ public static Dictionary> playerRoutePair3 = new Dictionary>(); //skill 3
+
+ public static Dictionary> playerRouteCurrent = new Dictionary>();
+
+ public const int MARKER_DELAY = 4000;
+ public const int MARKER_ID = 1;
+ public const int MARKER_SIZE = 7;
+ public const int MARKER_DIST = 6;
+ public const string MARKER_EVENT = "BUSJOB:BusInCheckpoint";
+
+ public const uint VEHICLE_BEGINNER = (uint)VehicleHash.Bus;
+ public const uint VEHICLE_INTERMEDIATE = (uint)VehicleHash.Coach;
+ public const uint VEHICLE_PROFESSIONAL = (uint)VehicleHash.Tourbus;
+
+ public const int WAGE_BEGINNER = 800;
+ public const int WAGE_INTERMEDIATE = 1200;
+ public const int WAGE_PROFESSIOAL = 1800;
+
+ public const string BEGINNER = "Anfänger";
+ public const string INTERMEDIATE = "Fortgeschrittener";
+ public const string PROFESSIONAL = "Profi";
+
+ public const int SKILL_BEGINNER = 0;
+ public const int SKILL_INTERMEDIATE = 300;
+ public const int SKILL_PROFESSIONAL = 800;
+
+ //-623.76, -2083.1008, 5.9822865
+
+ private static int spawnIndex = 0;
+
+ private readonly List VEHICLE_SPAWNS = new List()
+ {
+ new Vector3(-555.02136, -2162.153, 5.988391),
+ new Vector3(-568.4366, -2179.2156, 5.988391),
+ new Vector3(-582.3364, -2194.5134, 5.988391),
+ new Vector3(-598.5143, -2207.357, 5.988893),
+ };
+
+ private const float VEHICLE_HEADING = 50; //6.618084f;
public override bool NeedVehicleToStart => false;
- private readonly IReadOnlyCollection Skill1Route1 = new List//Bus_Skill_1_Route_1
+ private readonly Dictionary> ROUTE_BEGINNER = new Dictionary>//Bus_Skill_1_Route_1
{
- new Vector3(-1018.1577758789062, -2732.403564453125, 10.658967971801758),
- new Vector3(-153.04013061523438, -2033.8385009765625, 19.712543487548828),
- new Vector3(50.42457580566406, -1536.9090576171875, 26.184476852416992),
- new Vector3(361.1451721191406, -1064.6044921875, 26.36113166809082),
- new Vector3(119.01465606689453, -785.609619140625, 28.267763137817383),
- new Vector3(-172.00689697265625, -815.9910888671875, 28.13607406616211),
- new Vector3(-707.7088623046875, -826.9969482421875, 20.451000213623047),
- new Vector3(-658.1038818359375, -1393.321533203125, 7.509778022766113),
- new Vector3(-1018.1826171875, -2732.371826171875, 10.656649589538574),
- new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244),
- }.AsReadOnly();
+ { 0,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-1018.1577758789062, -2732.403564453125, 10.658967971801758) ,
+ new Vector3(-153.04013061523438, -2033.8385009765625, 19.712543487548828) ,
+ new Vector3(50.42457580566406, -1536.9090576171875, 26.184476852416992) ,
+ new Vector3(361.1451721191406, -1064.6044921875, 26.36113166809082) ,
+ new Vector3(119.01465606689453, -785.609619140625, 28.267763137817383) ,
+ new Vector3(-172.00689697265625, -815.9910888671875, 28.13607406616211) ,
+ new Vector3(-707.7088623046875, -826.9969482421875, 20.451000213623047) ,
+ new Vector3(-658.1038818359375, -1393.321533203125, 7.509778022766113) ,
+ new Vector3(-1018.1826171875, -2732.371826171875, 10.656649589538574) ,
+ new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244)
+ }
+ },
+ { 1,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-567.6445922851562, -1233.4453125, 12.050300598144531),
+ new Vector3(-509.224609375, -668.373291015625, 30.02402877807617),
+ new Vector3(55.00559997558594, -749.8328247070312, 41.11421203613281),
+ new Vector3(-173.65509033203125, -152.5533905029297, 40.615516662597656),
+ new Vector3(-523.8310546875, -266.884033203125, 32.291507720947266),
+ new Vector3(-1167.646728515625, -400.75, 32.39745330810547),
+ new Vector3(-1408.329345703125, -567.8721923828125, 27.22767448425293),
+ new Vector3(-1213.3565673828125, -1214.755859375, 4.5853986740112305),
+ new Vector3(-746.8554077148438, -2372.227783203125, 11.740862846374512),
+ new Vector3(-660.7366333007812, -2206.03662109375, 2.988998889923096),
+ }
+ },
+ { 2,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(423.4793395996094, -2143.4169921875, 15.23659896850586),
+ new Vector3(875.1618041992188, -1766.7913818359375, 26.780052185058594),
+ new Vector3(1166.110107421875, -1422.72265625, 31.477935791015625),
+ new Vector3(807.715087890625, -1356.7987060546875, 23.29298210144043),
+ new Vector3(785.9387817382812, -780.5958251953125, 23.333005905151367),
+ new Vector3(895.2793579101562, 55.24346923828125, 75.82550048828125),
+ new Vector3(775.8052368164062, 596.2352905273438, 122.77734375),
+ new Vector3(307.64422607421875, -762.0469360351562, 26.197702407836914),
+ new Vector3(-105.66091918945312, -1683.9630126953125, 26.190542221069336),
+ new Vector3(-644.0516967773438, -2218.673828125, 2.991928577423096),
+ }
+ },
+ { 3,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-694.1781616210938, -1199.3873291015625, 7.50633716583252),
+ new Vector3(-1408.264892578125, -567.5278930664062, 27.21875),
+ new Vector3(-1681.6112060546875, -503.3702392578125, 34.79117965698242),
+ new Vector3(-1427.05712890625, -90.17198181152344, 49.015113830566406),
+ new Vector3(-686.4015502929688, -374.3297424316406, 31.17094802856445),
+ new Vector3(-509.60107421875, -668.41796875, 30.02873229980469),
+ new Vector3(234.6927032470703, -857.5449829101562, 26.747934341430664),
+ new Vector3(787.8258666992188, -1364.9345703125, 23.424083709716797),
+ new Vector3(825.1477661132812, -1634.5733642578125, 27.521774291992188),
+ new Vector3(-105.38816833496094, -1683.646728515625, 26.19083023071289),
+ new Vector3(-655.6530151367188, -2209.579345703125, 2.98785924911499),
+ }
+ },
+ };
- private readonly IReadOnlyCollection Skill1Route2 = new List//Bus_Skill_1_Route_2
+ private readonly Dictionary> ROUTE_INTERMEDIATE = new Dictionary>
{
- new Vector3(-567.6445922851562, -1233.4453125, 12.050300598144531),
- new Vector3(-509.224609375, -668.373291015625, 30.02402877807617),
- new Vector3(55.00559997558594, -749.8328247070312, 41.11421203613281),
- new Vector3(-173.65509033203125, -152.5533905029297, 40.615516662597656),
- new Vector3(-523.8310546875, -266.884033203125, 32.291507720947266),
- new Vector3(-1167.646728515625, -400.75, 32.39745330810547),
- new Vector3(-1408.329345703125, -567.8721923828125, 27.22767448425293),
- new Vector3(-1213.3565673828125, -1214.755859375, 4.5853986740112305),
- new Vector3(-746.8554077148438, -2372.227783203125, 11.740862846374512),
- new Vector3(-660.7366333007812, -2206.03662109375, 2.988998889923096),
- }.AsReadOnly();
+ { 0,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-1042.6405029296875, -2718.244384765625, 9.493847846984863),
+ new Vector3(832.205322265625, -11.559977531433105, 76.72754669189453),
+ new Vector3(2563.96826171875, 2633.976806640625, 35.279945373535156),
+ new Vector3(1684.845947265625, 6402.1533203125, 28.877294540405273),
+ new Vector3(-170.82965087890625, 6374.9560546875, 28.695466995239258),
+ new Vector3(-1524.5302734375, 4998.1220703125, 60.54846954345703),
+ new Vector3(-3234.168701171875, 974.0481567382812, 10.890801429748535),
+ new Vector3(-1331.8995361328125, -1052.2794189453125, 5.4408793449401855),
+ new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244),
+ }
+ },
+ { 1,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(1925.767333984375, 2614.566162109375, 46.16560363769531),
+ new Vector3(299.0667419433594, 2642.93798828125, 44.60177993774414),
+ new Vector3(1162.4556884765625, 1806.3663330078125, 74.3133773803711),
+ new Vector3(1297.0450439453125, 1105.742919921875, 105.6315689086914),
+ new Vector3(-524.4381103515625, -268.2084045410156, 35.28974533081055),
+ new Vector3(427.09521484375, -960.2006225585938, 29.13089942932129),
+ new Vector3(-567.5792846679688, -2212.6533203125, 5.859220504760742),
+ }
+ },
+ { 2,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-1855.54,153.604,79.0297),
+ new Vector3(-1538.72,1375.19,124.3),
+ new Vector3(-1101.74,2668.48,17.7363),
+ new Vector3(1964.14,3718.04,31.2255),
+ new Vector3(2566.1,396.879,107.463),
+ new Vector3(254.405,-982.937,28.274),
+ new Vector3(-562.68, -2203.85, 4.5),
+ }
+ },
+ { 3,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-1037.8,-2716.02,12.7963),
+ new Vector3(1662.69,4849.72,40.9165),
+ new Vector3(57.8575,3735.46,38.7301),
+ new Vector3(-1109.48,2681,17.8602),
+ new Vector3(-2536.35,2322.65,32.0599),
+ new Vector3(-3232.01,961.997,12.1515),
+ new Vector3(-3014.22,364.543,13.7242),
+ new Vector3(-1580.52,-652.24,28.5874),
+ new Vector3(-578.954,-2224.8,4.75774),
+ }
+ },
+ };
- private readonly IReadOnlyCollection Skill1Route3 = new List//Bus_Skill_1_Route_3
+ private readonly Dictionary> ROUTE_PROFESSIONAL = new Dictionary>
{
- new Vector3(423.4793395996094, -2143.4169921875, 15.23659896850586),
- new Vector3(875.1618041992188, -1766.7913818359375, 26.780052185058594),
- new Vector3(1166.110107421875, -1422.72265625, 31.477935791015625),
- new Vector3(807.715087890625, -1356.7987060546875, 23.29298210144043),
- new Vector3(785.9387817382812, -780.5958251953125, 23.333005905151367),
- new Vector3(895.2793579101562, 55.24346923828125, 75.82550048828125),
- new Vector3(775.8052368164062, 596.2352905273438, 122.77734375),
- new Vector3(307.64422607421875, -762.0469360351562, 26.197702407836914),
- new Vector3(-105.66091918945312, -1683.9630126953125, 26.190542221069336),
- new Vector3(-644.0516967773438, -2218.673828125, 2.991928577423096),
- }.AsReadOnly();
-
- private readonly IReadOnlyCollection Skill1Route4 = new List//Bus_Skill_1_Route_4
- {
-
- new Vector3(-694.1781616210938, -1199.3873291015625, 7.50633716583252),
- new Vector3(-1408.264892578125, -567.5278930664062, 27.21875),
- new Vector3(-1681.6112060546875, -503.3702392578125, 34.79117965698242),
- new Vector3(-1427.05712890625, -90.17198181152344, 49.015113830566406),
- new Vector3(-686.4015502929688, -374.3297424316406, 31.17094802856445),
- new Vector3(-509.60107421875, -668.41796875, 30.02873229980469),
- new Vector3(234.6927032470703, -857.5449829101562, 26.747934341430664),
- new Vector3(787.8258666992188, -1364.9345703125, 23.424083709716797),
- new Vector3(825.1477661132812, -1634.5733642578125, 27.521774291992188),
- new Vector3(-105.38816833496094, -1683.646728515625, 26.19083023071289),
- new Vector3(-655.6530151367188, -2209.579345703125, 2.98785924911499),
- }.AsReadOnly();
-
- private readonly IReadOnlyCollection Skill2Route1 = new List//Bus_Skill_2_Route_1
- {
-
- new Vector3(-1042.6405029296875, -2718.244384765625, 9.493847846984863),
- new Vector3(832.205322265625, -11.559977531433105, 76.72754669189453),
- new Vector3(2563.96826171875, 2633.976806640625, 35.279945373535156),
- new Vector3(1684.845947265625, 6402.1533203125, 28.877294540405273),
- new Vector3(-170.82965087890625, 6374.9560546875, 28.695466995239258),
- new Vector3(-1524.5302734375, 4998.1220703125, 60.54846954345703),
- new Vector3(-3234.168701171875, 974.0481567382812, 10.890801429748535),
- new Vector3(-1331.8995361328125, -1052.2794189453125, 5.4408793449401855),
- new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244),
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill2Route2 = new List//Bus_Skill_2_Route_2
- {
- new Vector3(1925.767333984375, 2614.566162109375, 46.16560363769531),
- new Vector3(299.0667419433594, 2642.93798828125, 44.60177993774414),
- new Vector3(1162.4556884765625, 1806.3663330078125, 74.3133773803711),
- new Vector3(1297.0450439453125, 1105.742919921875, 105.6315689086914),
- new Vector3(-524.4381103515625, -268.2084045410156, 35.28974533081055),
- new Vector3(427.09521484375, -960.2006225585938, 29.13089942932129),
- new Vector3(-567.5792846679688, -2212.6533203125, 5.859220504760742),
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill2Route3 = new List//Bus_Skill_2_Route_3
- {
- new Vector3(-1855.54,153.604,79.0297),
- new Vector3(-1538.72,1375.19,124.3),
- new Vector3(-1101.74,2668.48,17.7363),
- new Vector3(1964.14,3718.04,31.2255),
- new Vector3(2566.1,396.879,107.463),
- new Vector3(254.405,-982.937,28.274),
- new Vector3(-562.68, -2203.85, 4.5),
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill2Route4 = new List//Bus_Skill_2_Route_4
- {
- new Vector3(-1037.8,-2716.02,12.7963),
- new Vector3(1662.69,4849.72,40.9165),
- new Vector3(57.8575,3735.46,38.7301),
- new Vector3(-1109.48,2681,17.8602),
- new Vector3(-2536.35,2322.65,32.0599),
- new Vector3(-3232.01,961.997,12.1515),
- new Vector3(-3014.22,364.543,13.7242),
- new Vector3(-1580.52,-652.24,28.5874),
- new Vector3(-578.954,-2224.8,4.75774),
-
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill3Route1 = new List//Bus_Skill_3_Route_1
- {
-
- new Vector3(-598.849365234375, -2053.087646484375, 5.8428778648376465),
- new Vector3(-229.679931640625, -2049.821533203125, 27.384798049926758),
- new Vector3(-72.33480834960938, -615.8173217773438, 35.91234588623047),
- new Vector3(-176.9166717529297, -153.85665893554688, 43.38493728637695),
- new Vector3(-508.5746765136719, -261.1121826171875, 35.247962951660156),
- new Vector3(-1396.5457763671875, 51.69581604003906, 53.21350860595703),
- new Vector3(-1911.845458984375, 205.62884521484375, 84.06185150146484),
- new Vector3(-1675.4029541015625, 488.7856140136719, 128.6395721435547),
- new Vector3(-995.8155517578125, 589.4381713867188, 102.18698120117188),
- new Vector3(-314.6571350097656, 451.9184875488281, 107.99801635742188),
- new Vector3(211.09194946289062, 350.1848449707031, 105.41163635253906),
- new Vector3(599.4515380859375, 626.0756225585938, 128.6754608154297),
- new Vector3(969.324462890625, 164.03329467773438, 80.59388732910156),
- new Vector3(1069.521240234375, -763.7572631835938, 57.43597412109375),
- new Vector3(1421.075927734375, -1854.2821044921875, 70.56175994873047),
- new Vector3(268.5604248046875, -2070.274169921875, 16.816179275512695),
- new Vector3(-147.51795959472656, -1974.3182373046875, 22.48438262939453),
- new Vector3(-569.0294189453125, -2210.80908203125, 5.571292877197266),
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill3Route2 = new List//Bus_Skill_3_Route_2
- {
-
- new Vector3(-597.8766479492188, -2053.534423828125, 5.853154182434082),
- new Vector3(-895.4871826171875, -2074.380126953125, 8.602267265319824),
- new Vector3(-667.8001708984375, -1233.9366455078125, 10.274462699890137),
- new Vector3(-1349.004150390625, -1119.2432861328125, 4.00660514831543),
- new Vector3(-2127.448974609375, -333.7845153808594, 13.013818740844727),
- new Vector3(-1426.419189453125, -90.23416137695312, 51.81801223754883),
- new Vector3(-827.4555053710938, -235.72817993164062, 36.84095764160156),
- new Vector3(-558.2310791015625, -161.801513671875, 37.93125534057617),
- new Vector3(220.4048309326172, -852.0598754882812, 29.874643325805664),
- new Vector3(363.25042724609375, -1470.600830078125, 28.91864776611328),
- new Vector3(-200.07644653320312, -1941.02783203125, 27.382631301879883),
- new Vector3(-605.2278442382812, -2087.974853515625, 5.752280235290527),
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill3Route3 = new List//Bus_Skill_3_Route_3
- {
- new Vector3(-146.62071, -2178.8228, 9.194298),
- new Vector3(14.580393, -1578.6385, 28.212185),
- new Vector3(222.91612, -1098.8556, 28.227453),
- new Vector3(246.44946, -648.45496, 38.420746),
- new Vector3(102.181, -298.95276, 45.04399),
- new Vector3(-104.91002, -606.26013, 35.06103),
- new Vector3(-288.1007, -1204.5107, 23.403156),
- new Vector3(-166.23526, -1574.4166, 34.152023),
- new Vector3(-60.337997, -1976.121, 15.486664),
- new Vector3(-599.1891, -2049.2695, 5.14637),
- }.AsReadOnly();
- private readonly IReadOnlyCollection Skill3Route4 = new List//Bus_Skill_3_Route_4
- {
-
- new Vector3(-562.68, -2203.85, 5.5),
- }.AsReadOnly();
+ { 0,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ //new Vector3(-598.849365234375, -2053.087646484375, 5.8428778648376465),
+ new Vector3(-229.679931640625, -2049.821533203125, 27.384798049926758),
+ new Vector3(-72.33480834960938, -615.8173217773438, 35.91234588623047),
+ new Vector3(-176.9166717529297, -153.85665893554688, 43.38493728637695),
+ new Vector3(-508.5746765136719, -261.1121826171875, 35.247962951660156),
+ new Vector3(-1396.5457763671875, 51.69581604003906, 53.21350860595703),
+ new Vector3(-1911.845458984375, 205.62884521484375, 84.06185150146484),
+ new Vector3(-1675.4029541015625, 488.7856140136719, 128.6395721435547),
+ new Vector3(-995.8155517578125, 589.4381713867188, 102.18698120117188),
+ new Vector3(-314.6571350097656, 451.9184875488281, 107.99801635742188),
+ new Vector3(211.09194946289062, 350.1848449707031, 105.41163635253906),
+ new Vector3(599.4515380859375, 626.0756225585938, 128.6754608154297),
+ new Vector3(969.324462890625, 164.03329467773438, 80.59388732910156),
+ new Vector3(1069.521240234375, -763.7572631835938, 57.43597412109375),
+ new Vector3(1421.075927734375, -1854.2821044921875, 70.56175994873047),
+ new Vector3(268.5604248046875, -2070.274169921875, 16.816179275512695),
+ new Vector3(-147.51795959472656, -1974.3182373046875, 22.48438262939453),
+ new Vector3(-569.0294189453125, -2210.80908203125, 5.571292877197266),
+ }
+ },
+ { 1,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ //new Vector3(-597.8766479492188, -2053.534423828125, 5.853154182434082),
+ new Vector3(-895.4871826171875, -2074.380126953125, 8.602267265319824),
+ new Vector3(-667.8001708984375, -1233.9366455078125, 10.274462699890137),
+ new Vector3(-1349.004150390625, -1119.2432861328125, 4.00660514831543),
+ new Vector3(-2127.448974609375, -333.7845153808594, 13.013818740844727),
+ new Vector3(-1426.419189453125, -90.23416137695312, 51.81801223754883),
+ new Vector3(-827.4555053710938, -235.72817993164062, 36.84095764160156),
+ new Vector3(-558.2310791015625, -161.801513671875, 37.93125534057617),
+ new Vector3(220.4048309326172, -852.0598754882812, 29.874643325805664),
+ new Vector3(363.25042724609375, -1470.600830078125, 28.91864776611328),
+ new Vector3(-200.07644653320312, -1941.02783203125, 27.382631301879883),
+ new Vector3(-605.2278442382812, -2087.974853515625, 5.752280235290527),
+ }
+ },
+ { 2,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(-146.62071, -2178.8228, 9.194298),
+ new Vector3(14.580393, -1578.6385, 28.212185),
+ new Vector3(222.91612, -1098.8556, 28.227453),
+ new Vector3(246.44946, -648.45496, 38.420746),
+ new Vector3(102.181, -298.95276, 45.04399),
+ new Vector3(-104.91002, -606.26013, 35.06103),
+ new Vector3(-288.1007, -1204.5107, 23.403156),
+ new Vector3(-166.23526, -1574.4166, 34.152023),
+ new Vector3(-60.337997, -1976.121, 15.486664),
+ new Vector3(-599.1891, -2049.2695, 5.14637),
+ }
+ },
+ };
public BusDriverJob()
{
JobStart += BusDriverJob_JobStart;
+ JobStop += _JobStop;
}
private void BusDriverJob_JobStart(Player player)
{
- /*List listRouteTexts = new List();
- List listRouteTexts2 = new List();
- List listRouteTexts3 = new List();
+ User user = player.GetUser();
+ player.TriggerEvent("SERVER:StartBusJob", user.BusSkill);
+ }
- Vehicle veh = player.Vehicle;
+ private void _JobStop(Player player)
+ {
+ if (!playerVehiclePair.ContainsKey(player))
+ return;
- if ((VehicleHash)veh.Model == VehicleHash.Bus)
+ CheckPointHandle.DeleteCheckpoints(player);
+ playerVehiclePair[player].Delete();
+ playerVehiclePair.Remove(player);
+ }
+
+ public string getPlayerRouteType(Player player)
+ {
+ if (!playerRouteCurrent.ContainsKey(player.Name))
+ return "none";
+
+ List selectedRoute = playerRouteCurrent[player.Name];
+
+ if (ROUTE_BEGINNER.Values.Where(v => v.VectorEquals(selectedRoute)).Count() != 0)
+ return BEGINNER;
+ else if (ROUTE_INTERMEDIATE.Values.Where(v => v.VectorEquals(selectedRoute)).Count() != 0)
+ return INTERMEDIATE;
+ else if (ROUTE_PROFESSIONAL.Values.Where(v => v.VectorEquals(selectedRoute)).Count() != 0)
+ return PROFESSIONAL;
+
+ return "none";
+ }
+
+ public int getPlayerRouteInex(Player player)
+ {
+ if (!playerRouteCurrent.ContainsKey(player.Name))
+ return -1;
+
+ List selectedRoute = playerRouteCurrent[player.Name];
+
+ for (int i = 0; i < 100; i++)
{
- listRouteTexts2.Add("Kurz 1");
- listRouteTexts2.Add("Kurz 2"); ;
+ if (!ROUTE_BEGINNER.ContainsKey(i) && !ROUTE_INTERMEDIATE.ContainsKey(i) && !ROUTE_PROFESSIONAL.ContainsKey(i))
+ break;
- player.TriggerEvent("showBusRouteMenu", JsonConvert.SerializeObject(listRouteTexts2));
+ if (ROUTE_BEGINNER.ContainsKey(i))
+ {
+ if (ROUTE_BEGINNER[i].VectorEquals(selectedRoute))
+ return i;
+ }
+ if (ROUTE_INTERMEDIATE.ContainsKey(i))
+ {
+ if (ROUTE_INTERMEDIATE[i].VectorEquals(selectedRoute))
+ return i;
+ }
+ if (ROUTE_PROFESSIONAL.ContainsKey(i))
+ {
+ if (ROUTE_PROFESSIONAL[i].VectorEquals(selectedRoute))
+ return i;
+ }
}
- else if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
+
+ return -1;
+ }
+
+ private uint getPlayerJobVehicle(Player player)
+ {
+ string type = getPlayerRouteType(player);
+
+ if (type == BEGINNER)
+ return VEHICLE_BEGINNER;
+ else if (type == INTERMEDIATE)
+ return VEHICLE_INTERMEDIATE;
+ else if (type == PROFESSIONAL)
+ return VEHICLE_PROFESSIONAL;
+
+ return 0;
+ }
+
+ [RemoteEvent("CLIENT:StartBusRoute")]
+ public void StartBusRoute(Player player, string type)
+ {
+ User user = player.GetUser();
+ if (type == INTERMEDIATE && user.BusSkill < SKILL_INTERMEDIATE) { player.TriggerEvent("MenuSelect:Error"); return; }
+ if (type == PROFESSIONAL && user.BusSkill < SKILL_PROFESSIONAL) { player.TriggerEvent("MenuSelect:Error"); return; }
+
+ List selectedRoute = new List();
+ int index = -1;
+
+ if (playerRouteCurrent.ContainsKey(player.Name))
{
- listRouteTexts3.Add("Mittel 1");
- player.TriggerEvent("showBusRouteMenu", JsonConvert.SerializeObject(listRouteTexts3));
+ index = getPlayerRouteInex(player);
}
else
{
- listRouteTexts.Add("Lang 1");
- listRouteTexts.Add("Lang 2");
-
- player.TriggerEvent("showBusRouteMenu", JsonConvert.SerializeObject(listRouteTexts));
- }*/
- /*if (player.GetUser().BusSkill < 300)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 3);
- switch (rroute)
- {
- case 1:
- {
- StartBusRoute(player, "Route1");
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
- break;
- }
- case 2:
- {
- StartBusRoute(player, "Route2");
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
- break;
- }
- }
+ Random random = new Random();
+ index = random.Next(0, 7);
}
- if (player.GetUser().BusSkill > 300 && player.GetUser().BusSkill < 300)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 3);
- switch (rroute)
- {
- case 1:
- {
- StartBusRoute(player, "Route3");
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
- break;
- }
- case 2:
- {
- StartBusRoute(player, "Route4");
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
- break;
- }
- }
- }
- if (player.GetUser().BusSkill >= 800)
- {
- StartBusRoute(player, "Route5");
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 5");
- }*/
- }
- [RemoteEvent("startBusRoute")]
- public void StartBusRoute(Player player, string type)
- {
- Vehicle veh = player.Vehicle;
- if (player.VehicleSeat == 0)
+ if (type == BEGINNER)
{
- if (type == "RouteStart")
+ index %= ROUTE_BEGINNER.Count;
+ if (playerRoutePair1.ContainsKey(player.Name))
{
- if ((VehicleHash)veh.Model == VehicleHash.Bus)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 5);
- switch (rroute)
- {
- case 1:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
- player.SetData("Route", "Skill1Route1");
- break;
- }
- case 2:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
- player.SetData("Route", "Skill1Route2");
- break;
- }
- case 3:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
- player.SetData("Route", "Skill1Route3");
- break;
- }
- case 4:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route4, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
- player.SetData("Route", "Skill1Route4");
- break;
- }
- }
- player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
- player.TriggerEvent("CLIENT:SetDoorOpen", 1, false, false);
- player.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
- player.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 0, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 1, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 2, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 3, false);
- }
- if ((VehicleHash)veh.Model == VehicleHash.Coach)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 5);
- switch (rroute)
- {
- case 1:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
- player.SetData("Route", "Skill2Route1");
- break;
- }
- case 2:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
- player.SetData("Route", "Skill2Route2");
- break;
- }
- case 3:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
- player.SetData("Route", "Skill2Route3");
- break;
- }
- case 4:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route4, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
- player.SetData("Route", "Skill2Route3");
- break;
- }
- }
- player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 0, false);
- }
- if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 4);
- switch (rroute)
- {
- case 1:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route1, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 1");
- player.SetData("Route", "Skill3Route1");
- break;
- }
- case 2:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route2, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 2");
- player.SetData("Route", "Skill3Route2");
- break;
- }
- case 3:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route3, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 3");
- player.SetData("Route", "Skill3Route3");
- break;
- }
- case 4:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route4, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
- player.SendChatMessage("~y~Job: ~w~Route wurde gesetzt: ~g~Route 4");
- player.SetData("Route", "Skill3Route4");
- break;
- }
- }
- player.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
- player.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 2, false);
- player.TriggerEvent("CLIENT:SetDoorShut", 3, false);
- }
- }
- /*if (type == "Skill1Route1")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill1Route2")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill1Route3")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill1Route4")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route4, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill2Route1")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill2Route2")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill2Route3")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill2Route4")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route4, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill3Route1")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route1, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill3Route2")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route2, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill3Route3")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route3, 4000, 1, 7, 4, true, "busDriverJob");
- }
- if (type == "Skill3Route4")
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill3Route4, 4000, 1, 7, 4, true, "busDriverJob");
- }*/
- //player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/StartJob", "wav", 50);
- }
- }
-
- public static void payWage(Player jobber, int wage)
- {
- using (var dbContext = new DatabaseContext())
- {
- if (jobber.VehicleSeat == 0)
- {
- jobber.GetUser(dbContext).Wage += wage;
- //jobber.SendNotification($"~y~[JOB] ~g~+{wage}$");
- jobber.GetUser(dbContext).BusSkill++;
- dbContext.SaveChanges();
- if (jobber.GetUser(dbContext).BusSkill == 300)
- {
- jobber.SendChatMessage($"~y~Job: ~w~Du hast nun ~g~Skill-Level 2 ~w~erreicht!");
- jobber.SendChatMessage($"~y~Job: ~w~Du kannst jetzt auch mit dem Coach fahren!");
- }
- if (jobber.GetUser(dbContext).BusSkill == 800)
- {
- jobber.SendChatMessage($"~y~Job: ~w~Du hast nun ~g~Skill-Level 3 ~w~erreicht!");
- jobber.SendChatMessage($"~y~Job: ~w~Du kannst jetzt mit dem Coach und dem Tourbus fahren!");
- }
+ selectedRoute = playerRoutePair1[player.Name];
}
else
{
- JobBase job = JobManager.GetJob(jobber.GetUser().JobId ?? -1);
- job.StopJob(jobber);
- CheckPointHandle.DeleteCheckpoints(jobber);
- ChatService.SendMessage(jobber, $"~y~Job:~s~ Du hast deinen Job (~o~{job.Name}~s~) beendet.");
+ selectedRoute = ROUTE_BEGINNER.GetValueOrDefault(index);
+ playerRoutePair1.Add(player.Name, selectedRoute);
}
- //BusLetzterCheckpoint(jobber);
- //BusDriverJob rt = null;
- //rt.BusLetzterCheckpoint()
}
+ else if (type == INTERMEDIATE)
+ {
+ index %= ROUTE_INTERMEDIATE.Count;
+
+ if (playerRoutePair2.ContainsKey(player.Name))
+ {
+ selectedRoute = playerRoutePair2[player.Name];
+ }
+ else
+ {
+ selectedRoute = ROUTE_INTERMEDIATE.GetValueOrDefault(index);
+ playerRoutePair2.Add(player.Name, selectedRoute);
+ }
+ }
+ else if (type == PROFESSIONAL)
+ {
+ index %= ROUTE_PROFESSIONAL.Count;
+
+ if (playerRoutePair3.ContainsKey(player.Name))
+ {
+ selectedRoute = playerRoutePair3[player.Name];
+ }
+ else
+ {
+ selectedRoute = ROUTE_PROFESSIONAL.GetValueOrDefault(index);
+ playerRoutePair3.Add(player.Name, selectedRoute);
+ }
+ }
+
+ if (playerRouteCurrent.ContainsKey(player.Name))
+ playerRouteCurrent.Remove(player.Name);
+ playerRouteCurrent.Add(player.Name, selectedRoute);
+
+ if (selectedRoute is null || selectedRoute.Count is 0)
+ {
+ Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} has empty route Vector3 List -BUSDATA TYPE: {type}, INDEX {index}.");
+ return;
+ }
+
+ Vector3 spawnPoint = VEHICLE_SPAWNS[spawnIndex++ % VEHICLE_SPAWNS.Count];
+ Vehicle vehicle = NAPI.Vehicle.CreateVehicle(getPlayerJobVehicle(player), spawnPoint, VEHICLE_HEADING, 111, 111, "JOB");
+ vehicle.NumberPlate = "JOB-" + vehicle.Id;
+
+ if (vehicle is null)
+ {
+ Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} got no Vehicle set -BUSDATA TYPE: {type}, INDEX {index}.");
+ return;
+ }
+ _CHANGING_VEHICLE.Add(player);
+ if (playerVehiclePair.ContainsKey(player))
+ {
+ Vehicle previousVehicle = null;
+ if (playerVehiclePair[player] != null)
+ previousVehicle = playerVehiclePair[player];
+ playerVehiclePair.Remove(player);
+
+ previousVehicle?.Delete();
+ }
+ playerVehiclePair.Add(player, vehicle);
+
+ player.SetIntoVehicle(vehicle.Handle, 0);
+
+ player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
+ player.StartCheckPointRoute(selectedRoute, MARKER_DELAY, MARKER_ID, MARKER_SIZE, MARKER_DIST, true, MARKER_EVENT);
+ if (index != -1)
+ player.SendChatMessage($"~y~[JOB]: ~w~Dir wurde ~g~ Route {index + 1}~w~ zugeteilt.");
}
- [RemoteEvent("BusLetzterCheckpoint")]
- public static void BusLetzterCheckpoint(Player player)
+ public override void LastCheckpoint(Player player)
{
- BusDriverJob c = new BusDriverJob();
Vehicle v = player.Vehicle;
- player.SendChatMessage("~y~Job: ~w~Die neue Route lädt. Bitte warten...");
+ player.SendChatMessage("~y~[JOB]: ~w~Die neue Route lädt. Bitte warten...");
+ string type = getPlayerRouteType(player);
+
NAPI.Task.Run(() =>
{
- if (player.VehicleSeat == 0)
- {
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
- c.StartBusRoute(player, "RouteStart");
- }
- else
- {
- Vehicle LastVehicle = player.GetData("LastVehicle");
- JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1);
- if (LastVehicle.GetServerVehicle() is JobVehicle vehJ)
- {
- if (LastVehicle.GetData("timerJobVehicleRespawn") == true)
- {
- if (vehJ.GetJob().GetUsersInJob().Contains(player))
- {
- if (LastVehicle != null)
- {
- LastVehicle.ResetData("timerJobVehicleRespawn");
- ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle);
- ServerVehicleExtensions.Spawn(sVeh, LastVehicle);
- job.StopJob(player);
- ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{job.Name}~s~) beendet.");
- CheckPointHandle.DeleteCheckpoints(player);
- if (!player.HasData("isDead") || player.GetData("isDead") == false)
- {
- if (player.GetUser().JobId == 3)//Pilot
- {
- if (!player.HasData("PilotenBase") || player.GetData("PilotenBase") == 1) //Sandyshores
- {
- player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406);
- player.Heading = (-154.65234375f);
- }
- if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2) //LS Airport
- {
- player.Position = new Vector3(-1622.48, -3151.58, 13);
- player.Heading = (48.44f);
- }
- }
- if (player.GetUser().JobId == 4)//Busfahrer
- {
- player.Position = new Vector3(-535.46, -2144.97, 5.95);
- player.Heading = (57.03f);
- }
- }
- }
- }
- }
- }
- }
- /*if (v.Model == (uint)Types.VehicleModel.Bus)
- {
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
- Random rnd = new Random();
- int rroute = rnd.Next(1, 5);
- switch (rroute)
- {
- case 1:
- {
- c.StartBusRoute(player, "Skill1Route1");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 1");
- break;
- }
- case 2:
- {
- c.StartBusRoute(player, "Skill1Route2");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 2");
- break;
- }
- case 3:
- {
- c.StartBusRoute(player, "Skill1Route3");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 3");
- break;
- }
- case 4:
- {
- c.StartBusRoute(player, "Skill1Route4");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 4");
- break;
- }
- }
- }
- if (v.Model == (uint)Types.VehicleModel.Coach)
- {
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
- Random rnd = new Random();
- int rroute = rnd.Next(1, 5);
- switch (rroute)
- {
- case 1:
- {
- c.StartBusRoute(player, "Skill2Route1");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 1");
- break;
- }
- case 2:
- {
- c.StartBusRoute(player, "Skill2Route2");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 2");
- break;
- }
- case 3:
- {
- c.StartBusRoute(player, "Skill2Route3");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 3");
- break;
- }
- case 4:
- {
- c.StartBusRoute(player, "Skill2Route4");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 4");
- break;
- }
- }
- }
- if (v.Model == (uint)Types.VehicleModel.Tourbus)
- {
- player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15);
- Random rnd = new Random();
- int rroute = rnd.Next(1, 5);
- switch (rroute)
- {
- case 1:
- {
- c.StartBusRoute(player, "Skill3Route1");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 1");
- break;
- }
- case 2:
- {
- c.StartBusRoute(player, "Skill3Route2");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 2");
- break;
- }
- case 3:
- {
- c.StartBusRoute(player, "Skill3Route3");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 3");
- break;
- }
- case 4:
- {
- c.StartBusRoute(player, "Skill3Route4");
- player.SendChatMessage("~y~Job: ~w~Eine neue Route wurde gesetzt: ~g~Route 4");
- break;
- }
- }
- }*/
+ if (type == BEGINNER)
+ playerRoutePair1.Remove(player.Name);
+ else if (type == INTERMEDIATE)
+ playerRoutePair2.Remove(player.Name);
+ else if (type == PROFESSIONAL)
+ playerRoutePair3.Remove(player.Name);
+
+ playerRouteCurrent.Remove(player.Name);
+ BusDriverJob job = JobManager.GetJob();
+ StartBusRoute(player, type);
}, delayTime: 10000);
+
+ if (!player.IsInVehicle || player.VehicleSeat != 0) return;
+ Vehicle veh = player.Vehicle;
+ if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData();
+ data.Left = false;
+ data.Right = false;
+ veh.SetData("indicatorData", data);
+ NAPI.ClientEvent.TriggerClientEventForAll("SERVER:setIndicatorStatus", veh.Handle.Value, data.Left, data.Right);
+ }
+
+ public void BusCheckpoint(Player player)
+ {
+ if (!player.IsInVehicle || player.VehicleSeat != 0) return;
+ Vehicle veh = player.Vehicle;
+ if ((VehicleHash)veh.Model == VehicleHash.Bus)
+ {
+ player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleBus", "wav", 25);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1850);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 1, false, 1850);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 2, false, 1850);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 1850);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1850);
+ NAPI.Task.Run(() =>
+ {
+ player.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
+ }, delayTime: 1850);
+ }
+ if ((VehicleHash)veh.Model == VehicleHash.Coach)
+ {
+ player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleCoach", "wav", 35);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1000);
+ NAPI.Task.Run(() =>
+ {
+ player.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
+ }, delayTime: 1000);
+ }
+ if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
+ {
+ player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleTourbus", "wav", 25);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 2600);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 2, false, 2600);
+ player.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 2600);
+ NAPI.Task.Run(() =>
+ {
+ player.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
+ }, delayTime: 2600);
+ }
+ //user.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
+ }
+
+ public void AtBusStop(Player player)
+ {
+ if (!player.IsInVehicle || player.VehicleSeat != 0) return;
+ Vehicle veh = player.Vehicle;
+ player.TriggerEvent("CLIENT:FreezeVehicle", veh);
+ player.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
+ player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AnfahrtHaltestelle", "wav", 50);
+ if ((VehicleHash)veh.Model == VehicleHash.Bus)
+ {
+ player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
+ player.TriggerEvent("CLIENT:SetDoorOpen", 1, false, false);
+ player.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
+ player.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
+ player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
+ NAPI.Task.Run(() =>
+ {
+ BusCheckpoint(player);
+ }, delayTime: 3600);
+ }
+ if ((VehicleHash)veh.Model == VehicleHash.Coach)
+ {
+ player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
+ NAPI.Task.Run(() =>
+ {
+ BusCheckpoint(player);
+ }, delayTime: 2800);
+ }
+ if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
+ {
+ player.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
+ player.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
+ NAPI.Task.Run(() =>
+ {
+ BusCheckpoint(player);
+ }, delayTime: 3250);
+ }
+ if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData();
+ data.Left = false;
+ data.Right = true;
+ veh.SetData("indicatorData", data);
+ NAPI.ClientEvent.TriggerClientEventForAll("SERVER:setIndicatorStatus", veh.Handle.Value, data.Left, data.Right);
+
+ NAPI.Task.Run(() =>
+ {
+ veh.Position = new Vector3(veh.Position.X, veh.Position.Y, veh.Position.Z + 0.1);
+
+ player.TriggerEvent("CLIENT:FreezeVehicle", veh);
+ }, delayTime: 500);
+ }
+
+ public override void StartJobEndTimer(Player player)
+ {
+ if (!playerVehiclePair.ContainsKey(player) && _CHANGING_VEHICLE.Contains(player))
+ {
+ _CHANGING_VEHICLE.Remove(player);
+ return;
+ }
+
+ if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
+ {
+ JobManager.playerTimersJobVehicleRespawn[player].Stop();
+ }
+
+ PlayerTimer playerTimer = new PlayerTimer(player, playerVehiclePair[player], 30000);
+ playerTimer.Elapsed += JobTimerElapsed;
+
+ if (!JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
+ JobManager.playerTimersJobVehicleRespawn.Add(player, playerTimer);
+ else
+ JobManager.playerTimersJobVehicleRespawn[player] = playerTimer;
+
+ player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,");
+ player.SendChatMessage("~y~[JOB] ~w~Bist du nicht in 30 Sekunden zurück, ~r~wird der Job beendet!");
+ }
+
+ private void JobTimerElapsed(Player player, Vehicle vehicle)
+ {
+ NAPI.Task.Run(() =>
+ {
+ StopJob(player, !player.GetData("isDead"));
+ JobManager.playerTimersJobVehicleRespawn[player].Stop();
+ JobManager.playerTimersJobVehicleRespawn.Remove(player);
+ });
+ }
+
+ public override bool CheckVehicle(Player player, Vehicle vehicle)
+ {
+ if (!playerVehiclePair.ContainsKey(player))
+ return false;
+
+ if (playerVehiclePair[player] == vehicle)
+ return true;
+
+ return false;
+ }
+ }
+
+ public class BusJobEvents : Script
+ {
+ [RemoteEvent("BUSJOB:BusInCheckpoint")]
+ public void BusInCheckpoint(Player player)
+ {
+ if (!BusDriverJob.playerVehiclePair.ContainsKey(player) || !BusDriverJob.playerRouteCurrent.ContainsKey(player.Name))
+ return;
+
+ if (BusDriverJob.playerVehiclePair[player].Model is BusDriverJob.VEHICLE_BEGINNER)
+ payWage(player, BusDriverJob.WAGE_BEGINNER / BusDriverJob.playerRouteCurrent[player.Name].Count);
+ else if (BusDriverJob.playerVehiclePair[player].Model is BusDriverJob.VEHICLE_INTERMEDIATE)
+ payWage(player, BusDriverJob.WAGE_INTERMEDIATE / BusDriverJob.playerRouteCurrent[player.Name].Count);
+ else if (BusDriverJob.playerVehiclePair[player].Model is BusDriverJob.VEHICLE_PROFESSIONAL)
+ payWage(player, BusDriverJob.WAGE_PROFESSIOAL / BusDriverJob.playerRouteCurrent[player.Name].Count);
+ }
+
+ private void payWage(Player player, int wage)
+ {
+ using var dbContext = new DatabaseContext();
+ User user = player.GetUser(dbContext);
+
+ if (player.VehicleSeat == 0)
+ {
+ user.Wage += wage;
+ user.BusSkill++;
+ if (user.BusSkill == BusDriverJob.SKILL_INTERMEDIATE)
+ {
+ player.SendChatMessage($"~y~[JOB]: ~w~Du hast nun die Route ~g~{BusDriverJob.INTERMEDIATE} ~w~freigeschaltet!");
+ player.SendChatMessage($"~y~[JOB]: ~w~Du kannst jetzt auch mit dem Coach fahren!");
+ }
+ if (user.BusSkill == BusDriverJob.SKILL_PROFESSIONAL)
+ {
+ player.SendChatMessage($"~y~[JOB]: ~w~Du hast nun die Route ~g~{BusDriverJob.PROFESSIONAL} ~w~freigeschaltet!");
+ player.SendChatMessage($"~y~[JOB]: ~w~Du kannst jetzt auch mit dem Tourbus fahren!");
+ }
+
+ BusDriverJob job = JobManager.GetJob();
+
+ dbContext.SaveChanges();
+ }
}
}
}
diff --git a/ReallifeGamemode.Server/Job/JobBase.cs b/ReallifeGamemode.Server/Job/JobBase.cs
index 325c4cb2..8a0baa0b 100644
--- a/ReallifeGamemode.Server/Job/JobBase.cs
+++ b/ReallifeGamemode.Server/Job/JobBase.cs
@@ -5,6 +5,7 @@ using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Job
{
@@ -21,12 +22,21 @@ namespace ReallifeGamemode.Server.Job
private readonly List _inJob = new List();
private static readonly List jobPlayer = new List();
+ public static Dictionary playerVehiclePair = new Dictionary();
+ public static List _CHANGING_VEHICLE = new List();
+
public abstract int Id { get; }
public abstract string Name { get; }
public abstract bool NeedVehicleToStart { get; }
+ public abstract void LastCheckpoint(Player player);
+
+ public abstract void StartJobEndTimer(Player player);
+
+ public abstract bool CheckVehicle(Player player, Vehicle veh);
+
public virtual bool Deactivated => false;
public void StartJob(Player player)
@@ -35,7 +45,7 @@ namespace ReallifeGamemode.Server.Job
_inJob.Add(player);
jobPlayer.Add(player);
- ChatService.SendMessage(player, $"~y~[Job]~s~ Du hast deinen Job (~o~{this.Name}~s~) gestartet.");
+ ChatService.SendMessage(player, $"~y~[Job]~s~ Du hast deinen Job ~o~{this.Name}~s~ gestartet.");
JobStart?.Invoke(player);
}
@@ -46,18 +56,10 @@ namespace ReallifeGamemode.Server.Job
_inJob.Remove(player);
jobPlayer.Remove(player);
- User user = player.GetUser();
-
- using (var dbContext = new DatabaseContext())
- {
- user = player.GetUser(dbContext);
- user.trashcount -= user.trashcount;
- dbContext.SaveChanges();
- }
-
if (quit)
{
- ChatService.SendMessage(player, $"~y~[Job]~s~ Du hast deinen Job (~o~{this.Name}~s~) beendet.");
+ ChatService.SendMessage(player, $"~y~[Job]~s~ Du hast deinen Job ~o~{this.Name}~s~ beendet.");
+ player.SafeTeleport(JobManager.playerJobStartPosition[player]);
}
JobStop?.Invoke(player);
@@ -65,10 +67,8 @@ namespace ReallifeGamemode.Server.Job
public List GetJobVehicles()
{
- using (var dbContext = new DatabaseContext())
- {
- return dbContext.JobVehicles.Where(j => j.JobId == Id).ToList();
- }
+ using var dbContext = new DatabaseContext();
+ return dbContext.JobVehicles.Where(j => j.JobId == Id).ToList();
}
public static List GetPlayerInJob() => jobPlayer;
diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs
index 5f17ac4b..32b8d941 100644
--- a/ReallifeGamemode.Server/Job/PilotJob.cs
+++ b/ReallifeGamemode.Server/Job/PilotJob.cs
@@ -7,6 +7,8 @@ using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Util;
+using System.Linq;
+using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Server.Job
{
@@ -18,323 +20,349 @@ namespace ReallifeGamemode.Server.Job
private const int CHECKPOINT_MARKER_ID = 6;
+ public const string BEGINNER = "Anfänger";
+ public const string INTERMEDIATE = "Fortgeschrittener";
+ public const string PROFESSIONAL = "Profi";
+
+ public const int WAGE_BEGINNER = 300;
+ public const int WAGE_INTERMEDIATE = 750;
+
+ public const uint VEHICLE_BEGINNER = (uint)VehicleHash.Cuban800;
+ public const uint VEHICLE_INTERMEDIATE = (uint)VehicleHash.Velum2;
+ public const uint VEHICLE_PROFESSIONAL = (uint)VehicleHash.Submersible;
+
+ public static Dictionary> playerRouteCurrent = new Dictionary>();
+
+ public static int spawnIndexBeginner = 0;
+ public static int spawnIndexIntermediate = 0;
+
+ public const int SKILL_BEGINNER = 0;
+ public const int SKILL_INTERMEDIATE = 300;
+
public override bool NeedVehicleToStart => false;
- private readonly IReadOnlyCollection Skill1Route1 = new List//Pilot_Skill_1_Route_1
+ private readonly Dictionary BEGINNER_SPAWNS = new Dictionary
{
- new Vector3(1645.9910888671875, 3236.744873046875, 40.98052978515625),
- new Vector3(302.6805114746094, 2867.93896484375, 204.81182861328125),
- new Vector3(-1093.6722412109375, 2737.1376953125, 257.575439453125),
- new Vector3(-2286.014892578125, 3019.12841796875, 33.4510498046875),
- new Vector3(-2471.854248046875, 3271.08935546875, 33.47834777832031),
- new Vector3(-623.9515380859375, 5313.12158203125, 181.6047821044922),
- new Vector3(1896.899658203125, 4824.203125, 208.77737426757812),
- new Vector3(2281.790283203125, 3606.98681640625, 132.3915252685547),
- new Vector3(1610.4461669921875, 3225.36376953125, 41.05073928833008),
- }.AsReadOnly();
+ { new Vector3(1683.6611, 3267.7104, 41.625206), -162},
+ { new Vector3(1696.7466, 3271.403, 41.385006), -161},
+ { new Vector3(1722.8834, 3278.6873, 41.194054), -160},
+ { new Vector3(1723.9468, 3233.8052, 41.563965), 17},
+ { new Vector3(1736.5269, 3236.5996, 41.563965), 17},
+ { new Vector3(1750.1774, 3240.3157, 41.563965), 17},
+ };
- private readonly IReadOnlyCollection Skill1Route2 = new List//Pilot_Skill_1_Route_2
+ private readonly Dictionary INTERMEDIATE_SPAWNS = new Dictionary()
{
- new Vector3(1593.927490234375, 3193.30908203125, 41.170997619628906),
- new Vector3(961.5843505859375, 2278.5966796875, 251.17218017578125),
- new Vector3(924.3920288085938, 93.95357513427734, 282.3033142089844),
- new Vector3(963.6002197265625, -3101.551513671875, 177.8121337890625),
- new Vector3(-1265.1163330078125, -2990.142578125, 14.595105171203613),
- new Vector3(-1260.78662109375, -2806.293212890625, 14.587812423706055),
- new Vector3(-894.3707885742188, 82.7993392944336, 385.011962890625),
- new Vector3(919.4126586914062, 2553.385986328125, 135.39154052734375),
- new Vector3(1592.840087890625, 3192.8017578125, 41.169837951660156),
- }.AsReadOnly();
+ { new Vector3(-1650.7899, -3178.5798, 15), 60},
+ { new Vector3(-1643.098, -3165.7114, 15), 60},
+ { new Vector3(-1635.0903, -3152.7354, 15), 60},
+ { new Vector3(-1627.0435, -3138.8354, 15), 60},
+ { new Vector3(-1517-0101, -3125-2798, 15), -118},
+ { new Vector3(-1670.9293, -3116.0898, 15), -118},
+ };
- private readonly IReadOnlyCollection Skill1Route3 = new List//Pilot_Skill_1_Route_3
- {
- new Vector3(-850.61, 2181.98, 429.67),
- }.AsReadOnly();
+ //124 0 Velum
- private readonly IReadOnlyCollection Skill2Route1 = new List//Pilot_Skill_2_Route_1
+ private readonly Dictionary> ROUTE_BEGINNER = new Dictionary>//Bus_Skill_1_Route_1
{
- new Vector3(-1534.98828125, -3028.916748046875, 14.451109886169434),
- new Vector3(-1182.960205078125, -3236.542724609375, 67.93492126464844),
- new Vector3(942.8041381835938, -2997.95751953125, 323.1705322265625),
- new Vector3(2459.114501953125, -525.8928833007812, 409.09002685546875),
- new Vector3(2764.611572265625, 1482.853271484375, 457.73944091796875),
- new Vector3(3485.380615234375, 3652.9619140625, 343.3283996582031),
- new Vector3(2652.611572265625, 4737.7958984375, 206.23399353027344),
- new Vector3(2043.8521728515625, 4769.595703125, 42.007118225097656),
- new Vector3(2134.332763671875, 4781.857421875, 41.900352478027344),
- new Vector3(1943.1544189453125, 4721.03125, 57.76427459716797),
- new Vector3(1749.4105224609375, 3790.8955078125, 194.40440368652344),
- new Vector3(1203.5526123046875, 2707.182373046875, 342.80145263671875),
- new Vector3(-377.686279296875, 1256.92578125, 532.7467651367188),
- new Vector3(-820.6907958984375, -412.96466064453125, 311.0726013183594),
- new Vector3(-1073.534912109375, -1704.798583984375, 94.05522155761719),
- new Vector3(-1686.30126953125, -2815.478759765625, 14.87234115600586),
- new Vector3(-1617.498291015625, -2982.41259765625, 14.883989334106445),
- }.AsReadOnly();
+ { 0,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(1645.9910888671875, 3236.744873046875, 40.98052978515625),
+ new Vector3(302.6805114746094, 2867.93896484375, 204.81182861328125),
+ new Vector3(-1093.6722412109375, 2737.1376953125, 257.575439453125),
+ new Vector3(-2286.014892578125, 3019.12841796875, 33.4510498046875),
+ new Vector3(-2471.854248046875, 3271.08935546875, 33.47834777832031),
+ new Vector3(-623.9515380859375, 5313.12158203125, 181.6047821044922),
+ new Vector3(1896.899658203125, 4824.203125, 208.77737426757812),
+ new Vector3(2281.790283203125, 3606.98681640625, 132.3915252685547),
+ new Vector3(1610.4461669921875, 3225.36376953125, 41.05073928833008),
+ }
+ },
+ { 1,
+ new List()
+ {
+ //new Vector3(-601.733, -2049.285, 6.090),
+ new Vector3(1593.927490234375, 3193.30908203125, 41.170997619628906),
+ new Vector3(961.5843505859375, 2278.5966796875, 251.17218017578125),
+ new Vector3(924.3920288085938, 93.95357513427734, 282.3033142089844),
+ new Vector3(963.6002197265625, -3101.551513671875, 177.8121337890625),
+ new Vector3(-1265.1163330078125, -2990.142578125, 14.595105171203613),
+ new Vector3(-1260.78662109375, -2806.293212890625, 14.587812423706055),
+ new Vector3(-894.3707885742188, 82.7993392944336, 385.011962890625),
+ new Vector3(919.4126586914062, 2553.385986328125, 135.39154052734375),
+ new Vector3(1592.840087890625, 3192.8017578125, 41.169837951660156),
+ }
+ },
+ };
- private readonly IReadOnlyCollection Skill2Route2 = new List//Pilot_Skill_2_Route_2
+ private readonly Dictionary> ROUTE_INTERMEDIATE = new Dictionary>
{
- new Vector3(-1463.965576171875, -2875.571533203125, 14.882678031921387),
- new Vector3(-981.0889282226562, -3122.533203125, 56.10537338256836),
- new Vector3(-341.6023254394531, -2016.779541015625, 262.1709899902344),
- new Vector3(-1446.6815185546875, -894.4887084960938, 321.3404846191406),
- new Vector3(-3151.909912109375, 979.1404418945312, 335.3139953613281),
- new Vector3(-1309.160888671875, 4903.9140625, 388.6031494140625),
- new Vector3(31.35175895690918, 3690.413330078125, 333.4454345703125),
- new Vector3(-948.346923828125, 2766.284912109375, 239.0842742919922),
- new Vector3(-2312.5068359375, 3033.903076171875, 33.7471923828125),
- new Vector3(-2132.787109375, 3265.840087890625, 33.74031448364258),
- new Vector3(-2331.76611328125, 3148.581298828125, 33.7597541809082),
- new Vector3(-2564.848876953125, 2369.27783203125, 182.68736267089844),
- new Vector3(-1833.041259765625, 832.1589965820312, 398.28863525390625),
- new Vector3(-878.19384765625, -904.84521484375, 284.2839050292969),
- new Vector3(-1124.624755859375, -1821.9208984375, 74.77794647216797),
- new Vector3(-1631.8602294921875, -2720.09814453125, 14.873514175415039),
- new Vector3(-1543.793701171875, -2829.399169921875, 14.899491310119629),
- }.AsReadOnly();
-
- private readonly IReadOnlyCollection Skill2Route3 = new List//Pilot_Skill_2_Route_3
- {
- new Vector3(-710.89, -1836.81, 355.46),
- }.AsReadOnly();
+ { 0,
+ new List()
+ {
+ new Vector3(-1534.98828125, -3028.916748046875, 14.451109886169434),
+ new Vector3(-1182.960205078125, -3236.542724609375, 67.93492126464844),
+ new Vector3(942.8041381835938, -2997.95751953125, 323.1705322265625),
+ new Vector3(2459.114501953125, -525.8928833007812, 409.09002685546875),
+ new Vector3(2764.611572265625, 1482.853271484375, 457.73944091796875),
+ new Vector3(3485.380615234375, 3652.9619140625, 343.3283996582031),
+ new Vector3(2652.611572265625, 4737.7958984375, 206.23399353027344),
+ new Vector3(2043.8521728515625, 4769.595703125, 42.007118225097656),
+ new Vector3(2134.332763671875, 4781.857421875, 41.900352478027344),
+ new Vector3(1943.1544189453125, 4721.03125, 57.76427459716797),
+ new Vector3(1749.4105224609375, 3790.8955078125, 194.40440368652344),
+ new Vector3(1203.5526123046875, 2707.182373046875, 342.80145263671875),
+ new Vector3(-377.686279296875, 1256.92578125, 532.7467651367188),
+ new Vector3(-820.6907958984375, -412.96466064453125, 311.0726013183594),
+ new Vector3(-1073.534912109375, -1704.798583984375, 94.05522155761719),
+ new Vector3(-1686.30126953125, -2815.478759765625, 14.87234115600586),
+ new Vector3(-1617.498291015625, -2982.41259765625, 14.883989334106445),
+ }
+ },
+ { 1,
+ new List()
+ {
+ new Vector3(-1463.965576171875, -2875.571533203125, 14.882678031921387),
+ new Vector3(-981.0889282226562, -3122.533203125, 56.10537338256836),
+ new Vector3(-341.6023254394531, -2016.779541015625, 262.1709899902344),
+ new Vector3(-1446.6815185546875, -894.4887084960938, 321.3404846191406),
+ new Vector3(-3151.909912109375, 979.1404418945312, 335.3139953613281),
+ new Vector3(-1309.160888671875, 4903.9140625, 388.6031494140625),
+ new Vector3(31.35175895690918, 3690.413330078125, 333.4454345703125),
+ new Vector3(-948.346923828125, 2766.284912109375, 239.0842742919922),
+ new Vector3(-2312.5068359375, 3033.903076171875, 33.7471923828125),
+ new Vector3(-2132.787109375, 3265.840087890625, 33.74031448364258),
+ new Vector3(-2331.76611328125, 3148.581298828125, 33.7597541809082),
+ new Vector3(-2564.848876953125, 2369.27783203125, 182.68736267089844),
+ new Vector3(-1833.041259765625, 832.1589965820312, 398.28863525390625),
+ new Vector3(-878.19384765625, -904.84521484375, 284.2839050292969),
+ new Vector3(-1124.624755859375, -1821.9208984375, 74.77794647216797),
+ new Vector3(-1631.8602294921875, -2720.09814453125, 14.873514175415039),
+ new Vector3(-1543.793701171875, -2829.399169921875, 14.899491310119629),
+ }
+ },
+ };
public PilotJob()
{
- JobStart += PilotJob_JobStart;
+ JobStop += _JobStop;
}
- private void PilotJob_JobStart(Player player)
+ private void _JobStop(Player player)
{
- /*List listRouteTexts = new List();
- List listRouteTexts2 = new List();
+ if (!playerVehiclePair.ContainsKey(player))
+ return;
- Vehicle veh = player.Vehicle;
+ CheckPointHandle.DeleteCheckpoints(player);
- if ((VehicleHash)veh.Model == VehicleHash.Velum || (VehicleHash)veh.Model == VehicleHash.Velum2)
- {
- listRouteTexts2.Add("Route 4");
- listRouteTexts2.Add("Route 5");
- listRouteTexts2.Add("Route 6");
+ playerVehiclePair[player].Delete();
+ playerVehiclePair.Remove(player);
+ }
- player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts2));
- }
- else
- {
- listRouteTexts.Add("Route 1");
- listRouteTexts.Add("Route 2");
- listRouteTexts.Add("Route 3");
+ public string getSkill(int skillPoints)
+ {
+ if (skillPoints == SKILL_BEGINNER)
+ return BEGINNER;
+ else if (skillPoints == SKILL_INTERMEDIATE)
+ return INTERMEDIATE;
- player.TriggerEvent("showPilotRouteMenu", JsonConvert.SerializeObject(listRouteTexts));
- }*/
- /*Random rnd = new Random();
- int rroute = rnd.Next(1, 6);
- switch (rroute)
- {
- case 1:
- {
- StartPilotRoute(player, "Route 1");
- break;
- }
- case 2:
- {
- StartPilotRoute(player, "Route 2");
- break;
- }
- case 3:
- {
- StartPilotRoute(player, "Route 3");
- break;
- }
- case 4:
- {
- StartPilotRoute(player, "Route 4");
- break;
- }
- case 5:
- {
- StartPilotRoute(player, "Route 5");
- break;
- }
- }*/
+ return "none";
+ }
+
+ private uint getPlayerJobVehicle(string type)
+ {
+ if (type == BEGINNER)
+ return VEHICLE_BEGINNER;
+ else if (type == INTERMEDIATE)
+ return VEHICLE_INTERMEDIATE;
+ else if (type == PROFESSIONAL)
+ return VEHICLE_PROFESSIONAL;
+
+ return 0;
}
[RemoteEvent("startPilotRoute")]
- public void StartPilotRoute(Player player, string type)
+ public void StartPilotRoute(Player player, int skillPoints)
{
- Vehicle veh = player.Vehicle;
- if (player.VehicleSeat == 0)
+ string type = getSkill(skillPoints);
+
+ List selectedRoute = new List();
+ Random random = new Random();
+ Vector3 spawnPoint = null;
+ float heading = 0;
+
+ if (type == BEGINNER)
{
- if (type == "RouteStart")
- {
- if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 1)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 3);
- switch (rroute)
- {
- case 1:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 1");
- player.SetData("Route", "Skill1Route1");
- break;
- }
- case 2:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 2");
- player.SetData("Route", "Skill1Route2");
- break;
- }
- /*case 3:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3");
- player.SetData("Route", "Skill1Route3");
- break;
- }*/
- }
- }
- if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2)
- {
- Random rnd = new Random();
- int rroute = rnd.Next(1, 3);
- switch (rroute)
- {
- case 1:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 1");
- player.SetData("Route", "Skill2Route1");
- break;
- }
- case 2:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 2");
- player.SetData("Route", "Skill2Route2");
- break;
- }
- /*case 3:
- {
- CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt: ~g~Route 3");
- player.SetData("Route", "Skill2Route3");
- break;
- }*/
- }
- }
- }
- /*if (type == "Route 1")
- {
- CheckPointHandle.StartCheckPointRoute(player, Route1, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
- }
- else if (type == "Route 2")
- {
- CheckPointHandle.StartCheckPointRoute(player, Route2, 0, 6, 40, 10, true, "pilotJob");
- }
- else if (type == "Route 3")
- {
- CheckPointHandle.StartCheckPointRoute(player, Route3, 0, 6, 40, 10, true, "pilotJob");
- }
- else if (type == "Route 4")
- {
- CheckPointHandle.StartCheckPointRoute(player, Route4, 0, 6, 40, 10, true, "pilotJob");
- }
- else if (type == "Route 5")
- {
- CheckPointHandle.StartCheckPointRoute(player, Route5, 0, 6, 40, 10, true, "pilotJob");
- }
- else if (type == "Route 6")
- {
- CheckPointHandle.StartCheckPointRoute(player, Route6, 0, 6, 40, 10, true, "pilotJob");
- }*/
+ spawnPoint = BEGINNER_SPAWNS.Keys.ToList()[spawnIndexBeginner++ % BEGINNER_SPAWNS.Count];
+ heading = BEGINNER_SPAWNS[spawnPoint];
+ selectedRoute = ROUTE_BEGINNER.GetValueOrDefault(random.Next(0, ROUTE_BEGINNER.Count));
}
- }
- public static void payWage(Player jobber, int wage)
- {
- using (var dbContext = new DatabaseContext())
+ else if (type == INTERMEDIATE)
{
- if (jobber.VehicleSeat == 0)
- {
- jobber.GetUser(dbContext).Wage += wage;
- //jobber.SendNotification($"~y~[JOB] ~g~+{wage}$");
- jobber.GetUser(dbContext).PilotSkill++;
- dbContext.SaveChanges();
- if (jobber.GetUser(dbContext).PilotSkill == 300)
- {
- jobber.SendChatMessage($"~y~Job: ~s~Du hast nun ~g~Skill-Level 2 ~w~erreicht!");
- jobber.SendChatMessage($"~y~Job: ~s~Du kannst jetzt auch mit dem Velum Flugzeug (LS Airport) fliegen!");
- }
- }
- else
- {
- JobBase job = JobManager.GetJob(jobber.GetUser().JobId ?? -1);
- job.StopJob(jobber);
- CheckPointHandle.DeleteCheckpoints(jobber);
- ChatService.SendMessage(jobber, $"~y~Job: ~s~Du hast deinen Job ~o~{job.Name}~s~ beendet.");
- }
+ spawnPoint = INTERMEDIATE_SPAWNS.Keys.ToList()[spawnIndexIntermediate++ % INTERMEDIATE_SPAWNS.Count];
+ heading = INTERMEDIATE_SPAWNS[spawnPoint];
+ selectedRoute = ROUTE_INTERMEDIATE.GetValueOrDefault(random.Next(0, ROUTE_INTERMEDIATE.Count));
}
+
+ if (selectedRoute is null || selectedRoute.Count is 0)
+ {
+ Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} has empty route Vector3 List.");
+ return;
+ }
+ if (spawnPoint is null)
+ {
+ Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} has empty spawn point.");
+ return;
+ }
+
+ Vehicle vehicle = NAPI.Vehicle.CreateVehicle(getPlayerJobVehicle(type), spawnPoint, heading, 124, 0, "JOB");
+ vehicle.NumberPlate = "JOB-" + vehicle.Id;
+
+ if (vehicle is null)
+ {
+ Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} got no Vehicle set.");
+ return;
+ }
+
+ if (!playerRouteCurrent.ContainsKey(player.Name))
+ playerRouteCurrent.Add(player.Name, new List());
+
+ playerRouteCurrent[player.Name] = selectedRoute;
+ _CHANGING_VEHICLE.Add(player);
+ if (playerVehiclePair.ContainsKey(player))
+ {
+ Vehicle previousVehicle = null;
+ if (playerVehiclePair[player] != null)
+ previousVehicle = playerVehiclePair[player];
+ playerVehiclePair.Remove(player);
+
+ previousVehicle?.Delete();
+ }
+ playerVehiclePair.Add(player, vehicle);
+ player.SetIntoVehicle(vehicle.Handle, 0);
+ CheckPointHandle.StartCheckPointRoute(player, selectedRoute, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "PILOT:InCheckpoint"); //6, 23, 25, 26, 27, 28
}
- [RemoteEvent("PilotLetzterCheckpoint")]
- public static void PilotLetzterCheckpoint(Player player)
+ public string getPlayerRouteType(Player player)
{
- PilotJob c = new PilotJob();
- Vehicle v = player.Vehicle;
- c.StartPilotRoute(player, "RouteStart");
- /*if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 1)
+ if (!playerRouteCurrent.ContainsKey(player.Name))
+ return "none";
+
+ List selectedRoute = playerRouteCurrent[player.Name];
+
+ if (ROUTE_BEGINNER.Values.Where(v => v.VectorEquals(selectedRoute)).Count() != 0)
+ return BEGINNER;
+ else if (ROUTE_INTERMEDIATE.Values.Where(v => v.VectorEquals(selectedRoute)).Count() != 0)
+ return INTERMEDIATE;
+
+ return "none";
+ }
+
+ public int getSkillFromType(string type)
+ {
+ if (type == BEGINNER)
+ return SKILL_BEGINNER;
+ else if (type == INTERMEDIATE)
+ return SKILL_INTERMEDIATE;
+
+ return -1;
+ }
+
+ public override void LastCheckpoint(Player player)
+ {
+ string type = getPlayerRouteType(player);
+ int skill = getSkillFromType(type);
+ if (skill == -1)
{
- Random rnd = new Random();
- int rroute = rnd.Next(1, 4);
- switch (rroute)
- {
- case 1:
- {
- c.StartPilotRoute(player, "Route 1");
- player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt: ~g~Route 1");
- break;
- }
- case 2:
- {
- c.StartPilotRoute(player, "Route 2");
- player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt: ~g~Route 2");
- break;
- }
- case 3:
- {
- c.StartPilotRoute(player, "Route 3");
- player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt: ~g~Route 2");
- break;
- }
- }
+ StopJob(player, true);
+ return;
}
- if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2)
+
+ playerRouteCurrent.Remove(player.Name);
+
+ StartPilotRoute(player, skill);
+ }
+
+ public override void StartJobEndTimer(Player player)
+ {
+ if (!playerVehiclePair.ContainsKey(player) && _CHANGING_VEHICLE.Contains(player))
{
- Random rnd = new Random();
- int rroute = rnd.Next(1, 4);
- switch (rroute)
+ _CHANGING_VEHICLE.Remove(player);
+ return;
+ }
+
+
+ if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
+ {
+ JobManager.playerTimersJobVehicleRespawn[player].Stop();
+ }
+ PlayerTimer playerTimer = new PlayerTimer(player, playerVehiclePair[player], 30000);
+ playerTimer.Elapsed += JobTimerElapsed;
+
+ if (!JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
+ JobManager.playerTimersJobVehicleRespawn.Add(player, playerTimer);
+ else
+ JobManager.playerTimersJobVehicleRespawn[player] = playerTimer;
+
+ player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,");
+ player.SendChatMessage("~y~[JOB] ~w~Bist du nicht in 30 Sekunden zurück, ~r~wird der Job beendet!");
+ }
+
+ private void JobTimerElapsed(Player player, Vehicle vehicle)
+ {
+ NAPI.Task.Run(() =>
+ {
+ StopJob(player, !player.GetData("isDead"));
+ JobManager.playerTimersJobVehicleRespawn[player].Stop();
+ JobManager.playerTimersJobVehicleRespawn.Remove(player);
+ });
+ }
+
+ public override bool CheckVehicle(Player player, Vehicle vehicle)
+ {
+ if (!playerVehiclePair.ContainsKey(player))
+ return false;
+
+ if (playerVehiclePair[player] == vehicle)
+ return true;
+
+ return false;
+ }
+ }
+
+ public class PilotJobEvents : Script
+ {
+ [RemoteEvent("PILOT:InCheckpoint")]
+ public void PilotInCheckpoint(Player player)
+ {
+ if (!PilotJob.playerVehiclePair.ContainsKey(player) || !PilotJob.playerRouteCurrent.ContainsKey(player.Name))
+ return;
+
+ if (PilotJob.playerVehiclePair[player].Model is PilotJob.VEHICLE_BEGINNER)
+ payWage(player, PilotJob.WAGE_BEGINNER / PilotJob.playerRouteCurrent[player.Name].Count);
+ else if (PilotJob.playerVehiclePair[player].Model is PilotJob.VEHICLE_INTERMEDIATE)
+ payWage(player, PilotJob.WAGE_INTERMEDIATE / PilotJob.playerRouteCurrent[player.Name].Count);
+ }
+
+ private void payWage(Player player, int wage)
+ {
+ using var dbContext = new DatabaseContext();
+ User user = player.GetUser(dbContext);
+
+ if (player.VehicleSeat == 0)
+ {
+ user.Wage += wage;
+ user.PilotSkill++;
+ if (user.PilotSkill == BusDriverJob.SKILL_INTERMEDIATE)
{
- case 1:
- {
- c.StartPilotRoute(player, "Route 4");
- player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt: ~g~Route 4");
- break;
- }
- case 2:
- {
- c.StartPilotRoute(player, "Route 5");
- player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt: ~g~Route 5");
- break;
- }
- case 3:
- {
- c.StartPilotRoute(player, "Route 6");
- player.SendChatMessage("~y~[JOB] ~w~Eine neue Route wurde gesetzt: ~g~Route 6");
- break;
- }
+ player.SendChatMessage($"~y~[JOB]: ~w~Du hast nun die Route ~g~{BusDriverJob.INTERMEDIATE} ~w~freigeschaltet!");
+ player.SendChatMessage($"~y~[JOB]: ~w~Du kannst jetzt auch mit dem Velum fliegen!");
}
- }*/
+
+ dbContext.SaveChanges();
+ }
}
}
}
diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
index 8ed29f14..b970da03 100644
--- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
+++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
@@ -8,6 +8,7 @@ using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Managers;
+using ReallifeGamemode.Server.Util;
namespace ReallifeGamemode.Server.Job
{
@@ -415,5 +416,45 @@ namespace ReallifeGamemode.Server.Job
}
#endregion zweiSpeieler
+
+ public override void LastCheckpoint(Player player)
+ {
+ //nothing
+ }
+
+ public override void StartJobEndTimer(Player player)
+ {
+ if (!playerVehiclePair.ContainsKey(player))
+ return;
+
+ if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
+ {
+ JobManager.playerTimersJobVehicleRespawn[player].Stop();
+ }
+ PlayerTimer playerTimer = new PlayerTimer(player, playerVehiclePair[player], 60000 * 5);
+ playerTimer.Elapsed += JobTimerElapsed;
+ JobManager.playerTimersJobVehicleRespawn[player] = playerTimer;
+ }
+
+ private void JobTimerElapsed(Player player, Vehicle vehicle)
+ {
+ NAPI.Task.Run(() =>
+ {
+ StopJob(player, !player.GetData("isDead"));
+ JobManager.playerTimersJobVehicleRespawn[player].Stop();
+ JobManager.playerTimersJobVehicleRespawn.Remove(player);
+ });
+ }
+
+ public override bool CheckVehicle(Player player, Vehicle vehicle)
+ {
+ if (!playerVehiclePair.ContainsKey(player))
+ return false;
+
+ if (playerVehiclePair[player] == vehicle)
+ return true;
+
+ return false;
+ }
}
}
diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs
index db034056..4a0666e5 100644
--- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs
+++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs
@@ -84,15 +84,15 @@ namespace ReallifeGamemode.Server.Job
player.SetData("FareKm", km);
int targetId = player.GetData("Passager");
if (targetId == 0) return;
-
+
using (var dbContext = new DatabaseContext())
{
if (player.HasData("hasPassager"))
{
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
- player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand.");
-
- if((target.Handmoney - amount) <= 0)
+ player.SendNotification("~r~[Info] ~w~ Dein Kunde hat kein Geld mehr auf der Hand.");
+
+ if ((target.Handmoney - amount) <= 0)
{
Player targetmoney = PlayerService.GetPlayerByNameOrId(Convert.ToString(targetId));
targetmoney.SendNotification("~r~[Fehler] ~w~ Du hast kein Geld mehr auf der Hand.");
@@ -101,8 +101,8 @@ namespace ReallifeGamemode.Server.Job
targetmoney.TriggerEvent("CLIENT:cancelFareCustomer");
targetmoney.WarpOutOfVehicle();
}
- else
- {
+ else
+ {
target.Handmoney -= amount;
player.GetUser(dbContext).Wage += amount;
dbContext.SaveChanges();
@@ -123,11 +123,10 @@ namespace ReallifeGamemode.Server.Job
public static void UpdateFare()
{
-
foreach (var player in GetPlayerInJob())
{
User u = player.GetUser();
- if(u == null)
+ if (u == null)
{
continue;
}
@@ -157,5 +156,26 @@ namespace ReallifeGamemode.Server.Job
}
}
}
+
+ public override void LastCheckpoint(Player player)
+ {
+ //nothing
+ }
+
+ public override void StartJobEndTimer(Player player)
+ {
+ //nothing
+ }
+
+ public override bool CheckVehicle(Player player, Vehicle vehicle)
+ {
+ if (!playerVehiclePair.ContainsKey(player))
+ return false;
+
+ if (playerVehiclePair[player] == vehicle)
+ return true;
+
+ return false;
+ }
}
}
diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs
index 6e5e1f23..ec1afb62 100644
--- a/ReallifeGamemode.Server/Main.cs
+++ b/ReallifeGamemode.Server/Main.cs
@@ -172,8 +172,18 @@ namespace ReallifeGamemode.Server
using (var dbContext = new DatabaseContext())
{
var user = dbContext.Users.Where(u => u.BankAccountId == account.Id).Select(u => u.Name).FirstOrDefault();
- if (user == null) return;
- PlayerService.GetPlayerByNameOrId(user).TriggerEvent("updateMoney", account.Balance);
+ if (user == null)
+ {
+ return;
+ }
+
+ Player player = PlayerService.GetPlayerByNameOrId(user);
+ if(player == null)
+ {
+ return;
+ }
+
+ player.TriggerEvent("updateMoney", account.Balance);
}
};
diff --git a/ReallifeGamemode.Server/Managers/BusinessManager.cs b/ReallifeGamemode.Server/Managers/BusinessManager.cs
index 875d3c9a..77ad2d06 100644
--- a/ReallifeGamemode.Server/Managers/BusinessManager.cs
+++ b/ReallifeGamemode.Server/Managers/BusinessManager.cs
@@ -19,6 +19,8 @@ namespace ReallifeGamemode.Server.Managers
{
public static List Businesses { get; private set; }
+ private const double FACTION_CAR_MULTIPLIER = 1.5;
+
public static void LoadBusinesses()
{
Businesses = new List();
@@ -199,10 +201,10 @@ namespace ReallifeGamemode.Server.Managers
else if (target == "Fraktion")
{
var faction = dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == u.FactionId).First();
- TransactionResult result = BankManager.TransferMoney(faction, business, price * 3, "Auto gekauft", dbContext);
+ TransactionResult result = BankManager.TransferMoney(faction, business, (int)(price * FACTION_CAR_MULTIPLIER), "Auto gekauft", dbContext);
if (result == TransactionResult.SENDER_NOT_ENOUGH_MONEY)
{
- player.SendNotification("~r~Die Fraktion hat nicht genug Geld: " + (price * 3).ToMoneyString());
+ player.SendNotification("~r~Die Fraktion hat nicht genug Geld: " + (price * FACTION_CAR_MULTIPLIER).ToMoneyString());
return;
}
player.SendChatMessage("~y~Deine Fraktion hat das Fahrzeug erfolgreich gekauft");
diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs
index 233563b7..6273452b 100644
--- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs
+++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs
@@ -254,7 +254,7 @@ namespace ReallifeGamemode.Server.Managers
//};
//player.SetHeadOverlay(4, makeupHo);
//player.SetHeadOverlay(5, blushHo);
- NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING);
+ player.SafeTeleport(Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING, true);
player.TriggerEvent("draw", player.Name, player.Handle.Value);
player.Dimension = 0;
}
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index b1c04dfc..7906e1f2 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -215,16 +215,16 @@ namespace ReallifeGamemode.Server.Managers
{
if (type != "Fraktion" && type != "Gruppe") return;
- Player target = PlayerService.GetPlayerByNameOrId(name);
- if (target == null || !target.IsLoggedIn())
+ using var dbContext = new DatabaseContext();
+ User targetUser = dbContext.Users.FirstOrDefault(u => u.Name == name);
+
+ if (targetUser == null)
{
ChatService.PlayerNotFound(player);
return;
}
- using var dbContext = new DatabaseContext();
-
- User targetUser = target.GetUser(dbContext);
+ Player targetPlayer = PlayerService.GetPlayerByNameOrId(name);
User playerUser = player.GetUser(dbContext);
if (type == "Fraktion")
@@ -241,7 +241,7 @@ namespace ReallifeGamemode.Server.Managers
return;
}
- if (player.Handle == target.Handle)
+ if (player.Name == targetUser.Name)
{
ChatService.ErrorMessage(player, "Du kannst dich nicht selber uninviten");
return;
@@ -253,15 +253,21 @@ namespace ReallifeGamemode.Server.Managers
return;
}
- target.SetData("duty", false);
- target.TriggerEvent("toggleDutyMode", false);
- Medic.UpdateDutyMedics(-1);
- UpdateCharacterCloth.LoadCharacterDefaults(target);
- target.GetUser(dbContext).FactionRankId = null;
- target.GetUser(dbContext).FactionId = null;
- ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
- ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
+ if (targetPlayer != null)
+ {
+ targetUser.SetData("duty", false);
+ targetPlayer.TriggerEvent("toggleDutyMode", false);
+ UpdateCharacterCloth.LoadCharacterDefaults(targetPlayer);
+ ChatService.SendMessage(targetPlayer, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
+ FactionHelper.ResetPlayer(targetPlayer, targetUser, dbContext);
+ }
+ Medic.UpdateDutyMedics();
+ targetUser.FactionRankId = null;
+ targetUser.FactionId = null;
targetUser.SetBlipAndNametagColor();
+
+ ChatService.SendMessage(player, "!{02FCFF}Du hast " + targetUser.Name + " aus der Fraktion geworfen.");
+
dbContext.SaveChanges();
}
else if (type == "Gruppe")
@@ -278,7 +284,7 @@ namespace ReallifeGamemode.Server.Managers
return;
}
- if (player.Handle == target.Handle)
+ if (player.Handle == targetPlayer.Handle)
{
ChatService.ErrorMessage(player, "Du kannst dich nicht selber uninviten");
return;
@@ -293,8 +299,8 @@ namespace ReallifeGamemode.Server.Managers
targetUser.Group = null;
targetUser.GroupRank = GroupRank.NONE;
- ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Gruppe geworfen.");
- ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Gruppe geworfen.");
+ ChatService.SendMessage(player, "!{02FCFF}Du hast " + targetPlayer.Name + " aus der Gruppe geworfen.");
+ ChatService.SendMessage(targetPlayer, "!{02FCFF}Du wurdest von " + player.Name + " aus der Gruppe geworfen.");
dbContext.SaveChanges();
}
@@ -834,6 +840,7 @@ namespace ReallifeGamemode.Server.Managers
{
Medic.AddTaskToList(healTask);
player.SetData("healauftrag", true);
+ player.SendNotification("~w~Du hast einen Sanitäter um Hilfe gerufen");
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat soeben einen Serviceauftrag beantragt.", new List() { 2 });
}
}
diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs
index 9cfe6ae4..d6273e28 100644
--- a/ReallifeGamemode.Server/Managers/JobManager.cs
+++ b/ReallifeGamemode.Server/Managers/JobManager.cs
@@ -19,7 +19,7 @@ namespace ReallifeGamemode.Server.Managers
{
private static List _jobs = new List();
- private Dictionary playerJobStartPosition = new Dictionary();
+ public static Dictionary playerJobStartPosition = new Dictionary();
public static void LoadJobs()
{
@@ -160,68 +160,15 @@ namespace ReallifeGamemode.Server.Managers
if (u.JobId == null) return;
- JobBase job = GetJob(u.JobId.Value);
- if (veh.GetServerVehicle() is JobVehicle vehJ && player.VehicleSeat == 0)
- {
- if (vehJ.GetJob().GetUsersInJob().Contains(player))
- {
- if (u.JobId != 2)
- {
- if (!player.HasData("JobVehicleFrei") || player.GetData("JobVehicleFrei") == false)
- {
- player.SetData("DelayTime", 30000);
- veh.SetData("timerJobVehicleRespawn", true);
- player.SetData("LastVehicle", veh);
- player.SetData("LastSVehicle", sVeh);
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- PlayerTimer playerTimer = new PlayerTimer(player, veh, 30000);
- playerTimer.Elapsed += PlayerTimer_Elapsed;
- playerTimersJobVehicleRespawn[player] = playerTimer;
- player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,");
- player.SendChatMessage("~y~[JOB] ~w~Bist du nicht in 30 Sekunden zurück, ~r~wird der Job beendet!");
- //job.StopJob(player);
- return;
- }
- if (player.HasData("JobVehicleFrei") && player.GetData("JobVehicleFrei") == true)
- {
- player.SetData("JobVehicleFrei", false);
- return;
- }
- }
- if (u.JobId == 2)
- {
- if (!player.HasData("JobVehicleFrei") || player.GetData("JobVehicleFrei") == false)
- {
- player.SetData("DelayTime", 60000 * 5);
- veh.SetData("timerJobVehicleRespawn", true);
- player.SetData("LastVehicle", veh);
- player.SetData("LastSVehicle", sVeh);
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- PlayerTimer playerTimer = new PlayerTimer(player, veh, 60000 * 5);
- playerTimer.Elapsed += PlayerTimer_Elapsed;
- playerTimersJobVehicleRespawn[player] = playerTimer;
- //player.SendChatMessage("~y~[JOB] ~w~Du hast das Fahrzeug verlassen,");
- //player.SendChatMessage("~y~[JOB] ~w~Bist du nicht in 30 Sekunden zurück, ~r~wird der Job beendet!");
- //job.StopJob(player);
- return;
- }
- if (player.HasData("JobVehicleFrei") && player.GetData("JobVehicleFrei") == true)
- {
- player.SetData("JobVehicleFrei", false);
- return;
- }
- }
- }
- }
+ JobBase job = GetJob(u.JobId ?? -1);
+
+ if (job == null || !job.GetUsersInJob().Contains(player))
+ return;
+
+ job.StartJobEndTimer(player);
}
- private void PlayerTimer_Elapsed(Player player, Vehicle veh)
+ public void PlayerTimer_Elapsed(Player player, Vehicle veh)
{
NAPI.Task.Run(() =>
{
@@ -256,30 +203,30 @@ namespace ReallifeGamemode.Server.Managers
if (player.GetUser().JobId == 1)//Taxifahrer
{
player.TriggerEvent("CLIENT:stopFare");
- player.Position = new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471);
+ player.SafeTeleport(new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471));
player.Heading = (-171.50303649902344f);
}
if (player.GetUser().JobId == 2)//Müllmann
{
- player.Position = new Vector3(485.4114685058594, -2173.25, 5.918273448944092);
+ player.SafeTeleport(new Vector3(485.4114685058594, -2173.25, 5.918273448944092));
player.Heading = (-15.922085762023926f);
}
if (player.GetUser().JobId == 3)//Pilot
{
if (!player.HasData("PilotenBase") || player.GetData("PilotenBase") == 1) //Sandyshores
{
- player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406);
+ player.SafeTeleport(new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406));
player.Heading = (-154.65234375f);
}
if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2) //LS Airport
{
- player.Position = new Vector3(-1622.48, -3151.58, 13);
+ player.SafeTeleport(new Vector3(-1622.48, -3151.58, 13));
player.Heading = (48.44f);
}
}
if (player.GetUser().JobId == 4)//Busfahrer
{
- player.Position = new Vector3(-535.46, -2144.97, 5.95);
+ player.SafeTeleport(new Vector3(-535.46, -2144.97, 5.95));
player.Heading = (57.03f);
}
}
@@ -311,44 +258,7 @@ namespace ReallifeGamemode.Server.Managers
}
job.StopJob(player);
- if (player.GetUser().JobId == 1)//Taxifahrer
- {
- //player.Position = new Vector3(-628.598388671875, -2107.609130859375, 6.072586536407471);
- //player.Heading = (-171.50303649902344f);
- player.Position = playerJobStartPosition[player];
- }
- if (player.GetUser().JobId == 2)//Müllmann
- {
- player.Position = new Vector3(485.4114685058594, -2173.25, 5.918273448944092);
- player.Heading = (-15.922085762023926f);
- }
- if (player.GetUser().JobId == 3)//Pilot
- {
- if (player.HasData("PilotenBase") || player.GetData("PilotenBase") == 1) //Sandyshores
- {
- player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406);
- player.Heading = (-154.65234375f);
- player.GetUser().SetData("PilotenBase", 0);
- }
- if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2) //LS Airport
- {
- player.Position = new Vector3(-1622.48, -3151.58, 13);
- player.Heading = (48.44f);
- player.GetUser().SetData("PilotenBase", 0);
- }
- }
- if (player.GetUser().JobId == 4)//Busfahrer
- {
- player.Position = new Vector3(-535.46, -2144.97, 5.95);
- player.Heading = (57.03f);
- }
- Vehicle LastVehicle = player.GetData("LastVehicle");
- if (LastVehicle != null && job.Id != GetJob().Id)
- {
- LastVehicle.ResetData("timerJobVehicleRespawn");
- ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle);
- ServerVehicleExtensions.Spawn(sVeh, LastVehicle);
- }
+
if (playerTimersJobVehicleRespawn.ContainsKey(player))
{
playerTimersJobVehicleRespawn[player].Stop();
@@ -360,181 +270,15 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerEnterVehicle)]
public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat)
{
- ServerVehicle sVeh = veh.GetServerVehicle();
- if (sVeh == null)
- {
- return;
- }
-
- if (seat != 0)
- {
- if (sVeh is JobVehicle jV && jV.JobId == 1) // Spieler steigt in Taxi ein
- {
- var taxiJob = JobManager.GetJob();
-
- Player driver = veh.GetDriver();
- if (driver == null)
- {
- return;
- }
-
- if (!driver.HasData("DriverPrice")) return;
- int taxiPrice = driver.GetData("DriverPrice");
- float km = 0;
- if (!driver.HasData("FareKm")) { driver.SetData("FareKm", km); }
- km = driver.GetData("FareKm");
- if (driver.HasData("Passager")) return;
- driver.SetData("Passager", player.GetUser().Id);
- driver.SetData("hasPassager", true);
- /* using (var dbContext = new DatabaseContext())
- {
- int amount = (int)Math.Round(km * taxiPrice);
- User contractUser = player.GetUser(dbContext);
- contractUser.Handmoney -= amount;
- driver.GetUser(dbContext).Wage += amount;
- dbContext.SaveChanges();
- //contractUser.Player.TriggerEvent("SERVER:SET_HANDMONEY", contractUser.Handmoney);
- } */
- player.TriggerEvent("CLIENT:startCustomerFare", taxiPrice, km);
-
- var taxiContracts = taxiJob.TaxiContracts.Where(t => t.Name == player.Name);
- if (taxiContracts.Count() == 0) return;
-
- var contract = taxiContracts.First();
- taxiJob.TaxiContracts.Remove(contract);
-
- if (driver != null && contract.Driver != null && contract.Driver.Handle != veh.GetDriver().Handle)
- {
- ChatService.SendMessage(contract.Driver, $"!{{02FCFF}}{player.Name} ist in ein Taxi eingestiegen, der Auftrag wurde beendet.");
- ChatService.SendMessage(player, $"!{{02FCFF}}Du bist in ein Taxi eingestiegen, der Auftrag wurde beendet.");
- }
- }
- }
JobBase job = GetJob(player.GetUser().JobId ?? -1);
- if (job?.GetUsersInJob()?.Contains(player) ?? false)
+
+ if (job != null && job.GetUsersInJob().Contains(player) && job.CheckVehicle(player, veh) && seat == 0)
{
- if (sVeh != null)
- {
- if (sVeh is JobVehicle JV)
- {
- if (player.GetUser().JobId == 3 || player.GetUser().JobId == 4)
- {
- if (seat == 0)
- {
- JobVehicle c = new JobVehicle();
- if (JV.GetJob().GetUsersInJob().Contains(player))
- {
- if (!player.HasData("LastVehicle") || player.GetData("LastVehicle") == null) return;
- if (player.HasData("LastVehicle") && veh == player.GetData("LastVehicle"))
- {
- veh.SetData("timerJobVehicleRespawn", false);
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- }
- else
- {
- if (player.GetData("HatRoute") == true)
- {
- StopJob(player);
- }
- }
- }
- }
- else
- {
- job.StopJob(player);
- ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- CheckPointHandle.DeleteCheckpoints(player);
- if (!player.HasData("LastVehicle") || player.GetData("LastVehicle") == null) return;
- player.GetData("LastVehicle").ResetData("timerJobVehicleRespawn");
- ServerVehicle nsSVeh = VehicleManager.GetServerVehicleFromVehicle(player.GetData("LastVehicle"));
- ServerVehicleExtensions.Spawn(nsSVeh, player.GetData("LastVehicle"));
- return;
- }
- }
- if (player.GetUser().JobId == 2)
- {
- JobVehicle c = new JobVehicle();
- if (JV.GetJob().GetUsersInJob().Contains(player))
- {
- if (!player.HasData("LastVehicle") || player.GetData("LastVehicle") == null) return;
- if (player.HasData("LastVehicle") && veh == player.GetData("LastVehicle"))
- {
- veh.SetData("timerJobVehicleRespawn", false);
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- }
- else
- {
- if (player.GetData("HatRoute") == true)
- {
- StopJob(player);
- }
- }
- }
- }
- }
- else
- {
- job.StopJob(player);
- ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- CheckPointHandle.DeleteCheckpoints(player);
- if (!player.HasData("LastVehicle"))
- {
- return;
- }
- if (player.GetData("LastVehicle") == null)
- {
- return;
- }
- player.GetData("LastVehicle").ResetData("timerJobVehicleRespawn");
- ServerVehicle nsSVeh = VehicleManager.GetServerVehicleFromVehicle(player.GetData("LastVehicle"));
- ServerVehicleExtensions.Spawn(nsSVeh, player.GetData("LastVehicle"));
- }
- }
- else if (sVeh! is JobVehicle || veh != null)
- {
- job.StopJob(player);
- ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- CheckPointHandle.DeleteCheckpoints(player);
- if (!player.HasData("LastVehicle") || player.GetData("LastVehicle") == null) return;
- player.GetData("LastVehicle").ResetData("timerJobVehicleRespawn");
- ServerVehicle nsSVeh = VehicleManager.GetServerVehicleFromVehicle(player.GetData("LastVehicle"));
- ServerVehicleExtensions.Spawn(nsSVeh, player.GetData("LastVehicle"));
- }
- else if (sVeh is JobVehicle JV)
- {
- if (JV.JobId != player.GetUser().JobId)
- {
- job.StopJob(player);
- ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
- if (playerTimersJobVehicleRespawn.ContainsKey(player))
- {
- playerTimersJobVehicleRespawn[player].Stop();
- }
- CheckPointHandle.DeleteCheckpoints(player);
- if (!player.HasData("LastVehicle") || player.GetData("LastVehicle") == null) return;
- player.GetData("LastVehicle").ResetData("timerJobVehicleRespawn");
- ServerVehicle nsSVeh = VehicleManager.GetServerVehicleFromVehicle(player.GetData("LastVehicle"));
- ServerVehicleExtensions.Spawn(nsSVeh, player.GetData("LastVehicle"));
- }
- }
+ if (!playerTimersJobVehicleRespawn.ContainsKey(player))
+ return;
+
+ playerTimersJobVehicleRespawn[player].Stop();
+ playerTimersJobVehicleRespawn.Remove(player);
}
}
@@ -559,29 +303,6 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerExitVehicle)]
public void JobManagerPlayerExitVehicle2(Player player, Vehicle veh)
{
- ServerVehicle sVeh = veh.GetServerVehicle();
- if (sVeh == null) return;
- if (sVeh is JobVehicle jV && jV.JobId == 1) // Spieler steigt vom Taxi aus
- {
- var taxiJob = JobManager.GetJob();
- if (veh.Occupants.Count == 0) return;
- Player driver = veh.GetDriver();
- if (driver == null) return;
- if (player.GetUser().Id != driver.GetData("Passager")) { player.TriggerEvent("CLIENT:cancelFare"); return; }
- player.TriggerEvent("CLIENT:cancelFareCustomer");
- driver.TriggerEvent("CLIENT:resetFareClock");
- driver.ResetData("Passager");
- driver.ResetData("hasPassager");
- driver.SetData("FareKm", 0);
- driver.TriggerEvent("CLIENT:cancelFare");
- driver.TriggerEvent("CLIENT:startFare");
-
- foreach (Player occupant in veh.Occupants)
- {
- if (occupant == driver) continue;
- occupant.WarpOutOfVehicle();
- }
- }
}
[RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")]
diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs
index 5534a189..ec0ea301 100644
--- a/ReallifeGamemode.Server/Managers/PositionManager.cs
+++ b/ReallifeGamemode.Server/Managers/PositionManager.cs
@@ -5,6 +5,7 @@ using ReallifeGamemode.Server.Shop.Clothing;
using ReallifeGamemode.Server.Shop.SevenEleven;
using ReallifeGamemode.Server.Shop.Friseur;
using ReallifeGamemode.Server.Util;
+using ReallifeGamemode.Server.Extensions;
namespace ReallifeGamemode.Server.Managers
{
@@ -162,13 +163,17 @@ namespace ReallifeGamemode.Server.Managers
{
Position = new Vector3(485.4114685058594, -2173.25, 5.918273448944092),
jobId = 2,
- Skill = 0
+ Skill = 0,
+ eventOnStart = false,
+ eventName = ""
};
JobPoint jobPointPilot = new JobPoint()
{
Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406),
jobId = 3,
- Skill = 0
+ Skill = 0,
+ eventOnStart = false,
+ eventName = ""
};
JobPoint jobPointPilot2 = new JobPoint()
{
@@ -289,7 +294,7 @@ namespace ReallifeGamemode.Server.Managers
return;
}
- player.Position = ElevatorPoints.Where(e => e.Stage == level).First().Position;
+ player.SafeTeleport(ElevatorPoints.Where(e => e.Stage == level).First().Position);
}
}
}
@@ -392,6 +397,8 @@ public class JobPoint
public Vector3 Position { get; set; }
public int jobId { get; set; }
public int Skill { get; set; }
+ public bool eventOnStart { get; set; }
+ public string eventName { get; set; }
}
public class ElevatorPoint
diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs
index 8eefebda..ec064e89 100644
--- a/ReallifeGamemode.Server/Managers/VehicleManager.cs
+++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs
@@ -893,14 +893,15 @@ namespace ReallifeGamemode.Server.Managers
public static ServerVehicle GetServerVehicleFromVehicle(Vehicle veh, DatabaseContext dbContext = null)
{
+ if (veh == null)
+ {
+ return null;
+ }
+
dbContext = dbContext ?? new DatabaseContext();
foreach (KeyValuePair pair in _serverVehicles)
{
- if (veh == null)
- {
- continue;
- }
if (pair.Value == veh.Handle)
{
diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs
index 255b30ad..c4584315 100644
--- a/ReallifeGamemode.Server/Services/ChatService.cs
+++ b/ReallifeGamemode.Server/Services/ChatService.cs
@@ -94,13 +94,28 @@ namespace ReallifeGamemode.Server.Services
///
/// Die Nachricht, die gesendet werden soll
/// Das mindest Admin Level, das für das Erhalten dieser Nachricht benötigt wird
- public static void BroadcastAdmin(string message, AdminLevel minLevel)
+ public static void BroadcastAdmin(string message, AdminLevel minLevel, Func getAddInfoMessage = null, Predicate shouldSendMessage = null)
{
NAPI.Pools.GetAllPlayers().ForEach(p =>
{
if (p.GetUser()?.IsAdmin(minLevel) ?? false)
{
- ChatService.SendMessage(p, message);
+ if(shouldSendMessage != null)
+ {
+ if(!shouldSendMessage(p))
+ {
+ return;
+ }
+ }
+
+ string toSend = message;
+
+ if(getAddInfoMessage != null)
+ {
+ toSend += getAddInfoMessage(p);
+ }
+
+ ChatService.SendMessage(p, toSend);
}
});
}
diff --git a/ReallifeGamemode.Server/Util/CheckPointHandle.cs b/ReallifeGamemode.Server/Util/CheckPointHandle.cs
index 1d8aa46f..84b93b84 100644
--- a/ReallifeGamemode.Server/Util/CheckPointHandle.cs
+++ b/ReallifeGamemode.Server/Util/CheckPointHandle.cs
@@ -3,254 +3,43 @@ using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Job;
-
+using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Util
{
- public class CheckPointHandle : Script
+ public static class CheckPointHandle
{
- public int BusSkill1RouteVerdienst = 1000;
- public int BusSkill2RouteVerdienst = 1300;
- public int BusSkill3RouteVerdienst = 1600;
- public int PilotSkill1RouteVerdienst = 1100;
- public int PilotSkill2RouteVerdienst = 1500;
+ public static int PilotSkill1RouteVerdienst = 1100;
+ public static int PilotSkill2RouteVerdienst = 1500;
public static List listHandle = new List();
public static void DeleteCheckpoints(Player player)
{
- player.SetData("HatRoute", false);
- player.ResetData("Route");
RemovePlayerHandlerFromList(player);
player.TriggerEvent("destroyCP");
}
- public static void StartCheckPointRoute(Player player, IEnumerable nListCps, int delay, int markerID, int markerSize, int markerDist, bool useVehicle, string nEvent)
+ public static void StartCheckPointRoute(this Player player, IEnumerable nListCps, int delay, int markerID, int markerSize, int markerDist, bool useVehicle, string nEvent)
{
-
RemovePlayerHandlerFromList(player);
CheckPointListForPlayer playerHandle = new CheckPointListForPlayer(player, nListCps, delay, markerID, markerSize, markerDist, useVehicle, nEvent);
playerHandle.DeleteCheckpoints();
listHandle.Add(playerHandle);
- player.ResetData("Route");
playerHandle.StartRoute();
-
- player.SetData("HatRoute", true);
- /*if(player.GetUser().BusSkill >= 1000)
- {
- playerHandle.LastCheckpoint = 2;
- }*/
}
- public static void RemovePlayerHandlerFromList(Player player)
+ public static void RemovePlayerHandlerFromList(this Player player)
{
- CheckPointListForPlayer temp = null;
for (int a = 0; a < listHandle.Count; a++)
{
- temp = listHandle[a];
+ CheckPointListForPlayer temp = listHandle[a];
if (temp.player == player)
{
listHandle.Remove(temp);
}
}
}
-
- [RemoteEvent("playerWaitsInCheckpoint")]
- public void PlayerWaitsInCheckpoint(Player user)
- {
- if (user.GetUser().JobId == 4)
- {
- Job.JobBase job = Managers.JobManager.GetJob(user.GetUser().JobId ?? -1);
- if (job.GetUsersInJob().Contains(user))
- {
- if (!user.IsInVehicle || user.VehicleSeat != 0) return;
- Vehicle veh = user.Vehicle;
- user.TriggerEvent("CLIENT:FreezeVehicle", veh);
- user.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
- user.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AnfahrtHaltestelle", "wav", 50);
- if ((VehicleHash)veh.Model == VehicleHash.Bus)
- {
- user.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
- user.TriggerEvent("CLIENT:SetDoorOpen", 1, false, false);
- user.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
- user.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
- user.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
- NAPI.Task.Run(() =>
- {
- BusCheckpoint(user);
- }, delayTime: 3600);
- }
- if ((VehicleHash)veh.Model == VehicleHash.Coach)
- {
- user.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
- NAPI.Task.Run(() =>
- {
- BusCheckpoint(user);
- }, delayTime: 2800);
- }
- if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
- {
- user.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
- user.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
- NAPI.Task.Run(() =>
- {
- BusCheckpoint(user);
- }, delayTime: 3250);
- }
- if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData();
- data.Left = false;
- data.Right = true;
- veh.SetData("indicatorData", data);
- NAPI.ClientEvent.TriggerClientEventForAll("SERVER:setIndicatorStatus", veh.Handle.Value, data.Left, data.Right);
- /*NAPI.Task.Run(() =>
- {
- veh.Position = new Vector3(veh.Position.X, veh.Position.Y, veh.Position.Z + 0.25);
- }, delayTime: 500);*/
- NAPI.Task.Run(() =>
- {
- veh.Position = new Vector3(veh.Position.X, veh.Position.Y, veh.Position.Z + 0.1);
- user.TriggerEvent("CLIENT:FreezeVehicle", veh);
- }, delayTime: 500);
- }
- }
- }
- public static void BusCheckpoint(Player user)
- {
- if (!user.IsInVehicle || user.VehicleSeat != 0) return;
- Vehicle veh = user.Vehicle;
- if ((VehicleHash)veh.Model == VehicleHash.Bus)
- {
- user.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleBus", "wav", 25);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1850);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 1, false, 1850);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 2, false, 1850);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 1850);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1850);
- NAPI.Task.Run(() =>
- {
- user.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
- }, delayTime: 1850);
- }
- if ((VehicleHash)veh.Model == VehicleHash.Coach)
- {
- user.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleCoach", "wav", 35);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1000);
- NAPI.Task.Run(() =>
- {
- user.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
- }, delayTime: 1000);
- }
- if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
- {
- user.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleTourbus", "wav", 25);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 2600);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 2, false, 2600);
- user.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 2600);
- NAPI.Task.Run(() =>
- {
- user.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
- }, delayTime: 2600);
- }
- //user.TriggerEvent("CLIENT:UnFreezeVehicle", veh);
- }
-
- [RemoteEvent("playerInCheckpoint")]
- public void PlayerInCheckpoint(Player user)
- {
- CheckPointListForPlayer temp = null;
- for (int a = 0; a < listHandle.Count; a++)
- {
- temp = listHandle[a];
- if (temp.player == user)
- {
- break;
- }
- }
- if (temp.LastCheckpoint != 1)
- {
- Job.JobBase job = Managers.JobManager.GetJob(user.GetUser().JobId ?? -1);
- if (job?.GetUsersInJob().Contains(user) ?? false)
- {
- if (user.GetUser().JobId == 3)
- {
- if (temp.checkPointsDone == 2)
- {
- if (user.GetData("Route") == "Skill1Route1" || user.GetData("Route") == "Skill1Route2" || user.GetData("Route") == "Skill1Route3")
- {
- PilotJob.payWage(user, PilotSkill1RouteVerdienst / temp.list.Count());
- PilotJob.payWage(user, PilotSkill1RouteVerdienst / temp.list.Count());
- }
- if (user.GetData("Route") == "Skill2Route1" || user.GetData("Route") == "Skill2Route2" || user.GetData("Route") == "Skill2Route3")
- {
- PilotJob.payWage(user, PilotSkill2RouteVerdienst / temp.list.Count());
- PilotJob.payWage(user, PilotSkill2RouteVerdienst / temp.list.Count());
- }
- }
- if (temp.checkPointsDone > 2)
- {
- if (user.GetData("Route") == "Skill1Route1" || user.GetData("Route") == "Skill1Route2" || user.GetData("Route") == "Skill1Route3")
- {
- PilotJob.payWage(user, PilotSkill1RouteVerdienst / temp.list.Count());
- }
- if (user.GetData("Route") == "Skill2Route1" || user.GetData("Route") == "Skill2Route2" || user.GetData("Route") == "Skill2Route3")
- {
- PilotJob.payWage(user, PilotSkill2RouteVerdienst / temp.list.Count());
- }
- }
- //PilotJob.payWage(user, 100);
- }
- if (user.GetUser().JobId == 4)
- {
- if (temp.checkPointsDone == 2)
- {
- if (user.GetData("Route") == "Skill1Route1" || user.GetData("Route") == "Skill1Route2" || user.GetData("Route") == "Skill1Route3" || user.GetData("Route") == "Skill1Route4")
- {
- BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
- BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
- }
- if (user.GetData("Route") == "Skill2Route1" || user.GetData("Route") == "Skill2Route2" || user.GetData("Route") == "Skill2Route3" || user.GetData("Route") == "Skill2Route4")
- {
- BusDriverJob.payWage(user, BusSkill2RouteVerdienst / temp.list.Count());
- BusDriverJob.payWage(user, BusSkill2RouteVerdienst / temp.list.Count());
- }
- if (user.GetData("Route") == "Skill3Route1" || user.GetData("Route") == "Skill3Route2" || user.GetData