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

change Müllmann

Browse Source
This commit is contained in:
Michael
2020-08-02 15:46:44 +02:00
parent 3e8cf1968f
commit ecd33789d1
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReallifeGamemode.Client/Jobs/RefuseCollector.ts
View File

@@ -29,14 +29,14 @@
vehicle = veh; vehicle = veh;
for (var i = 0; i < posArr.length; i++) { for (var i = 0; i < posArr.length; i++) {
let pos = new mp.Vector3(posArr[i].x, posArr[i].y, posArr[i].z - 1) let pos = new mp.Vector3(posArr[i].x, posArr[i].y, posArr[i].z - 1)
BlipTonne.push(mp.blips.new(1, pos, { name: 'Müllmann', color: 45, shortRange: false })); BlipTonne.push(mp.blips.new(1, pos, { name: 'Mülltonne', color: 45, shortRange: false }));
BlipTonne[i].setFlashTimer(2000); BlipTonne[i].setFlashTimer(2000);
ShapeTonne.push(mp.colshapes.newSphere(posArr[i].x, posArr[i].y, posArr[i].z + 0.5, 1.75)); ShapeTonne.push(mp.colshapes.newSphere(posArr[i].x, posArr[i].y, posArr[i].z + 0.5, 1.75));
} }
BlipTonneBase = mp.blips.new(1, new mp.Vector3(-535.1912, -1713.742, 19.23861 - 1), { name: 'Müllmann', color: 5, shortRange: false }); BlipTonneBase = mp.blips.new(1, new mp.Vector3(-426.69382, -1691.0972, 19.02909 - 1), { name: 'Recylinganlage', color: 5, shortRange: false });
CheckpointTonneBase = mp.markers.new(1, new mp.Vector3(-535.1912, -1713.742, 19.23861 - 1), 10, { direction: new mp.Vector3(-235.5747, -1685.475, 32.7207), color: [255, 255, 0, 150], visible: true, dimension: 0 }); CheckpointTonneBase = mp.markers.new(1, new mp.Vector3(-426.69382, -1691.0972, 19.02909 - 1), 10, { direction: new mp.Vector3(-235.5747, -1685.475, 32.7207), color: [255, 255, 0, 150], visible: true, dimension: 0 });
ShapeTonneBase = mp.colshapes.newSphere(-535.1912, -1713.742, 19.23861 - 1, 10); ShapeTonneBase = mp.colshapes.newSphere(-426.69382, -1691.0972, 19.02909 - 1, 10);
}); });
mp.events.add('SERVER:MuellmannBCSEntfernen', () => { mp.events.add('SERVER:MuellmannBCSEntfernen', () => {
for (var i = 0; i < BlipTonne.length; i++) { for (var i = 0; i < BlipTonne.length; i++) {

5
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -321,15 +321,16 @@ namespace ReallifeGamemode.Server.Commands
[Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]
public void CmdAdminO(Player player, string message) public void CmdAdminO(Player player, string message)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) /* if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{ {
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
} }
*/
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
message = Regex.Replace(message, "#([0-9A-Fa-f]{6})", m => "!{" + m.Groups[0].Value + "}"); message = Regex.Replace(message, "#([0-9A-Fa-f]{6})", m => "!{" + m.Groups[0].Value + "}");
string publicMessage = "~b~(( " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + message + " ~b~))"; string publicMessage = "~b~(( " + /*player.GetUser().AdminLevel.GetName() + */ " " + player.Name + ": " + message + " ~b~))";
ChatService.Broadcast(publicMessage); ChatService.Broadcast(publicMessage);
} }

6
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -226,7 +226,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
} }
client.SetData("ActiveSchool", 2); client.SetData("ActiveSchool", 2);
client.TriggerEvent("renderTextOnScreen", "Sie haben die Führerscheinprüfung gestartet. Steigen Sie in eines der Fahrschulmotorräder ein."); client.TriggerEvent("renderTextOnScreen", "Sie haben die Führerscheinprüfung gestartet. Steigen Sie auf eines der Fahrschulmotorräder ein.");
client.TriggerEvent("waitPlayerEntersVehicle"); client.TriggerEvent("waitPlayerEntersVehicle");
} }
@@ -259,11 +259,11 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
if (checkpoint == 0) if (checkpoint == 0)
{ {
user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch."); user.TriggerEvent("renderTextOnScreen", "Sollten Sie vom Motorrad absteigen, fallen sie durch.");
} }
else if (checkpoint == 12) else if (checkpoint == 12)
{ {
user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle."); user.TriggerEvent("renderTextOnScreen", "Parke nun das Motorrad an der markierten Stelle.");
CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, 3, true, "bikeSchoolEventEnd"); CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, 3, true, "bikeSchoolEventEnd");
} }
} }

2
ReallifeGamemode.Server/Events/ExitVehicle.cs
View File

@@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Events
public class ExitVehicle : Script public class ExitVehicle : Script
{ {
object LastVehicle; object LastVehicle;
public static Timer timerNoobRollerRespawn = new Timer(10000); //10 Minuten Timer NoobRollerRespawn public static Timer timerNoobRollerRespawn = new Timer(600000); //10 Minuten Timer NoobRollerRespawn
[ServerEvent(Event.PlayerExitVehicleAttempt)] [ServerEvent(Event.PlayerExitVehicleAttempt)]
public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle) public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle)
{ {

9
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -204,7 +204,7 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex); if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex);
ChatService.SendMessage((Player)player, "Du hast den Müllsack in der Hand. Bringe ihm zum Müllwagen hinten."); ChatService.SendMessage((Player)player, "Wirf den müllsack in den Müllwagen.");
player.AddAttachment("binbag", false); player.AddAttachment("binbag", false);
return; return;
} }
@@ -224,8 +224,11 @@ namespace ReallifeGamemode.Server.Job
user1 = player.GetUser(dbContext); user1 = player.GetUser(dbContext);
user2 = target.GetUser(dbContext); user2 = target.GetUser(dbContext);
user1.trashcount += 1; user1.trashcount += 1;
if (target != null) player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
user2.trashcount += 1; if (target != null) {
target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
user2.trashcount += 1;
}
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
player.AddAttachment("binbag", true); player.AddAttachment("binbag", true);

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

@@ -83,7 +83,13 @@ namespace ReallifeGamemode.Server.Managers
if (u.JobId != null) if (u.JobId != null)
{ {
ChatService.ErrorMessage(player, "Du musst deinen alten Job kündigen, bevor du einen neuen ausüben kannst"); ChatService.ErrorMessage(player, "Du musst deinen alten Job kündigen, bevor du einen neuen ausüben kannst.");
return;
}
if(u.DriverLicenseVehicle == false)
{
ChatService.ErrorMessage(player, "Um diesen Job annehmen zu können, musst du einen Führerschein besitzen.");
return; return;
} }