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.

32
ReallifeGamemode.Database/Migrations/20200424163014_UserTimePlayed.cs
View File

@@ -2,22 +2,22 @@
namespace ReallifeGamemode.Database.Migrations
{
public partial class UserTimePlayed : Migration
public partial class UserTimePlayed : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "PlayedMinutes",
table: "Users",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PlayedMinutes",
table: "Users");
}
migrationBuilder.AddColumn<int>(
name: "PlayedMinutes",
table: "Users",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PlayedMinutes",
table: "Users");
}
}
}

50
ReallifeGamemode.Database/Migrations/20200427131454_UserJobSkillBusPilot.cs
View File

@@ -2,32 +2,32 @@
namespace ReallifeGamemode.Database.Migrations
{
public partial class UserJobSkillBusPilot : Migration
public partial class UserJobSkillBusPilot : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "BusSkill",
table: "Users",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "BusSkill",
table: "Users",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "PilotSkill",
table: "Users",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BusSkill",
table: "Users");
migrationBuilder.DropColumn(
name: "PilotSkill",
table: "Users");
}
migrationBuilder.AddColumn<int>(
name: "PilotSkill",
table: "Users",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BusSkill",
table: "Users");
migrationBuilder.DropColumn(
name: "PilotSkill",
table: "Users");
}
}
}

30
ReallifeGamemode.Database/Migrations/20200506184310_FactionVehicleBuyPrice.cs
View File

@@ -2,21 +2,21 @@
namespace ReallifeGamemode.Database.Migrations
{
public partial class FactionVehicleBuyPrice : Migration
public partial class FactionVehicleBuyPrice : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "BuyPrice",
table: "ServerVehicles",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BuyPrice",
table: "ServerVehicles");
}
migrationBuilder.AddColumn<int>(
name: "BuyPrice",
table: "ServerVehicles",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "BuyPrice",
table: "ServerVehicles");
}
}
}

68
ReallifeGamemode.Database/Migrations/20200802143111_AddUserOtherAmount.cs
View File

@@ -2,42 +2,42 @@
namespace ReallifeGamemode.Database.Migrations
{
public partial class AddUserOtherAmount : Migration
public partial class AddUserOtherAmount : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "otheramount",
table: "Users",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "otheramount",
table: "Users",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "trashcount",
table: "Users",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<int>(
name: "trashcount",
table: "Users",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<bool>(
name: "GangOwned",
table: "Factions",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "otheramount",
table: "Users");
migrationBuilder.DropColumn(
name: "trashcount",
table: "Users");
migrationBuilder.DropColumn(
name: "GangOwned",
table: "Factions");
}
migrationBuilder.AddColumn<bool>(
name: "GangOwned",
table: "Factions",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "otheramount",
table: "Users");
migrationBuilder.DropColumn(
name: "trashcount",
table: "Users");
migrationBuilder.DropColumn(
name: "GangOwned",
table: "Factions");
}
}
}

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();
}

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

@@ -125,7 +125,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
User payer = client.GetUser(dbContext);
payer.Handmoney -= 2500;
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges();
}
@@ -221,7 +221,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{
User payer = client.GetUser(dbContext);
payer.Handmoney -= 3500;
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
// client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges();
}

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;

12
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -63,12 +63,12 @@ namespace ReallifeGamemode.Server.Events
{
//if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
//{
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{
player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
ServerVehicleExtensions.Spawn(sVeh, player.Vehicle);
}
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{
player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
ServerVehicleExtensions.Spawn(sVeh, player.Vehicle);
}
//}
}
if (Managers.JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))

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

@@ -50,13 +50,13 @@ 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
{
if ((VehicleHash)vehicle.Model == VehicleHash.Velum && player.GetUser().PilotSkill < 300)
{
{
player.SetData("JobVehicleFrei", true);
player.StopAnimation();
player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!");

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

@@ -88,10 +88,10 @@ namespace ReallifeGamemode.Server.Events
{
//if (!p.IsInVehicle)
//{
if (p.GetData<bool>("HatNoobSpawnVehicle") == true)
{
p.ResetData("HatNoobSpawnVehicle");
}
if (p.GetData<bool>("HatNoobSpawnVehicle") == true)
{
p.ResetData("HatNoobSpawnVehicle");
}
//}
});
});

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

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

