Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

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)}')`)
     });
 

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, () => {
         mp.gui.chat.push("inchat: " + globalData.InChat + " inInput: " + globalData.InInput + " inMenu: " + globalData.InMenu + " LoggedIn: " + globalData.LoggedIn);
         if (!globalData.InChat && !globalData.InInput && !globalData.InMenu && globalData.LoggedIn) {

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() {

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;
 

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

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
     /// <param name="player">Der Player, dessen Aussehen man setzen will</param>
     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;