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

[BUG-58] Fix waffenschrank

Browse Source
This commit is contained in:
hydrant
2021-05-08 00:27:20 +02:00
parent 53e81e6fdd
commit 459ce10a64
2 changed files with 95 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ReallifeGamemode.Client/Tuning/main.ts
View File

@@ -22,7 +22,7 @@ export default function tuning(globalData: IGlobalData) {
const disableInput = [75, 278, 279, 280, 281, 23, 59, 60, 71, 72, 74];
const carModTypes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 18, 22, -1, 25, 27, 28, 33, 34, 35, 38, 39, 40, 41, 42, 43, 44, 46, 48, 69];
const carModTypes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15, 18, 22, -2, -1, 25, 27, 28, 33, 34, 35, 38, 39, 40, 41, 42, 43, 44, 46, 48, 69];
const carModSlotName = [
{ Slot: 0, Name: "Spoiler", Price: 1000 },
@@ -43,7 +43,7 @@ export default function tuning(globalData: IGlobalData) {
{ Slot: 15, Name: "Federung", Price: 2000 },
{ Slot: 18, Name: "Turbo", BasePercentage: 45, PriceIncreasePerLevel: 0 },
{ Slot: 22, Name: "Licht", Price: 500 },
{ Slot: 23, Name: "Reifen", Price: 1000 },
{ Slot: -2, Name: "Reifen", Price: 1000 },
{ Slot: -1, Name: "Lackierung", Price: 1000 },
{ Slot: 25, Name: "Nummernschildhalter", Price: 500 },
{ Slot: 27, Name: "Innenausstatung", Price: 500 },
@@ -207,6 +207,12 @@ export default function tuning(globalData: IGlobalData) {
mainMenu.BindMenuToItem(colorMenu, colorItem);
return;
} else if (modType == -2) {
var wheelsItem = new UIMenuItem("Reifen");
var wheelsMenu = getWheelsMenu();
mainMenu.AddItem(wheelsItem);
mainMenu.BindMenuToItem(wheelsMenu, wheelsItem);
}
var num = localVehicle.getNumMods(modType);
@@ -302,8 +308,6 @@ export default function tuning(globalData: IGlobalData) {
});
});
mainMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
if (item === repairItem) {
mp.events.callRemote("repairVehicle");
@@ -493,6 +497,11 @@ export default function tuning(globalData: IGlobalData) {
}
}
function getWheelsMenu(): NativeUI.Menu {
var wheelsMenu = new NativeUI.Menu("Reifen", "rollin on dem rims", new NativeUI.Point(0, screenRes.y / 3));
return wheelsMenu;
}
function getColorMenu(): NativeUI.Menu {
var currentColors = mp.players.local.vehicle.getColours(0, 0);
@@ -591,6 +600,8 @@ export default function tuning(globalData: IGlobalData) {
mp.events.callRemote("CLIENT:TuningManager_SetVehicleColor", false, color);
}
class VehicleModMenuItem extends UIMenuItem {
public price: number;
}

165
ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
View File

@@ -1,62 +1,32 @@
using System;
using System.Linq;
using GTANetworkAPI;
using Microsoft.Extensions.Logging;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Log;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Events
{
public class UpdateCharacterWeapon : Script
{
[RemoteEvent("updateWeaponSelection")]
public void UpdateWeaponSelection(Player client, string weaponModel, int slot)
{
if (weaponModel == "Keine")
{
client.RemoveAllWeapons();
return;
}
private ILogger logger = LogManager.GetLogger<UpdateCharacterWeapon>();
WeaponHash weaponHash = NAPI.Util.WeaponNameToModel(weaponModel);
private const int SLOT_PRIMARY = 2;
private const int SLOT_SECONDARY = 1;
private const int SLOT_MEELE = 3;
private const int SLOT_SPECIAL = 4;
if (slot == 1)
{
client.RemoveAllWeapons();
client.GiveWeapon(weaponHash, 0);
}
if (slot == 2)
{
client.RemoveAllWeapons();
client.GiveWeapon(weaponHash, 0);
}
if (slot == 3)
{
client.RemoveAllWeapons();
client.GiveWeapon(weaponHash, 0);
}
if (slot == 4)
{
client.RemoveAllWeapons();
client.GiveWeapon(weaponHash, 0);
}
if (slot == 5)
{
client.SafeSetArmor(100);
}
}
[RemoteEvent("cancelWeaponSelection")]
public void CancelWeaponSelection(Player client)
{
client.RemoveAllWeapons();
}
[RemoteEvent("saveWeaponSelection")]
public void SaveWeaponSelection(Player client, string primaryModel, string secondaryModel, string meleeModel, string specialModel, string armor)
{
WeaponPoint nearestWeapon = PositionManager.WeaponPoints.Find(w => w.Position.DistanceTo(client.Position) <= 1.5 && w.FactionId == client.GetUser().FactionId);
using var dbContext = new DatabaseContext();
User user = client.GetUser(dbContext);
WeaponPoint nearestWeapon = PositionManager.WeaponPoints.Find(w => w.Position.DistanceTo(client.Position) <= 1.5 && w.FactionId == user.FactionId);
if (nearestWeapon == null)
{
@@ -64,59 +34,88 @@ namespace ReallifeGamemode.Server.Events
return;
}
client.RemoveAllWeapons();
if (!uint.TryParse(primaryModel, out uint primary))
if (!string.IsNullOrEmpty(primaryModel))
{
if (primaryModel.Contains("mk2") && !primaryModel.Contains("_mk2")) primaryModel = primaryModel.Replace("mk2", "_mk2");
primary = NAPI.Util.GetHashKey($"weapon_{primaryModel}");
}
if (!uint.TryParse(secondaryModel, out uint secondary))
{
if (secondaryModel.Contains("mk2") && !secondaryModel.Contains("_mk2")) secondaryModel = secondaryModel.Replace("mk2", "_mk2");
secondary = NAPI.Util.GetHashKey($"weapon_{secondaryModel}");
}
if (!uint.TryParse(meleeModel, out uint melee))
{
if (meleeModel.Contains("mk2") && !meleeModel.Contains("_mk2")) meleeModel = meleeModel.Replace("mk2", "_mk2");
melee = NAPI.Util.GetHashKey($"weapon_{meleeModel}");
HandleSlot(user, client, 2, primaryModel, dbContext);
}
client.GiveWeapon((WeaponHash)primary, 500);
client.GiveWeapon((WeaponHash)secondary, 250);
client.GiveWeapon((WeaponHash)melee, 1);
if (!uint.TryParse(specialModel, out uint special))
if (!string.IsNullOrEmpty(secondaryModel))
{
if (specialModel.Contains("mk2") && !specialModel.Contains("_mk2")) specialModel = specialModel.Replace("mk2", "_mk2");
special = NAPI.Util.GetHashKey($"weapon_{specialModel}");
HandleSlot(user, client, 1, secondaryModel, dbContext);
}
client.GiveWeapon((WeaponHash)special, 30);
if (!string.IsNullOrEmpty(meleeModel))
{
HandleSlot(user, client, 3, meleeModel, dbContext);
}
if (!string.IsNullOrEmpty(specialModel))
{
HandleSlot(user, client, 4, specialModel, dbContext);
}
dbContext.SaveChanges();
if (armor == "Schutzweste")
{
logger.LogInformation("Player {0} took armor from weaponrack of faction {1}", user.Name, user.FactionId);
client.SafeSetArmor(100);
}
using (var context = new DatabaseContext())
{
User user = client.GetUser();
FactionWeapon slot1 = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == primaryModel).FirstOrDefault();
if (slot1 != null)
slot1.Ammount -= 1;
FactionWeapon slot2 = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == secondaryModel).FirstOrDefault();
if (slot2 != null)
slot2.Ammount -= 1;
FactionWeapon slot3 = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == meleeModel).FirstOrDefault();
if (slot3 != null)
slot3.Ammount -= 1;
FactionWeapon slot4 = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == specialModel).FirstOrDefault();
if (slot4 != null)
slot4.Ammount -= 1;
FactionWeapon slot5 = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.WeaponModel == armor).FirstOrDefault();
if (slot5 != null)
slot5.Ammount -= 1;
context.SaveChanges();
}
public void HandleSlot(User user, Player player, int slot, string selection, DatabaseContext context)
{
string weapon = GetRealWeaponModelName(selection);
uint hashKey = NAPI.Util.GetHashKey(weapon);
if (!Enum.GetValues(typeof(WeaponHash)).Cast<WeaponHash>().Contains((WeaponHash)hashKey))
{
logger.LogWarning("Player {0} tried to take invalid weapon {1} from weaponrack of faction {2}", user.Name, selection, user.FactionId);
return;
}
var slotWeapons = context.FactionWeapons.Where(w => w.FactionId == user.FactionId && w.SlotID == slot).ToList();
foreach (var slotWeaponHash in slotWeapons.Select(w => NAPI.Util.GetHashKey(GetRealWeaponModelName(w.WeaponModel))))
{
player.RemoveWeapon((WeaponHash)slotWeaponHash);
}
var chosenWeapon = slotWeapons.Where(w => w.WeaponModel == selection).FirstOrDefault();
if (chosenWeapon == null)
{
logger.LogWarning("Player {0} tried to take not-existing weapon {1} from weaponrack of faction {2}", user.Name, selection, user.FactionId);
return;
}
int ammo = GetSlotAmmoAmount(slot);
player.GiveWeapon((WeaponHash)hashKey, ammo);
player.SetWeaponAmmo((WeaponHash)hashKey, ammo);
chosenWeapon.Ammount -= 1;
logger.LogInformation("Player {0} took weapon {1} from weaponrack of faction {2}", user.Name, selection, user.FactionId);
}
private int GetSlotAmmoAmount(int slot) => slot switch
{
SLOT_PRIMARY => 500,
SLOT_SECONDARY => 250,
SLOT_MEELE => 1,
SLOT_SPECIAL => 20,
_ => 1
};
private string GetRealWeaponModelName(string weapon)
{
string ret = "weapon_" + weapon.ToLower();
if (!ret.Contains("_mk2") && ret.Contains("mk2"))
{
ret = ret.Replace("mk2", "_mk2");
}
return ret;
}
[RemoteEvent("CLIENT:Ammunation_BuyWeapon")]