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

fix item Rubbellos & add item Notfallkit

Browse Source
This commit is contained in:
michael.reiswich
2021-05-20 22:24:46 +02:00
parent aa6ec6e7ab
commit 3f926fb9ef
5 changed files with 107 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReallifeGamemode.Client/assets/html/inventory/img/inventory/200.svg Normal file
View File

@@ -0,0 +1 @@
<svg id="icons" enable-background="new 0 0 64 64" height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m7.502 1h33.996v62h-33.996z" fill="#ed5565"/><path d="m18 37.5c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1z" fill="#e6e9ed"/><path d="m57.498 30c0 2.61-1.67 4.84-4 5.66-.63.22-1.3.34-2 .34s-1.37-.12-2-.34c-2.33-.82-4-3.05-4-5.66 0-3.31 2.69-6 6-6s6 2.69 6 6z" fill="#ffce54"/><path d="m53.498 35.66c-.63.22-1.3.34-2 .34s-1.37-.12-2-.34c-2.33-.82-4-3.05-4-5.66v3c0 2.61 1.67 4.84 4 5.65v.01c.63.22 1.3.34 2 .34s1.37-.12 2-.34v-.01c2.33-.811 4-3.04 4-5.65v-3c0 2.61-1.67 4.84-4 5.66z" fill="#f6bb42"/><path d="m20 28.5c0-.55.45-1 1-1h7c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1z" fill="#fff"/><path d="m20 38.5c0-.55.45-1 1-1h7c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1z" fill="#fff"/><path d="m20 18.5c0-.55.45-1 1-1h7c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1z" fill="#fff"/><path d="m18 27.5c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1z" fill="#e6e9ed"/><path d="m18 17.5c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1z" fill="#e6e9ed"/><path d="m38 17.5c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1z" fill="#e6e9ed"/><path d="m38 27.5c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1z" fill="#e6e9ed"/><path d="m38 37.5c.55 0 1 .45 1 1v7c0 .55-.45 1-1 1h-7c-.55 0-1-.45-1-1v-7c0-.55.45-1 1-1z" fill="#e6e9ed"/><path d="m41.502 64h-34c-.553 0-1-.447-1-1v-62c0-.553.447-1 1-1h34c.553 0 1 .447 1 1v62c0 .553-.447 1-1 1zm-33-2h32v-60h-32z" fill="#ed5565"/><path d="m25.499 21h-1.998c-.553 0-1-.447-1-1s.447-1 1-1h1.998c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#656d78"/><path d="m25.499 25c-.553 0-1-.447-1-1v-4c0-.553.447-1 1-1s1 .447 1 1v4c0 .553-.447 1-1 1z" fill="#656d78"/><path d="m25.499 31h-1.998c-.553 0-1-.447-1-1s.447-1 1-1h1.998c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#656d78"/><path d="m25.499 35c-.553 0-1-.447-1-1v-4c0-.553.447-1 1-1s1 .447 1 1v4c0 .553-.447 1-1 1z" fill="#656d78"/><path d="m25.499 41h-1.998c-.553 0-1-.447-1-1s.447-1 1-1h1.998c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#656d78"/><path d="m25.499 45c-.553 0-1-.447-1-1v-4c0-.553.447-1 1-1s1 .447 1 1v4c0 .553-.447 1-1 1z" fill="#656d78"/><path d="m28.499 6c1.66 0 3 1.34 3 3s-1.34 3-3 3h-7.998c-1.66 0-3-1.34-3-3s1.34-3 3-3z" fill="#ffce54"/><path d="m28.499 10h-7.996c-.553 0-1-.447-1-1s.447-1 1-1h7.996c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#f6bb42"/><g fill="#da4453"><path d="m35.5 53.001h-22c-.553 0-1-.447-1-1s.447-1 1-1h22c.553 0 1 .447 1 1s-.447 1-1 1z"/><path d="m35.5 56.001h-22c-.553 0-1-.447-1-1s.447-1 1-1h22c.553 0 1 .447 1 1s-.447 1-1 1z"/><path d="m30.5 59.001h-12c-.553 0-1-.447-1-1s.447-1 1-1h12c.553 0 1 .447 1 1s-.447 1-1 1z"/><path d="m37.528 10c-.553 0-1.005-.447-1.005-1s.442-1 .994-1h.011c.552 0 1 .447 1 1s-.448 1-1 1z"/><path d="m34.528 10c-.553 0-1.005-.447-1.005-1s.442-1 .994-1h.011c.552 0 1 .447 1 1s-.448 1-1 1z"/><path d="m14.506 10c-.553 0-1.005-.447-1.005-1s.442-1 .994-1h.011c.552 0 1 .447 1 1s-.448 1-1 1z"/><path d="m11.506 10c-.553 0-1.005-.447-1.005-1s.442-1 .994-1h.011c.552 0 1 .447 1 1s-.448 1-1 1z"/></g><path d="m47.497 37.448c.579.521 1.25.94 2 1.202v-2.99c-.75-.265-1.421-.688-2-1.209z" fill="#edab37"/><path d="m53.499 38.65c.75-.262 1.421-.682 2-1.202v-2.997c-.579.521-1.25.944-2 1.209z" fill="#edab37"/><path d="m51.498 33c-.553 0-1-.447-1-1v-4c0-.553.447-1 1-1s1 .447 1 1v4c0 .553-.447 1-1 1z" fill="#edab37"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

