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

finish weaponDealsystem for pd and fib & and change item IDs

Browse Source
This commit is contained in:
Michael
2020-06-16 12:50:53 +02:00
parent b3ba7529b5
commit a28d2d4060
50 changed files with 849 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,9 +49,10 @@ namespace ReallifeGamemode.Server.WeaponDeal
ChatService.ErrorMessage(client, "Der Transporter ist zu weit entfernt");
return;
}
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);
@@ -101,8 +102,15 @@ namespace ReallifeGamemode.Server.WeaponDeal
fVeh.SetData("weaponDeal", true);
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault();
if (fac.Id == 1 | fac.Id == 3)
{
fac.WeaponDealTime = 180;
context.SaveChanges();
}else {
fac.WeaponDealTime = 60;
context.SaveChanges();
}
}
else
{
@@ -170,14 +178,39 @@ 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))
{
VehicleItem item = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //pistole
if (factionVehicle.GetOwners().Contains(8) || factionVehicle.GetOwners().Contains(7)){
VehicleItem item = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //pistol50
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item3 = new VehicleItem() { ItemId = 14, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Pumpe
VehicleItem item3 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //PumpShotgun
InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 16, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Schutzweste
VehicleItem item2 = new VehicleItem() { ItemId = 10, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Schutzweste
InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount);
}else if(factionVehicle.GetOwners().Contains(1)) {
VehicleItem item = new VehicleItem() { ItemId = 1, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //pistol
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 2, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Pistol50
InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount);
VehicleItem item3 = new VehicleItem() { ItemId = 5, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //SMG
InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount);
VehicleItem item4 = new VehicleItem() { ItemId = 9, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //PumpShotgun
InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount);
VehicleItem item5 = new VehicleItem() { ItemId = 10, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Schutzweste
InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount);
VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Stungun
InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount);
}else if (factionVehicle.GetOwners().Contains(3)) {
VehicleItem item = new VehicleItem() { ItemId = 3, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //pistol_mk2
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
VehicleItem item2 = new VehicleItem() { ItemId = 4, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Combatpistol
InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount);
VehicleItem item3 = new VehicleItem() { ItemId = 6, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Carbinrifle
InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount);
VehicleItem item4 = new VehicleItem() { ItemId = 8, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Sniperrifle
InventoryManager.AddItemToVehicleInventory(fVeh, item4.ItemId, item4.Amount);
VehicleItem item5 = new VehicleItem() { ItemId = 10, VehicleId = factionVehicle.Id, Amount = 8 * oMembers }; //Schutzweste
InventoryManager.AddItemToVehicleInventory(fVeh, item5.ItemId, item5.Amount);
VehicleItem item6 = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = 2 * oMembers }; //Stungun
InventoryManager.AddItemToVehicleInventory(fVeh, item6.ItemId, item6.Amount);
}
}
}

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

@@ -20,17 +20,39 @@ namespace ReallifeGamemode.Server.WeaponDeal
new Vector3(-1889.91, 2045.6, 138.68)
}.AsReadOnly();
public static readonly IReadOnlyCollection<Vector3> StaatsFrakWT_Route = new List<Vector3>
{
new Vector3(3627.138, 3759.711, 28.515)
}.AsReadOnly();
public static Vector3 getRndWD_Route(int factionID)
{
if (!factionWeaponDeal.ContainsKey(factionID))
return new Vector3();
if (factionWeaponDeal[factionID] == -1)
if(factionID == 1 | factionID == 3)
{
Random rnd = new Random();
factionWeaponDeal[factionID] = rnd.Next(0, StaatsFrakWT_Route.Count - 1);
return StaatsFrakWT_Route.ElementAt(factionWeaponDeal[factionID]);
}
else
{
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]);
*/
}
}
}