Miese Corona Zeiten push für Lenhardt
This commit is contained in:
@@ -1,14 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Linq;
|
||||
using GTANetworkAPI;
|
||||
using ReallifeGamemode.Database.Entities;
|
||||
using ReallifeGamemode.Database.Models;
|
||||
using ReallifeGamemode.Server.Extensions;
|
||||
using ReallifeGamemode.Server.Managers;
|
||||
using System.Linq;
|
||||
using ReallifeGamemode.Server.Services;
|
||||
using ReallifeGamemode.Server.Util;
|
||||
|
||||
namespace ReallifeGamemode.Server.WeaponDeal
|
||||
{
|
||||
@@ -36,12 +34,55 @@ 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);
|
||||
if (vector == new Vector3())
|
||||
return;
|
||||
fVeh.SetData<Vector3>("weaponDealPoint", vector);
|
||||
|
||||
if (user.Faction.WeaponDealTime <= 0)
|
||||
{
|
||||
ChatService.BroadcastFaction("Die albanische Mafia hat einen Deal mit deiner Fraktion abgemacht!", user.Faction);
|
||||
ChatService.SendMessage(client, "Steige in den Burrito ein und fahre zum Waffendeal.");
|
||||
int i = 0;
|
||||
string msg = "";
|
||||
foreach (var point in WeaponDealPoints.WT_Route)
|
||||
{
|
||||
i++;
|
||||
if (point != vector)
|
||||
continue;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 1:
|
||||
msg = "Die albanische Mafia hat einen Waffendeal mit uns abgemacht.";
|
||||
break;
|
||||
|
||||
case 2:
|
||||
msg = "Die Lost MC scheint wieder im Waffen-Business aktiv zu sein.";
|
||||
break;
|
||||
|
||||
case 3:
|
||||
msg = "Ein paar hochrangige Militärs der U.S. Armee versuchen alte sowjetische Waffen los zu werden.";
|
||||
break;
|
||||
|
||||
case 4:
|
||||
msg = "Die russische Mafia kann uns mit östliche Importe beliefern.";
|
||||
break;
|
||||
|
||||
case 5:
|
||||
msg = "Die albanische Mafia will wohl wieder Geschäfte mit uns machen.";
|
||||
break;
|
||||
|
||||
case 6:
|
||||
msg = "Die Waffen von den Russen waren schon immer zuverlässig...";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ChatService.BroadcastFaction($"~y~[WAFFENDEAL]~s~ {msg}", user.Faction);
|
||||
ChatService.SendMessage(client, "~y~[WAFFENDEAL]~s~ Steige in den Burrito ein und fahre zum Waffendeal.");
|
||||
fVeh.SetData("weaponDeal", true);
|
||||
WeaponDealPoints.factionWeaponDeal[user.FactionId.Value] = -1;
|
||||
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
|
||||
Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault();
|
||||
fac.WeaponDealTime = 60;
|
||||
context.SaveChanges();
|
||||
@@ -61,6 +102,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
|
||||
timer.Elapsed += Timer_Elapsed;
|
||||
}
|
||||
*/
|
||||
|
||||
public static void Timer_Elapsed()
|
||||
{
|
||||
using (var context = new DatabaseContext())
|
||||
@@ -73,9 +115,14 @@ namespace ReallifeGamemode.Server.WeaponDeal
|
||||
}
|
||||
context.SaveChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[ServerEvent(Event.PlayerWeaponSwitch)]
|
||||
public void OnPlayerWeaponSwitch(Player player, WeaponHash oldWeapon, WeaponHash newWeapon)
|
||||
{
|
||||
if (!player.HasAttachment("ammobox")) return;
|
||||
NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
|
||||
}
|
||||
|
||||
[RemoteEvent("loadWeaponTransport")]
|
||||
public void SrvEVENT_loadWeaponTransport(Player client)
|
||||
@@ -86,24 +133,24 @@ namespace ReallifeGamemode.Server.WeaponDeal
|
||||
User user = client.GetUser();
|
||||
using (var context = new DatabaseContext())
|
||||
{
|
||||
FactionVehicle factionVehicle = context.FactionVehicles.Where(f => f.GetOwners().Contains(user.FactionId ?? 0) && f.Model == VehicleHash.Burrito3).FirstOrDefault();
|
||||
FactionVehicle factionVehicle = context.FactionVehicles.ToList().Find(f => f.GetOwners().Contains(user.FactionId ?? 0) && f.Model == VehicleHash.Burrito3);
|
||||
Vehicle fVeh = VehicleManager.GetVehicleFromServerVehicle(factionVehicle);
|
||||
fVeh.SetData("weaponDeal", false);
|
||||
fVeh.SetData("WeaponDealLoad", true);
|
||||
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
|
||||
Random rnd = new Random();
|
||||
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 = rnd.Next(45, 75) }; //pistole
|
||||
InventoryManager.AddItemToVehicleInventory(client, item, fVeh);
|
||||
VehicleItem item3 = new VehicleItem() { ItemId = 14, VehicleId = factionVehicle.Id, Amount = rnd.Next(30, 40) }; //Pumpe
|
||||
InventoryManager.AddItemToVehicleInventory(client, item3, fVeh);
|
||||
VehicleItem item2 = new VehicleItem() { ItemId = 16, VehicleId = factionVehicle.Id, Amount = rnd.Next(5, 15) }; //Schutzweste
|
||||
InventoryManager.AddItemToVehicleInventory(client, item2, fVeh);
|
||||
VehicleItem item = new VehicleItem() { ItemId = 11, VehicleId = factionVehicle.Id, Amount = rnd.Next(3, 5) * oMembers }; //pistole
|
||||
InventoryManager.AddItemToVehicleInventory(fVeh, item.ItemId, item.Amount);
|
||||
VehicleItem item3 = new VehicleItem() { ItemId = 14, VehicleId = factionVehicle.Id, Amount = rnd.Next(1, 4) * oMembers }; //Pumpe
|
||||
InventoryManager.AddItemToVehicleInventory(fVeh, item3.ItemId, item3.Amount);
|
||||
VehicleItem item2 = new VehicleItem() { ItemId = 16, VehicleId = factionVehicle.Id, Amount = 1 * oMembers }; //Schutzweste
|
||||
InventoryManager.AddItemToVehicleInventory(fVeh, item2.ItemId, item2.Amount);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using GTANetworkAPI;
|
||||
using System.Linq;
|
||||
using ReallifeGamemode.Database.Entities;
|
||||
using GTANetworkAPI;
|
||||
|
||||
namespace ReallifeGamemode.Server.WeaponDeal
|
||||
{
|
||||
@@ -11,8 +9,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
|
||||
{
|
||||
public static Dictionary<int, int> factionWeaponDeal = new Dictionary<int, int>();
|
||||
|
||||
|
||||
private static readonly IReadOnlyCollection<Vector3> WT_Route = new List<Vector3>
|
||||
public static readonly IReadOnlyCollection<Vector3> WT_Route = new List<Vector3>
|
||||
{
|
||||
//new Vector3(2465.163, 1589.396, 32.72029), ungeeignet
|
||||
new Vector3(1532.045, 1702.775, 109.7561), //Hütte iwo Östlich
|
||||
|
||||
Reference in New Issue
Block a user