1
ReallifeGamemode.Client/assets/html/inventory/img/inventory/201.svg Normal file
View File

@@ -0,0 +1 @@
<svg height="464pt" viewBox="0 -88 464 464" width="464pt" xmlns="http://www.w3.org/2000/svg"><path d="m464 288h-464v-168l56-56h352l56 56zm0 0" fill="#e04646"/><path d="m192 288h-192v-168l56-56h80l56 56zm0 0" fill="#e94f4f"/><path d="m136 64 56 56v40h272v-40l-56-56zm0 0" fill="#e04646"/><path d="m328 64h-32v-32h-80v32h-32v-32c0-17.671875 14.328125-32 32-32h80c17.671875 0 32 14.328125 32 32zm0 0" fill="#3d4d63"/><path d="m24 128h16v16h-16zm0 0" fill="#f26666"/><path d="m24 160h16v64h-16zm0 0" fill="#f26666"/><g fill="#cf3a3a"><path d="m192 152h272v16h-272zm0 0"/><path d="m344 128c8.835938 0 16 7.164062 16 16v32c0 8.835938-7.164062 16-16 16s-16-7.164062-16-16v-32c0-8.835938 7.164062-16 16-16zm0 0"/><path d="m328 152h32v16h-32zm0 0"/><path d="m124.6875 64 59.3125 59.3125v164.6875h16v-171.3125l-52.6875-52.6875zm0 0"/></g><path d="m328 128c8.835938 0 16 7.164062 16 16v32c0 8.835938-7.164062 16-16 16s-16-7.164062-16-16v-32c0-8.835938 7.164062-16 16-16zm0 0" fill="#d6d6d4"/><path d="m312 152h32v16h-32zm0 0" fill="#ccccca"/><path d="m352 224h80v32h-80zm0 0" fill="#f26666"/><path d="m184 48h32v16h-32zm0 0" fill="#2e3e51"/><path d="m296 48h32v16h-32zm0 0" fill="#2e3e51"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

58
ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs Normal file
View File

@@ -0,0 +1,58 @@
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using System.Linq;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
namespace ReallifeGamemode.Server.Inventory.Items
{
class Notfallkit : UseItem
{
public override int Id => 201;
public override string Name => "Notfallkit";
public override string Description => "Fahrzeug reparieren";
public override int Gewicht => 1000;
public override string Einheit => "g";
public override uint Object => 875075437;
public override int Price => 500;
public override bool Use(UserItem uItem)
{
Player player = uItem.GetUser().Player;
if (uItem.ItemId != 201)
{
return false;
}
Vehicle veh = null;
var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault();
veh = nearestVeh;
if (veh == null)
{
player.SendNotification("Es befindet sich kein Fahrzeug in deiner Nähe");
return false;
}
if(player.IsInVehicle)
{
player.SendNotification("Du musst aus deinem Fahrzeug aussteigen!");
return false;
}
ChatService.SendMessage(player, $"~b~[AMDIN]~s~ Das Fahrzeug repariert");
player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh);
Vehicle newVeh = serverVehicle.Spawn(veh);
newVeh.Repair();
newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading);
return true;
}
}
}

47
ReallifeGamemode.Server/Inventory/Items/Rubellos.cs
View File

@@ -1,4 +1,14 @@
namespace ReallifeGamemode.Server.Inventory.Items
using System;
using System.Security.Cryptography;
using GTANetworkAPI;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Inventory.Interfaces;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Inventory.Items
{
public class Rubellos : UseItem
{
@@ -9,5 +19,40 @@
public override string Einheit => "g";
public override uint Object => 875075437;
public override int Price => 500;
public override bool Use(UserItem uItem)
{
Player player = uItem.GetUser().Player;
if (uItem.ItemId != 200)
{
return false;
}
Random random = new Random();
int randomNumber = random.Next(1, 5);
if (randomNumber == 1)
{
using (var dbContext = new DatabaseContext())
{
User winner = player.GetUser(dbContext);
winner.Handmoney += 1000;
player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney);
dbContext.SaveChanges();
}
Services.ChatService.SendMessage(player, "Glückwunsch, du hast $1000 gewonnen!");
}
else
{
Services.ChatService.SendMessage(player, "Leider kein Gewinn, viel Glück beim nächsten mal");
}
player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
return true;
}
}
}

29
ReallifeGamemode.Server/Inventory/Items/UseItem.cs
View File

@@ -20,34 +20,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
public abstract uint Object { get; }
public abstract int Price { get; }
public bool Use(UserItem uItem)
{
Player player = uItem.GetUser().Player;
public abstract bool Use(UserItem uItem);
if (uItem.ItemId != 200)
{
return false;
}
Random random = new Random();
int randomNumber = random.Next(1, 5);
if (randomNumber == 1)
{
using (var dbContext = new DatabaseContext())
{
User winner = player.GetUser(dbContext);
winner.Handmoney += 1000;
player.TriggerEvent("SERVER:SET_HANDMONEY", winner.Handmoney);
dbContext.SaveChanges();
}
Services.ChatService.SendMessage(player, "Glückwunsch, du hast $1000 gewonnen!");
}
else
{
Services.ChatService.SendMessage(player, "Leider kein Gewinn, viel Glück beim nächsten mal");
}
player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
return true;
}
}
}