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

Merge branch 'develop' into 'master'

Browse Source 
[HOTFIX] Death fix

See merge request log-gtav/reallife-gamemode!32
This commit is contained in:
MichaPlays
2021-04-03 23:37:19 +00:00
parent 2b24a7c929 95ce04dc04
commit 5df367500a
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,17 +90,20 @@ namespace ReallifeGamemode.Server.Commands
[Command("help", "~m~Benutzung: ~s~/help")] [Command("help", "~m~Benutzung: ~s~/help")]
public void CmdHelp(Player player) public void CmdHelp(Player player)
{ {
player.SendChatMessage("E - Interagieren (ATM, Türen, Shops, Friseur etc.");
player.SendChatMessage("M - Interaktionsmenü öffnen und schließen"); player.SendChatMessage("M - Interaktionsmenü öffnen und schließen");
player.SendChatMessage("X - Fahrzeug auf -/ abschließen sowie im Fahrzeuginteraktionsmenü öffnen"); player.SendChatMessage("X - Fahrzeug auf -/ abschließen sowie im Fahrzeuginteraktionsmenü öffnen");
player.SendChatMessage("N - Fahrzeugmotor Starten"); player.SendChatMessage("N - Fahrzeugmotor Starten");
player.SendChatMessage("O - Onlineliste öffnen / schließen"); player.SendChatMessage("O - Onlineliste öffnen / schließen");
player.SendChatMessage("I - Inventar öffnen / schließen"); player.SendChatMessage("I - Inventar öffnen / schließen");
player.SendChatMessage("F4 - Mikrofon an/aus schalten"); player.SendChatMessage("F4 - Mikrofon an/aus schalten");
player.SendChatMessage("/skill - Skillpunkte anzeigen");
} }
[Command("hup")] [Command("hup")]
public void CmdAnim(Player player) public void CmdAnim(Player player)
{ {
player.StopAnimation();
player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable)); player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable));
} }

6
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -25,7 +25,7 @@ namespace ReallifeGamemode.Server.Finance
public static (int, float, float) GetEconomyClass(Player client, int wage) public static (int, float, float) GetEconomyClass(Player client, int wage)
{ {
int bankAccount = client.GetUser().BankAccount.Balance; int bankAccount = client.GetUser().BankAccount.Balance;
float financialHelp = -(float)Math.Pow(1.0005, -bankAccount) * -1000; float financialHelp = -(float)Math.Pow(1.0005, -(bankAccount + client.GetUser().Handmoney)) * -1000;
float financialInterest = 1 - (float)Math.Pow(1.00006, -wage) * 1; float financialInterest = 1 - (float)Math.Pow(1.00006, -wage) * 1;
if (financialInterest >= 0.7) if (financialInterest >= 0.7)
financialInterest = 0.7f; financialInterest = 0.7f;
@@ -77,7 +77,7 @@ namespace ReallifeGamemode.Server.Finance
int vehicleTaxation = GetVehicleTaxation(client); int vehicleTaxation = GetVehicleTaxation(client);
int rentalFees = GetRentalFees(client); int rentalFees = GetRentalFees(client);
int healthInsurance = (int)(user.BankAccount.Balance * 0.001); int healthInsurance = (int)((bankAccount + user.Handmoney)* 0.001);
if (healthInsurance < 0) if (healthInsurance < 0)
{ {
healthInsurance = 0; healthInsurance = 0;
@@ -108,7 +108,7 @@ namespace ReallifeGamemode.Server.Finance
public static void ReleasePayDay(Player client, Paycheck paycheck, bool minusJail) public static void ReleasePayDay(Player client, Paycheck paycheck, bool minusJail)
{ {
NAPI.Util.ConsoleOutput("in release payday"); NAPI.Util.ConsoleOutput("in release payday.");
if (client == null || paycheck == null) if (client == null || paycheck == null)
{ {
return; return;

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

@@ -620,7 +620,7 @@ namespace ReallifeGamemode.Server.Job
} }
} }
}*/ }*/
}, delayTime: 30000); }, delayTime: 10000);
} }
} }
} }

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

@@ -795,20 +795,20 @@ namespace ReallifeGamemode.Server.Managers
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers(); List<Player> players = NAPI.Pools.GetAllPlayers();
if (player.GetUser().Wanteds > 0)
{
var listPlayers = players.Select(p => new var listPlayers = players.Select(p => new
{ {
Id = p.Handle.Value, Id = p.Handle.Value,
p.Name, p.Name,
wanted = p.GetUser().Wanteds, wanted = p.GetUser().Wanteds,
}) ; }) ;
player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));
} if(listPlayers.Count() > 0)
else player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));
{ else
player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!"); player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!");
}
} }
[RemoteEvent("CLIENT:InteractionMenu_FindHouse")] [RemoteEvent("CLIENT:InteractionMenu_FindHouse")]

4
ReallifeGamemode.Server/Services/ChatService.cs
View File

@@ -65,10 +65,10 @@ namespace ReallifeGamemode.Server.Services
ChatService.SendMessage(c, message); ChatService.SendMessage(c, message);
} }
} }
else if(user.IsAdmin(AdminLevel.ADMIN) && toAdmins) /*else if(user.IsAdmin(AdminLevel.ADMIN) && toAdmins)
{ {
ChatService.SendMessage(c, message); ChatService.SendMessage(c, message);
} }*/
} }
} }