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

Peds für Müllmann,Pilot1,Pilot2,Busfahrer + Verdienstsystemänderung + Routen eingefügt + Range von Pilot verkleinert

Browse Source
This commit is contained in:
Mac_Slash
2020-05-05 23:48:31 +02:00
parent 64bff47c6e
commit ce0eac5967
7 changed files with 117 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ReallifeGamemode.Client/util/ped.ts
View File

@@ -1,42 +1,45 @@
export default function ped() {
var ped
var AddPed
var ped: any;
//var AddPed: PedMp[] = new Array<PedMp>(9999);
var AddPed: Array<PedMp> = new Array<PedMp>(9999);
mp.events.add("CLIENT:AddPed", (PedNr, model, positionx, positiony, positionz, heading, dimension, dynamic, freeze, collision, weapon, attackproof, fireexplosionproof, drownproof) => {
PedNr = mp.peds.new(
AddPed[PedNr] = mp.peds.new(
mp.game.joaat(`${model}`),
new mp.Vector3(positionx, positiony, positionz),
heading,
dimension
);
PedNr.setDynamic(dynamic);
PedNr.freezePosition(freeze);
AddPed[PedNr].setDynamic(dynamic);
AddPed[PedNr].freezePosition(freeze);
if (collision == 0) {
PedNr.setCollision(true, true);
PedNr.setProofs(attackproof, fireexplosionproof, fireexplosionproof, true, attackproof, false, false, drownproof)
AddPed[PedNr].setCollision(true, true);
AddPed[PedNr].setProofs(attackproof, fireexplosionproof, fireexplosionproof, true, attackproof, false, false, drownproof)
}
if (collision == 1) {
PedNr.setCollision(false, true);
PedNr.setProofs(attackproof, fireexplosionproof, fireexplosionproof, false, attackproof, false, false, drownproof)
AddPed[PedNr].setCollision(false, true);
AddPed[PedNr].setProofs(attackproof, fireexplosionproof, fireexplosionproof, false, attackproof, false, false, drownproof)
}
if (collision == 2) {
PedNr.setCollision(true, false);
PedNr.setProofs(attackproof, fireexplosionproof, fireexplosionproof, true, attackproof, false, false, drownproof)
AddPed[PedNr].setCollision(true, false);
AddPed[PedNr].setProofs(attackproof, fireexplosionproof, fireexplosionproof, true, attackproof, false, false, drownproof)
}
if (collision == 3) {
PedNr.setCollision(false, false);
PedNr.setProofs(attackproof, fireexplosionproof, fireexplosionproof, false, attackproof, false, false, drownproof)
AddPed[PedNr].setCollision(false, false);
AddPed[PedNr].setProofs(attackproof, fireexplosionproof, fireexplosionproof, false, attackproof, false, false, drownproof)
}
PedNr.setCanBeDamaged(attackproof);
PedNr.setInvincible(attackproof);
AddPed[PedNr].setCanBeDamaged(attackproof);
AddPed[PedNr].setInvincible(attackproof);
//mp.gui.chat.push(`SetInvincible(${attackproof};`);
//mp.gui.chat.push(`SetProofs(${attackproof}, ${fireexplosionproof}, ${attackproof}, ${drownproof});`);
//let pedweapon = mp.game.weapon.createWeaponObject(mp.game.joaat(`${weapon}`), 9999, 0.0, 0.0, 0.0, false, 0.0, 0.0)
//mp.game.weapon.giveWeaponObjectToPed(pedweapon, AddPed);
mp.game.invoke("0xBF0FD6E56C964FCB", PedNr.handle, mp.game.joaat("weapon_SpecialCarbine"), 100, 0, 1);
mp.game.invoke("0xBF0FD6E56C964FCB", AddPed[PedNr].handle, mp.game.joaat("weapon_SpecialCarbine"), 100, 0, 1);
});
mp.events.add("CLIENT:DestroyPed", (PedNr) => {
PedNr.destroy();
if (AddPed[PedNr]) {
AddPed[PedNr].destroy();
}
});
mp.events.add("CLIENT:AddPedModel", (model, positionx, positiony, positionz, heading, dimension) => {
if (model < 1) {

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

@@ -56,7 +56,10 @@ namespace ReallifeGamemode.Server.Events
{
player.TriggerEvent("CLIENT:PlaySound", "music/login", "mp3", 20);
}, delayTime: 1000);
player.TriggerEvent("CLIENT:AddPed", 1, "s_m_y_garbage", 484.88934326171875, -2174.380615234375, 5.918273448944092, -29.673072814941406, 0, false, true, 0, "none", true, true, true);//Ped_Müllmann
player.TriggerEvent("CLIENT:AddPed", 2, "player_two", 1706.76953125, 3277.220947265625, 41.1555061340332, -159.447998046875, 0, false, true, 0, "none", true, true, true);//Ped_Pilot Sandyshores
player.TriggerEvent("CLIENT:AddPed", 3, "s_m_m_pilot_01", -1621.4542236328125, -3152.724365234375, 13.991769790649414, 50.73009490966797, 0, false, true, 0, "none", true, true, true);//Ped_Pilot LS Airport
player.TriggerEvent("CLIENT:AddPed", 4, "u_m_o_finguru_01", -534.4425659179688, -2145.747314453125, 5.992100715637207, 53.96156692504883, 0, false, true, 0, "none", true, true, true);//Ped Busfahrer
TimeSpan currentTime = TimeManager.CurrentTime;
bool disableLightMode = currentTime > LightModeTimeFrom && currentTime < LightModeTimeTo;

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

@@ -156,10 +156,6 @@ namespace ReallifeGamemode.Server.Events
{
player.SetData("isDead", false);
}
player.TriggerEvent("CLIENT:AddPed", 1, "a_m_y_acult_01", 484.5094909667969, -2174.849853515625, 5.918272495269775, -29.673072814941406, 0, false, true, 0, "none", true, true, true);//Ped_Müllmann
player.TriggerEvent("CLIENT:AddPed", 2, "a_m_y_acult_01", 1706.76953125, 3277.220947265625, 41.1555061340332, -159.447998046875, 0, false, true, 0, "none", true, true, true);//Ped_Pilot Sandyshores
player.TriggerEvent("CLIENT:AddPed", 3, "a_m_y_acult_01", -1621.4542236328125, -3152.724365234375, 13.991769790649414, 50.73009490966797, 0, false, true, 0, "none", true, true, true);//Ped_Pilot LS Airport
player.TriggerEvent("CLIENT:AddPed", 4, "a_m_y_acult_01", -534.4425659179688, -2145.747314453125, 5.992100715637207, 53.96156692504883, 0, false, true, 0, "none", true, true, true);//Ped Busfahrer
}
}
}

12
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -222,24 +222,28 @@ namespace ReallifeGamemode.Server.Job
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 1");
player.SetData("Route", "Skill1Route1");
break;
}
case 2:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 2");
player.SetData("Route", "Skill1Route2");
break;
}
case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 3");
player.SetData("Route", "Skill1Route3");
break;
}
case 4:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route4, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 4");
player.SetData("Route", "Skill1Route4");
break;
}
}
@@ -262,24 +266,28 @@ namespace ReallifeGamemode.Server.Job
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 1");
player.SetData("Route", "Skill2Route1");
break;
}
case 2:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 2");
player.SetData("Route", "Skill2Route2");
break;
}
case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 3");
player.SetData("Route", "Skill2Route3");
break;
}
case 4:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route4, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 4");
player.SetData("Route", "Skill2Route3");
break;
}
}
@@ -296,24 +304,28 @@ namespace ReallifeGamemode.Server.Job
{
CheckPointHandle.StartCheckPointRoute(player, Skill3Route1, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 1");
player.SetData("Route", "Skill3Route1");
break;
}
case 2:
{
CheckPointHandle.StartCheckPointRoute(player, Skill3Route2, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 2");
player.SetData("Route", "Skill3Route2");
break;
}
case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill3Route3, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 3");
player.SetData("Route", "Skill3Route3");
break;
}
case 4:
{
CheckPointHandle.StartCheckPointRoute(player, Skill3Route4, 4000, 1, 7, 3, true, "busDriverJob");
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 4");
player.SetData("Route", "Skill3Route4");
break;
}
}

