From 05a95dcb86a5d19da41b4167526901f577ea546d Mon Sep 17 00:00:00 2001 From: Siga Date: Fri, 13 Mar 2020 14:53:49 +0100 Subject: [PATCH 1/3] Taximeter fix clientside --- ReallifeGamemode.Client/Gui/taximeter.ts | 4 ---- ReallifeGamemode.Client/Player/keys.ts | 2 +- ReallifeGamemode.Client/assets/js/taximeter/main.js | 4 ++-- ReallifeGamemode.Client/index.ts | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/taximeter.ts b/ReallifeGamemode.Client/Gui/taximeter.ts index 3259ba74..38c9a06f 100644 --- a/ReallifeGamemode.Client/Gui/taximeter.ts +++ b/ReallifeGamemode.Client/Gui/taximeter.ts @@ -34,12 +34,9 @@ export default function taximeterInput(globalData: GlobalData) { }); function myTimer() { - mp.gui.chat.push("" + totalPrice); - //if (mp.players.local.vehicle.getNumberOfPassengers() == 0) return; if (totalPrice == lastPrice) return; let payPrice = +totalPrice - +lastPrice; lastPrice = totalPrice; - mp.gui.chat.push("" + totalPrice); mp.events.callRemote("SERVER:payFare", payPrice, lastkilometer); } @@ -57,7 +54,6 @@ export default function taximeterInput(globalData: GlobalData) { }); mp.events.add("CLIENT:updateFare", (km) => { - mp.gui.chat.push("" + lastkilometer) browser.execute(`updateKilometer('${JSON.parse(km)}')`) }); diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts index 79deaee0..745eaad5 100644 --- a/ReallifeGamemode.Client/Player/keys.ts +++ b/ReallifeGamemode.Client/Player/keys.ts @@ -139,7 +139,7 @@ export default function keys(globalData: GlobalData) { } }); - //2 // Job Starten + //J // Job Starten mp.keys.bind(0x4A, false, () => { if (!globalData.InChat && !globalData.InInput && !globalData.InMenu && globalData.LoggedIn) { mp.events.callRemote("CLIENT:JobManager_ShowJobMenu"); diff --git a/ReallifeGamemode.Client/assets/js/taximeter/main.js b/ReallifeGamemode.Client/assets/js/taximeter/main.js index ef028291..9eb00b8a 100644 --- a/ReallifeGamemode.Client/assets/js/taximeter/main.js +++ b/ReallifeGamemode.Client/assets/js/taximeter/main.js @@ -8,6 +8,7 @@ const PRICE_KM = document.getElementById("taximeter-price-kilometer"); const KILOMETER = document.getElementById("taximeter-kilometer"); function updateKilometer(km) { + lastKilometer = +lastKilometer + +km; UpdateTotalPrice(); KILOMETER.innerHTML = (Math.round((lastKilometer + Number.EPSILON) * 1000) / 1000).toString(); } @@ -15,9 +16,8 @@ function updateKilometer(km) { function UpdateTotalPrice() { var TotalPrice = +lastKilometer * + price; - console.log(+lastKilometer * + price); TOTAL_PRICE.innerHTML = Math.floor(TotalPrice).toString(); - //mp.trigger("CEF:updateLastPrice", Math.floor(TotalPrice), Math.round((lastKilometer + Number.EPSILON) * 1000) / 1000); + mp.trigger("CEF:updateLastPrice", Math.floor(TotalPrice), Math.round((lastKilometer + Number.EPSILON) * 1000) / 1000); } function updateFarePrice() { diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 9e1b4e05..c532a7a3 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -167,7 +167,7 @@ import smoothThrottle from './vehiclesync/smoothtrottle'; smoothThrottle(); import vehicleIndicators from './vehiclesync/vehicleindicators'; -vehicleIndicators(); +vehicleIndicators(); import reportList from './Player/reportmenu'; reportList(globalData); From 87fd9cb1362dbedf0b11e89d5b6149f95cbaf0d3 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 13 Mar 2020 19:55:06 +0100 Subject: [PATCH 2/3] Fix character rotation Fix female gender issue --- ReallifeGamemode.Server/Events/Login.cs | 1 + ReallifeGamemode.Server/Managers/CharacterCreator.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 74431a64..e5ce0d93 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -110,6 +110,7 @@ namespace ReallifeGamemode.Server.Events NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); player.Position = new Vector3(402.8664, -996.4108, -99.00027); + player.Rotation = new Vector3(0,0,180); player.TriggerEvent("toggleCreator"); } else diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index 5ee91ce3..fbbe7dd7 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -8,10 +8,12 @@ namespace ReallifeGamemode.Server.Managers { public class CharacterCreator : Script { - public CharacterCreator() + [RemoteEvent("creator_GenderChange")] + public void changeGender(Player player, int gender) { + if(gender == 0) player.SetSkin(PedHash.FreemodeMale01); + else player.SetSkin(PedHash.FreemodeFemale01); } - [RemoteEvent("creatorSave")] public void CreatorSave(Player player, bool gender, string parentData, string featureData, string appearanceData, string hairAndColorData) { @@ -181,10 +183,10 @@ namespace ReallifeGamemode.Server.Managers /// Der Player, dessen Aussehen man setzen will public static void ApplyCharacter(Player player) { - var userId = player.GetUser().Id; + var user = player.GetUser(); using (var loadCharacter = new DatabaseContext()) { - var character = loadCharacter.Characters.SingleOrDefault(c => c.UserId == userId); + var character = loadCharacter.Characters.SingleOrDefault(c => c.Id == user.CharacterId); if (character == null) return; From f5cd9cfbb5de86279d31af0a7c6fd3f60acf82a1 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 13 Mar 2020 21:00:44 +0100 Subject: [PATCH 3/3] Fix some teleport commands when in car --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index a8814144..8c134ee7 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -362,7 +362,7 @@ namespace ReallifeGamemode.Server.Commands return; } - if (target.IsInVehicle && target.VehicleSeat == -1) + if (target.IsInVehicle && target.VehicleSeat == 0) { target.Vehicle.Position = player.Position; NAPI.Entity.SetEntityVelocity(target.Vehicle, new Vector3()); @@ -809,7 +809,11 @@ namespace ReallifeGamemode.Server.Commands return; } - if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z); + if (player.IsInVehicle && player.VehicleSeat == 0) + { + player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z); + NAPI.Entity.SetEntityVelocity(player.Vehicle, new Vector3()); + } else player.Position = new Vector3(p.X, p.Y, p.Z); } @@ -1223,7 +1227,7 @@ namespace ReallifeGamemode.Server.Commands Vehicle v = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Rotation.Z, color1, color2, engine: true); VehicleStreaming.SetEngineState(v, true); VehicleStreaming.SetLockStatus(v, false); - player.SetIntoVehicle(v.Handle, -1); + player.SetIntoVehicle(v.Handle, 0); } [Command("fv", "~m~Benutzung: ~s~/fv", Alias = "vfix")] @@ -2055,7 +2059,7 @@ namespace ReallifeGamemode.Server.Commands vehicle = SaveManager.SaveJobVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, jobId); player.SendNotification("Jobfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true); - player.SetIntoVehicle(vehicle, -1); + player.SetIntoVehicle(vehicle, 0); } } else ChatService.SendMessage(player, "~m~Du sitzt in keinem Fahrzeug!"); @@ -2122,7 +2126,7 @@ namespace ReallifeGamemode.Server.Commands vehicle = SaveManager.SaveSchoolVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, drivingSchoolId); player.SendNotification("Fahrschulauto ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true); - player.SetIntoVehicle(vehicle, -1); + player.SetIntoVehicle(vehicle, 0); } break;