From e01acf7ab9c920008bb7832e150656b3430b5922 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 8 May 2021 18:22:29 +0200 Subject: [PATCH 1/3] vlt fix surgery --- ReallifeGamemode.Server/Events/Key.cs | 38 ++++++++++++++----- .../Managers/CharacterCreator.cs | 36 ++++++------------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 268abded..fead4c44 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -309,7 +309,7 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("Du bist nun ~g~im Dienst."); player.TriggerEvent("toggleDutyMode", true); player.TriggerEvent("abortSpawnschutz"); - if (player.GetUser().FactionId == 2) //Fire Department + if (user.FactionId == 2) //Fire Department { Medic.UpdateDutyMedics(); } @@ -585,12 +585,29 @@ namespace ReallifeGamemode.Server.Events } if (CharacterCreator.surgeryPoint.DistanceTo(player.Position) <= 1.5) { - var freeSurgery = player.GetUser().FreeSurgery; - if(freeSurgery == false && player.GetUser().BankAccount.Balance < 15000) + if (user.GetData("duty")) { - ChatService.ErrorMessage(player, "Du benötigst $15.000 auf dem Bankkonto um die Operation durchzuführen"); + player.SendNotification("~r~Im Dienst kannst du nicht operiert werden", false); return; } + if (JobBase.GetPlayerInJob().Contains(player)) + { + player.SendNotification("~r~Im aktiven Job kannst du nicht operiert werden", false); + return; + } + if (user.Wanteds > 0) + { + player.SendNotification("~r~Wenn du gesucht wirst kannst du nicht operiert werden", false); + return; + } + + var freeSurgery = user.FreeSurgery; + if (freeSurgery == false && user.BankAccount.Balance < CharacterCreator.SURGERY_PRICE) + { + ChatService.ErrorMessage(player, $"Du benötigst {CharacterCreator.SURGERY_PRICE.ToMoneyString()} auf dem Bankkonto um die Operation durchzuführen"); + return; + } + ChatService.SendMessage(player, "~r~ACHTUNG! Dadurch wird dein alter Charakter gelöscht. Du kannst dir hiermit einen neuen erstellen."); ChatService.SendMessage(player, "Beim Wechsel des Geschlechts verlierst du ebenfalls deine gekaufte Kleidung"); if (freeSurgery == true) @@ -599,7 +616,7 @@ namespace ReallifeGamemode.Server.Events } else { - ChatService.SendMessage(player, "Die Änderung des Charakters kostet ~g~$15.000"); + ChatService.SendMessage(player, "Die Änderung des Charakters kostet ~g~" + CharacterCreator.SURGERY_PRICE.ToMoneyString()); } ChatService.SendMessage(player, "Du kannst die Charaktererstellung wieder verlassen und behältst deinen alten Charakter!"); ChatService.SendMessage(player, "Bitte starte mit ~g~J"); @@ -607,8 +624,11 @@ namespace ReallifeGamemode.Server.Events player.SetData("charSurgery", true); NAPI.Task.Run(() => { - if (player.GetData("charSurgery") == true) player.ResetData("charSurgery"); - player.SendNotification("~r~Chirurg-Angebot abgebrochen."); + if (player.GetData("charSurgery") == true) + { + player.ResetData("charSurgery"); + player.SendNotification("~r~Chirurg-Angebot abgebrochen."); + } }, 30000); } if (user.FactionLeader) @@ -695,10 +715,10 @@ namespace ReallifeGamemode.Server.Events return; } - if(player.GetData("charSurgery") == true) + if (player.GetData("charSurgery") == true) { CharacterCreator.StartSurgery(player); - player.SetData("charSurgery",false); + player.ResetData("charSurgery"); } User u = player.GetUser(); diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index 958fe597..76594c79 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -11,7 +11,8 @@ namespace ReallifeGamemode.Server.Managers { public class CharacterCreator : Script { - public static Vector3 surgeryPoint = new Vector3(258.581, -1345.1406, 24.5378); + public static Vector3 surgeryPoint = new Vector3(342.30032, -1397.7542, 32.50923); + public const int SURGERY_PRICE = 15000; public CharacterCreator() { @@ -20,7 +21,7 @@ namespace ReallifeGamemode.Server.Managers new Vector3(0, 0, 0), 2, new Color(255, 255, 255, 50), false, 0); NAPI.TextLabel.CreateTextLabel("Chirurg - Dr\u00fccke ~y~E", point, 7, 1, 0, new Color(255, 255, 255), false, 0); } - + [RemoteEvent("creator_GenderChange")] public void changeGender(Player player, int gender) @@ -184,33 +185,15 @@ namespace ReallifeGamemode.Server.Managers saveCharacter.Characters.Add(character); saveCharacter.SaveChanges(); - - user.CharacterId = character.Id; if (genderSwap) { - var charClothes = saveCharacter.CharacterClothes.Where(c => c.UserId == user.Id); + var charClothes = saveCharacter.CharacterClothes.Where(c => c.UserId == user.Id); saveCharacter.RemoveRange(charClothes); saveCharacter.SaveChanges(); } - for (var x = 1; x <= 11; x++) - { - var s = 0; - if (x == 10) s = -1; - if (x == 2) continue; - var createClothes = new Database.Entities.CharacterCloth() - { - UserId = userId, - Duty = false, - SlotType = 0, - SlotId = x, - ClothId = s, - Texture = 0 - }; - saveCharacter.CharacterClothes.Add(createClothes); - } for (var x = 0; x <= 7; x++) { var y = 0; @@ -279,17 +262,17 @@ namespace ReallifeGamemode.Server.Managers } if (charExists) - { + { if (user.FreeSurgery == true) { user.FreeSurgery = false; } else { - user.BankAccount.Balance -= 15000; + user.BankAccount.Balance -= SURGERY_PRICE; } saveCharacter.Remove(oldChar); - } + } saveCharacter.SaveChanges(); } //HeadOverlay makeupHo = new HeadOverlay() @@ -318,6 +301,9 @@ namespace ReallifeGamemode.Server.Managers player.TriggerEvent("draw", player.Name, player.Handle.Value); player.Dimension = 0; } + + ApplyCharacter(player); + UpdateCharacterCloth.LoadCharacterDefaults(player); } /// @@ -551,7 +537,7 @@ namespace ReallifeGamemode.Server.Managers public static void LeaveSurgery(Player player) { player.Dimension = 0; - player.SafeTeleport(new Vector3(258.581, -1345.1406, 24.5378), Main.DEFAULT_SPAWN_HEADING, true); + player.SafeTeleport(surgeryPoint, -180, true); ApplyCharacter(player); UpdateCharacterCloth.LoadCharacterDefaults(player); } From 5cdd22980f662d241cc2eab52aba0b358f646f26 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 8 May 2021 18:27:22 +0200 Subject: [PATCH 2/3] ballas neue base koords --- ReallifeGamemode.Server/Factions/BasePoints.cs | 8 ++++---- ReallifeGamemode.Server/Managers/PositionManager.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ReallifeGamemode.Server/Factions/BasePoints.cs b/ReallifeGamemode.Server/Factions/BasePoints.cs index 02f9eccc..238d7a36 100644 --- a/ReallifeGamemode.Server/Factions/BasePoints.cs +++ b/ReallifeGamemode.Server/Factions/BasePoints.cs @@ -11,15 +11,15 @@ namespace ReallifeGamemode.Server.WeaponDeal { class BasePoints { - + public void getbase(int? factionID, Player client) { - + if (factionID == 1) { client.TriggerEvent("SERVER:Util_setWaypoint", 428.07, -977.88); // LSPD } - else if( factionID == 2) + else if (factionID == 2) { client.TriggerEvent("SERVER:Util_setWaypoint", 1157.56, -1518.56); // Sanitäter } @@ -45,7 +45,7 @@ namespace ReallifeGamemode.Server.WeaponDeal } else if (factionID == 8) { - client.TriggerEvent("SERVER:Util_setWaypoint", 1209.42, -1628.65); // Ballas + client.TriggerEvent("SERVER:Util_setWaypoint", 1381.08, -1505.67); // Ballas } else if (factionID == 9) { diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs index 4dd14793..51ee78d2 100644 --- a/ReallifeGamemode.Server/Managers/PositionManager.cs +++ b/ReallifeGamemode.Server/Managers/PositionManager.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using ReallifeGamemode.Server.Shop.Clothing; @@ -85,7 +85,7 @@ namespace ReallifeGamemode.Server.Managers }; WeaponPoint weaponPointBallas = new WeaponPoint() { - Position = new Vector3(1217.748, -1639.349, 47.77029), + Position = new Vector3(1381.08, -1505.67, 58.04), FactionId = 8 }; WeaponPoint weaponPointGrove = new WeaponPoint() From 8f005fc9d43efaa51d85356c4373bff8a7ba588a Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 8 May 2021 18:28:35 +0200 Subject: [PATCH 3/3] wheels 2,5k price --- ReallifeGamemode.Client/Tuning/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Client/Tuning/main.ts b/ReallifeGamemode.Client/Tuning/main.ts index f6f1bdd4..ab46f4a1 100644 --- a/ReallifeGamemode.Client/Tuning/main.ts +++ b/ReallifeGamemode.Client/Tuning/main.ts @@ -43,7 +43,7 @@ export default function tuning(globalData: IGlobalData) { { Slot: 15, Name: "Federung", Price: 2000 }, { Slot: 18, Name: "Turbo", BasePercentage: 45, PriceIncreasePerLevel: 0 }, { Slot: 22, Name: "Licht", Price: 500 }, - { Slot: -2, Name: "Reifen", Price: 3000 }, + { Slot: -2, Name: "Reifen", Price: 2500 }, { Slot: -1, Name: "Lackierung", Price: 1000 }, { Slot: 25, Name: "Nummernschildhalter", Price: 500 }, { Slot: 27, Name: "Innenausstatung", Price: 500 },