diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 848bcd2f..3dfc7746 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -224,8 +224,10 @@ refuseCollector(); import PedCreator from './Ped/PedCreator'; PedCreator(); +/* import attachmentManager from './util/attachmentMngr'; attachmentManager(game); +*/ import relativeVector from './util/relativevector'; relativeVector(); diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 5db81d0e..4ab8214d 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Microsoft.EntityFrameworkCore; -using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 80d0e5fa..7a2aab4a 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -296,13 +296,13 @@ namespace ReallifeGamemode.Server.Job if (target != null) { - user1.Wage += 10; - user2.Wage += 10; + user1.Wage += 25; + user2.Wage += 25; } else { - user1.Wage += 20; + user1.Wage += 50; } dbContext.SaveChanges(); } @@ -331,12 +331,12 @@ namespace ReallifeGamemode.Server.Job if (target != null) { - user1.Wage += 100; - user2.Wage += 100; + user1.Wage += 250; + user2.Wage += 250; } else { - user1.Wage += 200; + user1.Wage += 500; } user1.trashcount -= user1.trashcount; diff --git a/ReallifeGamemode.Server/Util/CheckPointHandle.cs b/ReallifeGamemode.Server/Util/CheckPointHandle.cs index 1826cb92..b4268af4 100644 --- a/ReallifeGamemode.Server/Util/CheckPointHandle.cs +++ b/ReallifeGamemode.Server/Util/CheckPointHandle.cs @@ -9,11 +9,11 @@ namespace ReallifeGamemode.Server.Util { public class CheckPointHandle : Script { - public int BusSkill1RouteVerdienst = 500; - public int BusSkill2RouteVerdienst = 650; - public int BusSkill3RouteVerdienst = 800; - public int PilotSkill1RouteVerdienst = 550; - public int PilotSkill2RouteVerdienst = 750; + public int BusSkill1RouteVerdienst = 1000; + public int BusSkill2RouteVerdienst = 1300; + public int BusSkill3RouteVerdienst = 1600; + public int PilotSkill1RouteVerdienst = 1100; + public int PilotSkill2RouteVerdienst = 1500; public static List listHandle = new List(); public static void DeleteCheckpoints(Player player)