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

wt nachrichten angepasst

Browse Source
This commit is contained in:
Luke
2021-05-14 00:25:44 +02:00
parent 8dc5ad48bb
commit e243ffcb73
2 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,7 +393,7 @@ namespace ReallifeGamemode.Server.Events
} }
weapon.Ammount += item.Amount; weapon.Ammount += item.Amount;
ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt."); ChatService.SendMessage(player, $"~y~[WT] ~s~Du hast eine ~y~Kiste abgeladen ~s~(Inhalt: {item.Amount}x {iItem.Name}).");
unloadedWeaponPackage = true; unloadedWeaponPackage = true;
context.Remove(item); context.Remove(item);
} }

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

@@ -122,34 +122,17 @@ namespace ReallifeGamemode.Server.WeaponDeal
msg = "Die Waffenlieferung steht zur Abholung bereit"; msg = "Die Waffenlieferung steht zur Abholung bereit";
} }
ChatService.BroadcastFaction($"~y~[WAFFENDEAL]~s~ {msg}.", user.Faction); ChatService.BroadcastFaction($"~y~[WT]~s~ {msg}.", user.Faction);
ChatService.SendMessage(client, "~y~[WAFFENDEAL]~s~ Steige in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt."); ChatService.SendMessage(client, "~y~[WT]~s~ Steig in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt.");
fVeh.SetData("weaponDeal", true); fVeh.SetData("weaponDeal", true);
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh); InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault(); Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault();
if (fac.Id == 1 | fac.Id == 3) fac.WeaponDealTime = (fac.Id == 1 | fac.Id == 3) ? 180 : 60;
{
fac.WeaponDealTime = 180;
context.SaveChanges();
}
else
{
fac.WeaponDealTime = 60;
context.SaveChanges(); context.SaveChanges();
} }
} }
}
/*
public static void WeaponDealTimer()
{
System.Timers.Timer timer = new System.Timers.Timer(60000);
timer.Start();
timer.Elapsed += Timer_Elapsed;
}
*/
public static void Timer_Elapsed() public static void Timer_Elapsed()
{ {
@@ -254,8 +237,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount); InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount);
} }
ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id }); ChatService.BroadcastFaction("~y~[WT] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id });
client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück."); client.SendChatMessage("~y~[WT] ~w~Fahre nun zu deiner Base zurück.");
BasePoints basePoints = new BasePoints(); BasePoints basePoints = new BasePoints();
basePoints.getbase(user.FactionId, client); basePoints.getbase(user.FactionId, client);
} }