@@ -86,14 +86,14 @@ namespace ReallifeGamemode.Server.Events
client.GiveWeapon((WeaponHash)melee, 1);
if (!uint.TryParse(specialModel, out uint special))
{
if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2");
special = NAPI.Util.GetHashKey($"weapon_{specialModel}");
}
client.GiveWeapon((WeaponHash)special, 30);
if (!uint.TryParse(specialModel, out uint special))
{
if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2");
special = NAPI.Util.GetHashKey($"weapon_{specialModel}");
}
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;

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

@@ -186,13 +186,13 @@ namespace ReallifeGamemode.Server.Job
player.SetData("Route", "Skill1Route2");
break;
}
/*case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 26, 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;
}*/
/*case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill1Route3, 0, 26, 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;
}*/
}
}
if (player.HasData("PilotenBase") && player.GetData<int>("PilotenBase") == 2)
@@ -215,13 +215,13 @@ namespace ReallifeGamemode.Server.Job
player.SetData("Route", "Skill2Route2");
break;
}
/*case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 26, 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;
}*/
/*case 3:
{
CheckPointHandle.StartCheckPointRoute(player, Skill2Route3, 0, 26, 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;
}*/
}
}
}

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

@@ -83,12 +83,13 @@ namespace ReallifeGamemode.Server.Job
if (targetId == 0) return;
using (var dbContext = new DatabaseContext())
{
if(player.HasData("hasPassager")){
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
target.Handmoney -= amount;
player.GetUser(dbContext).Wage += amount;
dbContext.SaveChanges();
//target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
if (player.HasData("hasPassager"))
{
User target = dbContext.Users.Where(u => u.Id == targetId).FirstOrDefault();
target.Handmoney -= amount;
player.GetUser(dbContext).Wage += amount;
dbContext.SaveChanges();
//target.Player.TriggerEvent("SERVER:SET_HANDMONEY", target.Handmoney);
}
}
}
@@ -112,18 +113,18 @@ namespace ReallifeGamemode.Server.Job
int playerId = player.GetUser().Id;
if (player.IsInVehicle)
{
Vehicle v = player.Vehicle;
Vector3 lastPosition = v.Position;
if (lastPositions.ContainsKey(v.Handle)) lastPosition = lastPositions[v.Handle];
lastPositions[v.Handle] = v.Position;
Vehicle v = player.Vehicle;
Vector3 lastPosition = v.Position;
if (lastPositions.ContainsKey(v.Handle)) lastPosition = lastPositions[v.Handle];
lastPositions[v.Handle] = v.Position;
double distance = lastPosition.DistanceTo(v.Position) / 1000.0;
if (distance > 0.5) { ChatService.BroadcastAdmin($"Möglicher Cheater - {player.Name}", AdminLevel.MAPPING); continue; }
if (!player.GetData<bool>("hasPassager")) continue;
foreach (Player occupant in v.Occupants)
{
occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance));
}
double distance = lastPosition.DistanceTo(v.Position) / 1000.0;
if (distance > 0.5) { ChatService.BroadcastAdmin($"Möglicher Cheater - {player.Name}", AdminLevel.MAPPING); continue; }
if (!player.GetData<bool>("hasPassager")) continue;
foreach (Player occupant in v.Occupants)
{
occupant.TriggerEvent("CLIENT:updateFare", JsonConvert.SerializeObject(distance));
}
}
}
}

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!");
}

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

@@ -55,7 +55,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1;
Vector3 vector;
vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
if (vector == new Vector3())
return;
fVeh.SetData<Vector3>("weaponDealPoint", vector);
@@ -115,9 +115,11 @@ namespace ReallifeGamemode.Server.WeaponDeal
{
fac.WeaponDealTime = 180;
context.SaveChanges();
}else {
fac.WeaponDealTime = 60;
context.SaveChanges();
}
else
{
fac.WeaponDealTime = 60;
context.SaveChanges();
}
}
else
@@ -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

16
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);
@@ -45,14 +45,14 @@ namespace ReallifeGamemode.Server.WeaponDeal
return WT_Route.ElementAt(factionWeaponDeal[factionID]);
}
/* if (factionWeaponDeal[factionID] == -1)
{
Random rnd = new Random();
factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1);
}
return WT_Route.ElementAt(factionWeaponDeal[factionID]);
/* if (factionWeaponDeal[factionID] == -1)
{
Random rnd = new Random();
factionWeaponDeal[factionID] = rnd.Next(0, WT_Route.Count - 1);
}
return WT_Route.ElementAt(factionWeaponDeal[factionID]);
*/
*/
}
}
}