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

Added Faction Color to Player Blips for Trucker, Ballas and Grove.

Browse Source
This commit is contained in:
Lukas Moungos
2019-12-15 13:52:06 +01:00
parent 9eac853a32
commit c90420ec16
6 changed files with 87 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/util/Gangwar.ts
View File

@@ -333,7 +333,6 @@
}
return false;
}
}
var gangturfs = [];
@@ -379,6 +378,11 @@
last_blip = mp.game.invoke(Natives.GET_NEXT_BLIP_INFO_ID, 5);
}
let last_attackBlip = mp.game.invoke(Natives.GET_FIRST_BLIP_INFO_ID, 378);
while (mp.game.invoke(Natives.DOES_BLIP_EXIST, last_attackBlip)) {
mp.game.ui.removeBlip(last_attackBlip);
last_attackBlip = mp.game.invoke(Natives.GET_NEXT_BLIP_INFO_ID, 378);
}
}

20
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -290,7 +290,25 @@ namespace ReallifeGamemode.Server.Commands
}
ChatService.SendMessage(target, "!{#8181E9}Deine Akte wurde von " + player.Name + " gelöscht. Grund: " + reason);
ChatService.BroadcastFaction("!{#8181E9}HQ: Die Akte von " + target.Name + " wurde von " + player.Name + " gelöscht. Grund: " + reason + ".", new List<int>() { 1, 3 });
if (targetUser.Faction != null)
{
switch (targetUser.Faction.Name)
{
case "Ballas":
target.SetSharedData("blipColor", 83);
break;
case "Grove":
target.SetSharedData("blipColor", 52);
break;
case "Trucker":
target.SetSharedData("blipColor", 5);
break;
}
}
else
{
target.SetSharedData("blipColor", 0);
}
targetUser.Wanteds = 0;
dbContext.SaveChanges();
}

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

@@ -187,7 +187,7 @@ namespace ReallifeGamemode.Server.Events
//FBI
case 3:
nameTagColor = new Color(173, 0, 118);
player.SetSharedData("blipColor", 83);
player.SetSharedData("blipColor", 72);
player.SetAccessories(2, 2, 0);
break;
}

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

@@ -58,7 +58,22 @@ namespace ReallifeGamemode.Server.Events
player.SetData("editmode", false);
player.SetData("quicksavemode", "none");
}
if(user.Faction != null)
{
switch (user.Faction.Name)
{
case "Ballas":
player.SetSharedData("blipColor", 83);
break;
case "Grove":
player.SetSharedData("blipColor", 52);
break;
case "Trucker":
player.SetSharedData("blipColor", 5);
break;
}
}
var userBankAccount = user.GetBankAccount();
userBankAccount.Balance = userBankAccount.Balance;

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

@@ -125,10 +125,38 @@ namespace ReallifeGamemode.Server.Gangwar
this.takeOver(this.Owner);
}
timerCount += 1;
if(timerCount >= 69)
if(timerCount >= 60) //change to 900 before release
{
this.timer.Stop();
this.timer = null;
if(this.Def_Score > this.Att_Score)
{
this.takeOver(this.Owner);
this.Att_Score = 0;
foreach (Client gangwarPlayer in this.playerInGangwar)
{
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
}
}else if(this.Def_Score < this.Att_Score)
{
this.takeOver(this.Attacker);
this.Def_Score = 0;
foreach (Client gangwarPlayer in this.playerInGangwar)
{
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
}
return;
}
else if(this.Def_Score == this.Att_Score)
{
this.takeOver(this.Attacker);
this.Def_Score = 0;
foreach (Client gangwarPlayer in this.playerInGangwar)
{
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
}
return;
}
}
}

20
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -63,7 +63,21 @@ namespace ReallifeGamemode.Server.Managers
ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
if (own.Faction != null)
{
switch (own.Faction.Name)
{
case "Ballas":
player.SetSharedData("blipColor", 83);
break;
case "Grove":
player.SetSharedData("blipColor", 52);
break;
case "Trucker":
player.SetSharedData("blipColor", 5);
break;
}
}
dbContext.SaveChanges();
}
}
@@ -251,8 +265,8 @@ namespace ReallifeGamemode.Server.Managers
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.");
ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
target.SetSharedData("blipColor", 0);
dbContext.SaveChanges();
}
}