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

testings

Browse Source
This commit is contained in:
michael.reiswich
2021-05-11 11:13:39 +02:00
parent 47180f6e33
commit 1bc8051d0d
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReallifeGamemode.Client/util/carwash.ts
View File

@@ -7,10 +7,18 @@
}); });
mp.events.add('entityStreamIn', (entity) => { mp.events.add('entityStreamIn', (entity) => {
if (entity.type !== 'vehicle' || !entity.hasVariable('dirtLevel')) { if (entity.type !== 'vehicle') {
return; return;
} }
const dirtLevel = entity.getVariable('dirtLevel') || 0; const dirtLevel = entity.vehicle.getDirtLevel();
entity.setDirtLevel(parseFloat(dirtLevel)); entity.setDirtLevel(dirtLevel);
});
mp.events.add('getdirtlevel', () => {
let vehicle = mp.players.local.vehicle;
let num = vehicle.getDirtLevel();
mp.gui.chat.push("Dirtlevel = " + num);
}); });
} }

7
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -4024,13 +4024,18 @@ namespace ReallifeGamemode.Server.Commands
ChatService.BroadcastAdmin("~b~[ADMIN]~s~ " + player.Name + " hat " + target.Name + " den Blackscreen entfernt. ", AdminLevel.ADMIN); ChatService.BroadcastAdmin("~b~[ADMIN]~s~ " + player.Name + " hat " + target.Name + " den Blackscreen entfernt. ", AdminLevel.ADMIN);
} }
} }
[Command("washcar", "~m~Benutzung: ~s~/washcar")] [Command("washcar", "~m~Benutzung: ~s~/washcar")]
public void washcar(Player player) public void washcar(Player player)
{ {
player.TriggerEvent("washcar"); player.TriggerEvent("washcar");
} }
[Command("getdirtlevel", "~m~Benutzung: ~s~/getdirtlevel")]
public void dirtlevel(Player player)
{
player.TriggerEvent("getdirtlevel");
}
[Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")] [Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")]
public void CmdAdminMakeadmin(Player player, string name, int rank) public void CmdAdminMakeadmin(Player player, string name, int rank)
{ {

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

@@ -378,16 +378,24 @@ namespace ReallifeGamemode.Server.Managers
colShape.OnEntityEnterColShape += (cs, c) => colShape.OnEntityEnterColShape += (cs, c) =>
{ {
if (!c.IsInVehicle) return; if (!(c.IsInVehicle && c.VehicleSeat == 0)) return;
c.TriggerEvent("washcar");
using (var dbcontext = new DatabaseContext()) using (var dbcontext = new DatabaseContext())
{ {
User u = c.GetUser(dbcontext); User u = c.GetUser(dbcontext);
u.BankAccount.Balance -= 100; if(u.Handmoney <= 0)
dbcontext.SaveChanges(); {
c.SendNotification("Du hast nicht genug Geld auf der Hand!");
return;
}
else {
c.TriggerEvent("washcar");
c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet.");
u.Handmoney -= 100;
dbcontext.SaveChanges();
}
} }
c.SendNotification("Die Autowäsche hat dich ~g~$~w~100 gekostet.");
}; };
} }