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

Merge

Browse Source
This commit is contained in:
VegaZ
2021-04-04 23:36:14 +02:00
parent 5ba74a4c97 6da73eaae9
commit 21f63d279b
15 changed files with 5608 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ReallifeGamemode.Client/Gui/blips.ts
View File

@@ -7,19 +7,13 @@
export default function playerBlips() {
mp.events.add("entityStreamIn", (entity) => {
mp.events.add("entityStreamIn", (entity) => {
mp.game.wait(500);
if (entity.type === "player") {
var entityMp = <EntityMp>entity;
let color = parseInt(entity.getVariable("blipColor"));
entity.createBlip(1);
var blip = entity.blip;
entity.setBlipColor(isNaN(color) ? 0 : color);
mp.game.invoke(Natives.SET_BLIP_CATEGORY, entity.blip, 7);
@@ -31,7 +25,11 @@ export default function playerBlips() {
});
mp.events.add("entityStreamOut", (entity) => {
if (entity.type === "player") {
entity.blip = null;
}
});
mp.events.addDataHandler("blipColor", (entity, value) => {
if (entity.type === "player") {

3
ReallifeGamemode.Client/Gui/nametags.ts
View File

@@ -32,8 +32,6 @@ export default function customNametags() {
mp.nametags.enabled = false;
mp.events.add('render', (nametags) => {
const graphics = mp.game.graphics;
const screenRes = graphics.getScreenResolution(0, 0);
@@ -53,6 +51,7 @@ export default function customNametags() {
y -= scale * (0.005 * (screenRes.y / 1080));
let colorId = game.players.at(player.remoteId).nametagColor;
let color = colors.find(c => c.id === colorId).color;
mp.game.graphics.drawText(player.name + " (" + player.remoteId + ")", [x, y],

3
ReallifeGamemode.Client/core/rage-mp/entities.ts
View File

@@ -72,7 +72,8 @@ class RagePlayer extends RageEntity implements IPlayer {
}
get nametagColor(): number {
var color = this.player.getVariable("nametagColor");
var color = this.player.getVariable("nameTagColor");
game.ui.sendChatMessage(`player = ${this.player.name} - color = ${color}`);
if (!color)
return 0;
return color;

5562
ReallifeGamemode.Client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
ReallifeGamemode.Client/package.json
View File

@@ -22,6 +22,5 @@
"ProjectOpened": [
"watch"
]
},
"dependencies": {}
}
}

6
ReallifeGamemode.Client/util/attachmentMngr.ts
View File

@@ -19,13 +19,13 @@ export default function attachmentManager(game: IGame) {
addFor: async function (entity, id) {
if (this.attachments.hasOwnProperty(id)) {
if (!entity.__attachmentObjects) {
entity.__attachmentObjects = {};
}
if (!entity.__attachmentObjects.hasOwnProperty(id)) {
let attInfo = this.attachments[id];
let object = mp.objects.new(attInfo.model, entity.position);
while (object.handle === 0) {
await mp.game.waitAsync(0);
}
object.__attMgrData = {
targetEntity: entity.handle,

30
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -55,7 +55,18 @@ namespace ReallifeGamemode.Server.Commands
{
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
string broadcastMessage = "!{FF0000}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + " **";
string rank = string.Empty;
if(f.Name == "Ballas" || f.Name == "Grove")
{
rank = player.GetUser().GetFactionRank().RankName;
}
else
{
rank = "[ADMIN]";
}
string broadcastMessage = "!{FF0000}** " + rank + " " + player.Name + ": " + message + " **";
using (var context = new DatabaseContext())
{
ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.GangOwned), true);
@@ -188,12 +199,25 @@ namespace ReallifeGamemode.Server.Commands
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
string broadcastMsg = "~y~[" + player.GetUser().Faction.Name + "] " + player.Name + ": " + message;
string factionName = string.Empty;
if(user.FactionLeader)
{
factionName = player.GetUser().Faction.Name;
}
else
{
factionName = "ADMIN";
}
string broadcastMsg = "~y~[" + factionName + "] " + player.Name + ": " + message;
NAPI.Pools.GetAllPlayers().ForEach(p =>
{
User pUser = p.GetUser();
if (pUser?.FactionLeader ?? false || pUser.IsAdmin(AdminLevel.ADMIN)) ChatService.SendMessage(p, broadcastMsg);
if (pUser.FactionLeader || pUser.IsAdmin(AdminLevel.ADMIN))
{
ChatService.SendMessage(p, broadcastMsg);
}
});
}

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

@@ -218,8 +218,16 @@ namespace ReallifeGamemode.Server.Events
List<VehicleItem> vehicleItems = dbContext.VehicleItems.ToList().Where(f => f.GetVehicle().GetVehicle() == nearestBehindVehiclePoint.vehicle && InventoryManager.GetItemById(f.ItemId) is IWeaponDealItem).ToList();
if (vehicleItems.Count == 0)
{
GTANetworkAPI.Vehicle vehicle = nearestBehindVehiclePoint.vehicle;
if (vehicle.HasAttachment("weapondeal"))
{
vehicle.AddAttachment("weapondeal", true);
vehicle.AddAttachment("weapondeal1", true);
vehicle.AddAttachment("weapondeal2", true);
}
if (WeaponDealManager.checkWeaponDbyVehicle(vehicle))
{
vehicle.ResetData("WeaponDealLoad");
@@ -365,13 +373,11 @@ namespace ReallifeGamemode.Server.Events
using (var context = new DatabaseContext())
{
/*
if (player.HasAttachment("ammobox"))
{
player.AddAttachment("ammobox", true);
player.StopAnimation();
}
*/
bool unloadedWeaponPackage = false;
List<UserItem> fItem = context.UserItems.Where(u => u.UserId == user.Id).ToList();

2
ReallifeGamemode.Server/Inventory/GroundItem.cs
View File

@@ -102,7 +102,7 @@ namespace ReallifeGamemode.Server.Inventory
if (!player.HasAttachment("ammobox"))
{
player.PlayAnimation("anim@heists@box_carry@", "idle", 49);
//player.AddAttachment("ammobox", false);
player.AddAttachment("ammobox", false);
NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
}
}

10
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -195,6 +195,12 @@ namespace ReallifeGamemode.Server.Job
muellmanData.Remove(data);
return;
}
if (player.HasAttachment("binbag"))
{
player.AddAttachment("binbag", true);
}
ChatService.SendMessage(data.getPartnerClient(player), $"~y~[Job] ~s~Dein Partner hat den Job beendet.");
data.removeClientFromData(player);
@@ -211,7 +217,7 @@ namespace ReallifeGamemode.Server.Job
Player target = data.getPartnerClient(player);
if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex);
player.TriggerEvent("renderTextOnScreen", "Wirf den Müllsack in den Müllwagen.");
//player.AddAttachment("binbag", false);
player.AddAttachment("binbag", false);
return;
}
}
@@ -240,7 +246,7 @@ namespace ReallifeGamemode.Server.Job
target.SendNotification("Müllsack: " + data.getTrashCount() + " von " + MAX_BAG + ".");
}
// player.AddAttachment("binbag", true);
player.AddAttachment("binbag", true);
if (data.getTrashCount() == MAX_BAG)
{

2
ReallifeGamemode.Server/Managers/PositionManager.cs
View File

@@ -348,7 +348,7 @@ public class BehindVehiclePoint
if (!player.HasAttachment("ammobox"))
{
player.PlayAnimation("anim@heists@box_carry@", "idle", 49);
//player.AddAttachment("ammobox", false);
player.AddAttachment("ammobox", false);
NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
}
}

7
ReallifeGamemode.Server/Services/ChatService.cs
View File

@@ -58,12 +58,9 @@ namespace ReallifeGamemode.Server.Services
{
User user = c.GetUser();
Faction f = user?.Faction;
if (f != null)
if (f != null && factions.Find(fT => fT.Id == f.Id) != null)
{
if (factions.Find(fT => fT.Id == f.Id) != null)
{
ChatService.SendMessage(c, message);
}
ChatService.SendMessage(c, message);
}
else if (user.IsAdmin(AdminLevel.ADMIN) && toAdmins)
{

1
ReallifeGamemode.Server/Util/AttachmentSync.cs
View File

@@ -97,7 +97,6 @@ public static class AttachmentSync
}
}
entity.ResetSharedData("attachmentsData");
entity.SetData("Attachments", new List<uint>());
}

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

@@ -185,6 +185,9 @@ namespace ReallifeGamemode.Server.WeaponDeal
Vehicle fVeh = VehicleManager.GetVehicleFromServerVehicle(factionVehicle);
fVeh.SetData("weaponDeal", false);
fVeh.SetData("WeaponDealLoad", true);
fVeh.AddAttachment("weapondeal", false);
fVeh.AddAttachment("weapondeal1", false);
fVeh.AddAttachment("weapondeal2", false);
InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
int oMembers = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() && p.GetUser(context).FactionId == user.FactionId).Count();

3
package-lock.json generated Normal file
View File

@@ -0,0 +1,3 @@
{
"lockfileVersion": 1
}