6
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -170,18 +170,21 @@ namespace ReallifeGamemode.Server.Job
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 1");
player.SetData("Route", "Skill1Route1");
break;
}
case 2:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 2");
player.SetData("Route", "Skill1Route2");
break;
}
case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 6, 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;
}
}
@@ -196,18 +199,21 @@ namespace ReallifeGamemode.Server.Job
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 1");
player.SetData("Route", "Skill2Route1");
break;
}
case 2:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 0, 6, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~[JOB] ~w~Route wurde gesetzt.: ~g~Route 2");
player.SetData("Route", "Skill2Route2");
break;
}
case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 6, 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;
}
}

8
ReallifeGamemode.Server/Managers/PositionManager.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Server.Shop.Clothing;
@@ -155,7 +155,7 @@ namespace ReallifeGamemode.Server.Managers
JobPoint jobPointRefuseCollector = new JobPoint()
{
Position = new Vector3(-429.237, -1727.9839, 19.73836),
Position = new Vector3(485.4114685058594, -2173.25, 5.918273448944092),
jobId = 2,
Skill = 0
};
@@ -167,7 +167,7 @@ namespace ReallifeGamemode.Server.Managers
};
JobPoint jobPointPilot2 = new JobPoint()
{
Position = new Vector3(-1622.48, -3151.58, 13),
Position = new Vector3(-1622.44189453125, -3151.955810546875, 13.992053985595703),
jobId = 3,
Skill = 300
};
@@ -186,7 +186,7 @@ namespace ReallifeGamemode.Server.Managers
foreach (JobPoint p in JobPoints)
{
NAPI.Marker.CreateMarker(1, new Vector3(p.Position.X, p.Position.Y, p.Position.Z - 2), new Vector3(p.Position.X, p.Position.Y, p.Position.Z + 1),
new Vector3(0, 0, 0), 1.5f, new Color(255, 255, 255, 50), false, 0);
new Vector3(0, 0, 0), 1.5f, new Color(255, 255, 255, 150), false, 0);
if (p.jobId == 2)
{
NAPI.TextLabel.CreateTextLabel("M\u00fcllmann - Dr\u00fccke ~y~E~s~ um Job zu starten/beenden", p.Position, 15, 1, 0, new Color(255, 255, 255), false, 0);

77
ReallifeGamemode.Server/Util/CheckPointHandle.cs
View File

@@ -5,15 +5,22 @@ using System.Linq;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Job;
namespace ReallifeGamemode.Server.Util
{
public class CheckPointHandle : Script
{
public int BusSkill1RouteVerdienst = 500;
public int BusSkill2RouteVerdienst = 650;
public int BusSkill3RouteVerdienst = 800;
public int PilotSkill1RouteVerdienst = 550;
public int PilotSkill2RouteVerdienst = 750;
public static List<CheckPointListForPlayer> listHandle = new List<CheckPointListForPlayer>();
public static void DeleteCheckpoints(Player player)
{
player.SetData("HatRoute", false);
player.ResetData("Route");
RemovePlayerHandlerFromList(player);
player.TriggerEvent("destroyCP");
}
@@ -26,8 +33,9 @@ namespace ReallifeGamemode.Server.Util
playerHandle.DeleteCheckpoints();
listHandle.Add(playerHandle);
player.ResetData("Route");
playerHandle.StartRoute();
player.SetData("HatRoute", true);
/*if(player.GetUser().BusSkill >= 1000)
{
@@ -164,11 +172,68 @@ namespace ReallifeGamemode.Server.Util
{
if (user.GetUser().JobId == 3)
{
PilotJob.payWage(user, 100);
if (temp.checkPointsDone == 2)
{
if (user.GetData<string>("Route") == "Skill1Route1" || user.GetData<string>("Route") == "Skill1Route2" || user.GetData<string>("Route") == "Skill1Route3")
{
BusDriverJob.payWage(user, PilotSkill1RouteVerdienst / temp.list.Count());
BusDriverJob.payWage(user, PilotSkill1RouteVerdienst / temp.list.Count());
}
if (user.GetData<string>("Route") == "Skill2Route1" || user.GetData<string>("Route") == "Skill2Route2" || user.GetData<string>("Route") == "Skill2Route3")
{
BusDriverJob.payWage(user, PilotSkill2RouteVerdienst / temp.list.Count());
BusDriverJob.payWage(user, PilotSkill2RouteVerdienst / temp.list.Count());
}
}
if (temp.checkPointsDone > 2)
{
if (user.GetData<string>("Route") == "Skill1Route1" || user.GetData<string>("Route") == "Skill1Route2" || user.GetData<string>("Route") == "Skill1Route3")
{
BusDriverJob.payWage(user, PilotSkill1RouteVerdienst / temp.list.Count());
}
if (user.GetData<string>("Route") == "Skill2Route1" || user.GetData<string>("Route") == "Skill2Route2" || user.GetData<string>("Route") == "Skill2Route3")
{
BusDriverJob.payWage(user, PilotSkill2RouteVerdienst / temp.list.Count());
}
}
//PilotJob.payWage(user, 100);
}
if (user.GetUser().JobId == 4)
{
BusDriverJob.payWage(user, 100);
if (temp.checkPointsDone == 2)
{
if(user.GetData<string>("Route") == "Skill1Route1" || user.GetData<string>("Route") == "Skill1Route2" || user.GetData<string>("Route") == "Skill1Route3" || user.GetData<string>("Route") == "Skill1Route4")
{
BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
}
if (user.GetData<string>("Route") == "Skill2Route1" || user.GetData<string>("Route") == "Skill2Route2" || user.GetData<string>("Route") == "Skill2Route3" || user.GetData<string>("Route") == "Skill2Route4")
{
BusDriverJob.payWage(user, BusSkill2RouteVerdienst / temp.list.Count());
BusDriverJob.payWage(user, BusSkill2RouteVerdienst / temp.list.Count());
}
if (user.GetData<string>("Route") == "Skill3Route1" || user.GetData<string>("Route") == "Skill3Route2" || user.GetData<string>("Route") == "Skill3Route3" || user.GetData<string>("Route") == "Skill3Route4")
{
BusDriverJob.payWage(user, BusSkill3RouteVerdienst / temp.list.Count());
BusDriverJob.payWage(user, BusSkill3RouteVerdienst / temp.list.Count());
}
}
if (temp.checkPointsDone > 2)
{
if (user.GetData<string>("Route") == "Skill1Route1" || user.GetData<string>("Route") == "Skill1Route2" || user.GetData<string>("Route") == "Skill1Route3" || user.GetData<string>("Route") == "Skill1Route4")
{
BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
}
if (user.GetData<string>("Route") == "Skill2Route1" || user.GetData<string>("Route") == "Skill2Route2" || user.GetData<string>("Route") == "Skill2Route3" || user.GetData<string>("Route") == "Skill2Route4")
{
BusDriverJob.payWage(user, BusSkill2RouteVerdienst / temp.list.Count());
}
if (user.GetData<string>("Route") == "Skill3Route1" || user.GetData<string>("Route") == "Skill3Route2" || user.GetData<string>("Route") == "Skill3Route3" || user.GetData<string>("Route") == "Skill3Route4")
{
BusDriverJob.payWage(user, BusSkill3RouteVerdienst / temp.list.Count());
}
}
//BusDriverJob.payWage(user, 100);
if (!user.IsInVehicle || user.VehicleSeat != 0) return;
Vehicle veh = user.Vehicle;
if (!(veh.GetData<IndicatorData>("indicatorData") is IndicatorData data)) data = new IndicatorData();
@@ -199,7 +264,7 @@ namespace ReallifeGamemode.Server.Util
public bool useVehicle;
public string eventInCheckpoint = "";
int checkPointsDone = 0;
public int checkPointsDone = 0;
public CheckPointListForPlayer(Player nPlayer, IEnumerable<Vector3> nList, int nDelay, int nMarkerID, int nMarkerSize, int nMarkerDist, bool nUseVehicle, string nEvent)
{
@@ -239,12 +304,12 @@ namespace ReallifeGamemode.Server.Util
player.SetData("HatRoute", false);
if (player.GetUser().JobId == 3)
{
PilotJob.payWage(player, 200);
//PilotJob.payWage(player, 200);
PilotJob.PilotLetzterCheckpoint(player);
}
if (player.GetUser().JobId == 4)
{
BusDriverJob.payWage(player, 200);
//BusDriverJob.payWage(player, 200);
//CheckPointHandle.BusCheckpoint(player);
BusDriverJob.BusLetzterCheckpoint(player);
if (!player.IsInVehicle || player.VehicleSeat != 0) return;