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

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

@@ -385,7 +385,7 @@ namespace ReallifeGamemode.Server.Events
}
weapon.Ammount += item.Amount;
ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefürgt.");
ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt.");
unloadedWeaponPackage = true;
context.Remove(item);
}

2
ReallifeGamemode.Server/Inventory/Items/Aal.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Aal : DropItem
{
public override int Id => 6;
public override int Id => 21;
public override string Name => "Aal";
public override string Description => "Ein Fisch";
public override int Gewicht => 3600;

2
ReallifeGamemode.Server/Inventory/Items/Barsch.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Barsch : DropItem
{
public override int Id => 7;
public override int Id => 22;
public override string Name => "Barsch";
public override string Description => "Ein Fisch";
public override int Gewicht => 2600;

2
ReallifeGamemode.Server/Inventory/Items/Cannabis.cs
View File

@@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cannabis : IDroppableItem
{
public int Id => 4;
public int Id => 30;
public string Name => "Grünes Gift";
public string Description => "puff puff and pass";
public int Gewicht => 50;

2
ReallifeGamemode.Server/Inventory/Items/CarbineRifle.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class CarbineRifle : WeaponDealItem
{
public override int Id => 13;
public override int Id => 6;
public override string Name => "CarbineRifle";
public override string Description => "Waffe";
public override int Gewicht => 4000;

4
ReallifeGamemode.Server/Inventory/Items/Cheeseburger.cs
View File

@@ -8,8 +8,8 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cheeseburger : FoodItem
{
public override int Id => 2;
public override string Name => "Hamburger";
public override int Id => 27;
public override string Name => "Cheeseburger";
public override string Description => "Ein Burger";
public override int Gewicht => 300;
public override string Einheit => "g";

2
ReallifeGamemode.Server/Inventory/Items/Cocain.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Cocain : FoodItem
{
public override int Id => 3;
public override int Id => 31;
public override string Name => "Kosks";
public override string Description => "Rave";
public override int Gewicht => 50;

17
ReallifeGamemode.Server/Inventory/Items/Combatpstiol.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Combatpstiol : WeaponDealItem
{
public override int Id => 4;
public override string Name => "Combatpistol";
public override string Description => "Waffe";
public override int Gewicht => 1180;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

18
ReallifeGamemode.Server/Inventory/Items/Compactrifle.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Compactrifle : WeaponDealItem
{
public override int Id => 7;
public override string Name => "CompactRifle";
public override string Description => "Waffe";
public override int Gewicht => 3080;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

2
ReallifeGamemode.Server/Inventory/Items/Flunder.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Flunder : DropItem
{
public override int Id => 5;
public override int Id => 23;
public override string Name => "Flunder";
public override string Description => "Ein Fisch";
public override int Gewicht => 7700;

2
ReallifeGamemode.Server/Inventory/Items/Holz.cs
View File

@@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Holz : IDroppableItem
{
public int Id => 1;
public int Id => 32;
public string Name => "Holz";
public string Description => "Ich und mein Holz.";
public int Gewicht => 650;

2
ReallifeGamemode.Server/Inventory/Items/Lachs.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Lachs : DropItem
{
public override int Id => 8;
public override int Id => 24;
public override string Name => "Lachs";
public override string Description => "Du Lachs";
public override int Gewicht => 4200;

17
ReallifeGamemode.Server/Inventory/Items/Pistol.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Pistol : WeaponDealItem
{
public override int Id => 1;
public override string Name => "Pistol";
public override string Description => "Waffe";
public override int Gewicht => 1180;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

2
ReallifeGamemode.Server/Inventory/Items/Pistol50.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Pistol50 : WeaponDealItem
{
public override int Id => 11;
public override int Id => 2;
public override string Name => "Pistol50";
public override string Description => "Waffe";
public override int Gewicht => 1180;

17
ReallifeGamemode.Server/Inventory/Items/Pistolmk2.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Pistolmk2 : WeaponDealItem
{
public override int Id => 3;
public override string Name => "Pistol_MK2";
public override string Description => "Waffe";
public override int Gewicht => 1180;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

2
ReallifeGamemode.Server/Inventory/Items/PumpShotgun.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class PumpShotgun : WeaponDealItem
{
public override int Id => 14;
public override int Id => 9;
public override string Name => "PumpShotgun";
public override string Description => "Waffe";
public override int Gewicht => 3600;

2
ReallifeGamemode.Server/Inventory/Items/SMG.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class SMG : WeaponDealItem
{
public override int Id => 12;
public override int Id => 5;
public override string Name => "SMG";
public override string Description => "Waffe";
public override int Gewicht => 3080;

2
ReallifeGamemode.Server/Inventory/Items/Schutzweste.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Schutzweste : WeaponDealItem
{
public override int Id => 16;
public override int Id => 10;
public override string Name => "Schutzweste";
public override string Description => "Waffe";
public override int Gewicht => 3000;

2
ReallifeGamemode.Server/Inventory/Items/SniperRifle.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class SniperRifle : WeaponDealItem
{
public override int Id => 15;
public override int Id => 8;
public override string Name => "SniperRifle";
public override string Description => "Waffe";
public override int Gewicht => 12900;

18
ReallifeGamemode.Server/Inventory/Items/Stungun.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Stungun : WeaponDealItem
{
public override int Id => 11;
public override string Name => "Stungun";
public override string Description => "Waffe";
public override int Gewicht => 1180;
public override string Einheit => "g";
public override uint Object => 3666746839; //3061944032
public override int Price => 0;
}
}

2
ReallifeGamemode.Server/Inventory/Items/Thunfisch.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Thunfisch : DropItem
{
public override int Id => 9;
public override int Id => 25;
public override string Name => "Thunfisch";
public override string Description => "Ein Fisch";
public override int Gewicht => 11000;

2
ReallifeGamemode.Server/Inventory/Items/Zander.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
{
public class Zander : DropItem
{
public override int Id => 10;
public override int Id => 26;
public override string Name => "Zander";
public override string Description => "Ein Fisch";
public override int Gewicht => 5000;

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]);
*/
}
}
}