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

code formatiert

Browse Source
This commit is contained in:
hydrant
2020-08-04 21:51:38 +02:00
parent c4d4b16006
commit 76d72eebdf
40 changed files with 237 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ReallifeGamemode.Client/assets/sound/fun/bitcoinnect.mp3 Normal file
View File

Binary file not shown.

9
ReallifeGamemode.Server/Bank/bank.cs
View File

@@ -128,16 +128,17 @@ namespace ReallifeGamemode.Server.Bank
using (var dbContext = new DatabaseContext())
{
if(player.GetUser(dbContext) == target.GetUser(dbContext))
if (player.GetUser(dbContext) == target.GetUser(dbContext))
{
player.SendNotification($"~r~Du kannst dir selber kein Geld überweisen.");
return;
}else if(!target.IsLoggedIn())
}
else if (!target.IsLoggedIn())
{
player.SendNotification($"~r~Dieser Spieler ist nicht Online.");
}
else if (amount <= 0 || (int)(amount*1.05) > player.GetUser(dbContext).BankAccount.Balance)
else if (amount <= 0 || (int)(amount * 1.05) > player.GetUser(dbContext).BankAccount.Balance)
{
player.SendNotification($"~r~Dieser Betrag kann nicht überwiesen werden.");
return;
@@ -145,7 +146,7 @@ namespace ReallifeGamemode.Server.Bank
else
{
player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen.");
player.GetUser(dbContext).BankAccount.Balance -= (int)(amount*1.05);
player.GetUser(dbContext).BankAccount.Balance -= (int)(amount * 1.05);
target.GetUser(dbContext).otheramount = amount;
dbContext.SaveChanges();
}

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

@@ -467,6 +467,25 @@ namespace ReallifeGamemode.Server.Commands
}
}
[Command("bitcoin", "~m~/bitcoin [ID]")]
public void CmdAdminBitcoin(Player player, string name)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{
ChatService.NotAuthorized(player);
return;
}
Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(player);
return;
}
target.TriggerEvent("CLIENT:PlaySound", "fun/bitcoinnect", "mp3", 50);
}
#endregion Support
#region ALevel1

2
ReallifeGamemode.Server/Commands/GroupCommands.cs
View File

@@ -1,4 +1,4 @@
using System.Text.RegularExpressions;
using System.Text.RegularExpressions;
using GTANetworkAPI;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Services;

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

@@ -41,7 +41,8 @@ namespace ReallifeGamemode.Server.Commands
if (player.IsInVehicle)
{
pVeh = player.Vehicle;
} else
}
else
{
pVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault();
}

2
ReallifeGamemode.Server/DrivingSchool/Licenses.cs
View File

@@ -1,4 +1,4 @@
using Newtonsoft.Json;
using Newtonsoft.Json;
namespace ReallifeGamemode.Server.DrivingSchool
{

2
ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;

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

@@ -1,4 +1,4 @@
using System.Text.RegularExpressions;
using System.Text.RegularExpressions;
using GTANetworkAPI;
using ReallifeGamemode.Server.Services;

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

@@ -50,7 +50,7 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);
return;
}
else if(u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty())
else if (u.IsAdmin(AdminLevel.HEADADMIN) && player.IsAdminDuty())
{
}
else

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

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using Newtonsoft.Json;

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

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;

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

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Events

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

@@ -159,7 +159,7 @@ namespace ReallifeGamemode.Server.Events
{
if (cloth.SlotType == 1)
{
if(cloth.ClothId != -1)
if (cloth.ClothId != -1)
{
NAPI.Player.SetPlayerAccessory(player, cloth.SlotId, cloth.ClothId, 0);
}

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

@@ -1,4 +1,4 @@
using GTANetworkAPI;
using GTANetworkAPI;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Events

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

@@ -93,7 +93,7 @@ namespace ReallifeGamemode.Server.Events
}
client.GiveWeapon((WeaponHash)special, 30);
if(armor == "Schutzweste")
if (armor == "Schutzweste")
{
client.Armor = 100;
}

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

@@ -1,4 +1,4 @@
using GTANetworkAPI;
using GTANetworkAPI;
/**
* @overview Life of German Reallife - Event Voice (Voice.cs)

2
ReallifeGamemode.Server/Extensions/EnumExtensions.cs
View File

@@ -1,4 +1,4 @@
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Types;
using static ReallifeGamemode.Server.Types.AdminLevel;
namespace ReallifeGamemode.Server.Extensions

2
ReallifeGamemode.Server/Extensions/HouseExtensions.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;

2
ReallifeGamemode.Server/Extensions/IntegerExtension.cs
View File

@@ -1,4 +1,4 @@
namespace ReallifeGamemode.Server.Extensions
namespace ReallifeGamemode.Server.Extensions
{
public static class IntegerExtension
{

2
ReallifeGamemode.Server/Extensions/ListExtensions.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;

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

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using GTANetworkAPI;
using Newtonsoft.Json;

3
ReallifeGamemode.Server/Job/TaxiDriverJob.cs
View File

@@ -83,7 +83,8 @@ namespace ReallifeGamemode.Server.Job
if (targetId == 0) return;
using (var dbContext = new DatabaseContext())
{
if(player.HasData("hasPassager")){
if (player.HasData("hasPassager"))
{
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
target.Handmoney -= amount;
player.GetUser(dbContext).Wage += amount;

3
ReallifeGamemode.Server/Managers/ATMManager.cs
View File

@@ -134,7 +134,8 @@ namespace ReallifeGamemode.Server.Managers
else if (checkATM.Balance < inputField1)
{
client.SendNotification("~r~Nicht genügend Geld im Automaten vorhanden!"); //TODO Im Automaten anzeigen lassen |||| oder OUT OF ORDER anzeigen wenn leer
} else if (inputField1 < 0)
}
else if (inputField1 < 0)
{
client.SendNotification("~r~Du kannst keine negativen Beträge abheben!");
}

14
ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
View File

@@ -115,7 +115,9 @@ namespace ReallifeGamemode.Server.WeaponDeal
{
fac.WeaponDealTime = 180;
context.SaveChanges();
}else {
}
else
{
fac.WeaponDealTime = 60;
context.SaveChanges();
}
@@ -186,7 +188,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
int oMembers = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count();
if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7)){
if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7))
{
VehicleItem item = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //pistol50
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item3 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //PumpShotgun
@@ -196,7 +199,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
VehicleItem item4 = new VehicleItem() { ItemId = 7, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_GANG * oMembers }; //CompactRifle
InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount);
}
else if(factionVehicle.GetOwners().Contains(1)) {
else if (factionVehicle.GetOwners().Contains(1))
{
VehicleItem item = new VehicleItem() { ItemId = 1, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //pistol
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Pistol50
@@ -209,7 +213,9 @@ namespace ReallifeGamemode.Server.WeaponDeal
InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount);
VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP_STUNGUN * oMembers }; //Stungun
InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount);
}else if (factionVehicle.GetOwners().Contains(3)) {
}
else if (factionVehicle.GetOwners().Contains(3))
{
VehicleItem item = new VehicleItem() { ItemId = 3, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //pistol_mk2
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 4, VehicleId = factionVehicle.Id, Amount = WEAPON_AMOUNT_COP * oMembers }; //Combatpistol

2
ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs
View File

@@ -32,7 +32,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
if (!factionWeaponDeal.ContainsKey(factionID))
return new Vector3();
if(factionID == 1 | factionID == 3)
if (factionID == 1 | factionID == 3)
{
Random rnd = new Random();
factionWeaponDeal[factionID] = rnd.Next(0, StaatsFrakWT_Route.Count - 1);