From 085bffb9cfe58f3adf882e82a3e1d4a1efe4a2c8 Mon Sep 17 00:00:00 2001 From: Fabian Date: Mon, 26 Apr 2021 21:55:53 +0200 Subject: [PATCH] =?UTF-8?q?polygon=20f=C3=BCr=20knast=20drin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Player/{nodm.ts => polygons.ts} | 32 ++++++++++++++++++- ReallifeGamemode.Client/index.ts | 4 +-- ReallifeGamemode.Server/Wanted/Jail.cs | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) rename ReallifeGamemode.Client/Player/{nodm.ts => polygons.ts} (54%) diff --git a/ReallifeGamemode.Client/Player/nodm.ts b/ReallifeGamemode.Client/Player/polygons.ts similarity index 54% rename from ReallifeGamemode.Client/Player/nodm.ts rename to ReallifeGamemode.Client/Player/polygons.ts index bffea4fc..66edb397 100644 --- a/ReallifeGamemode.Client/Player/nodm.ts +++ b/ReallifeGamemode.Client/Player/polygons.ts @@ -1,5 +1,31 @@ import polygons from "../polygons"; +//Start: Eingang direkt rechts, rechts entlang +const prisonVector1 = new mp.Vector3(1809.99365234375, 2612.373291015625, 45.50623321533203); +const prisonVector2 = new mp.Vector3(1810.377197265625, 2620.338623046875, 45.51300048828125); +const prisonVector3 = new mp.Vector3(1835.8336181640625, 2688.819091796875, 45.4307975769043); +const prisonVector4 = new mp.Vector3(1830.5731201171875, 2703.89990234375, 45.42714309692383); +const prisonVector5 = new mp.Vector3(1776.7342529296875, 2747.79052734375, 45.42777633666992); +const prisonVector6 = new mp.Vector3(1762.360107421875, 2752.788818359375, 45.42710494995117); +const prisonVector7 = new mp.Vector3(1662.0726318359375, 2749.177001953125, 45.444488525390625); +const prisonVector8 = new mp.Vector3(1648.1600341796875, 2742.01611328125, 45.441619873046875); +const prisonVector9 = new mp.Vector3(1584.302978515625, 2679.99072265625, 45.47876739501953); +const prisonVector10 = new mp.Vector3(1575.2301025390625, 2667.2109375, 45.48185729980469); +const prisonVector11 = new mp.Vector3(1547.1693115234375, 2591.489990234375, 45.388912200927734); +const prisonVector12 = new mp.Vector3(1546.39892578125, 2576.266845703125, 45.38877868652344); +const prisonVector13 = new mp.Vector3(1550.493896484375, 2482.98388671875, 45.38750076293945); +const prisonVector14 = new mp.Vector3(1557.9322509765625, 2468.98681640625, 45.387237548828125); +const prisonVector15 = new mp.Vector3(1652.527099609375, 2409.1259765625, 45.40341567993164); +const prisonVector16 = new mp.Vector3(1667.7176513671875, 2407.0595703125, 45.401432037353516); +const prisonVector17 = new mp.Vector3(1749.3123779296875, 2419.23779296875, 45.42228698730469); +const prisonVector18 = new mp.Vector3(1762.95849609375, 2426.209228515625, 45.42059326171875); +const prisonVector19 = new mp.Vector3(1809.08837890625, 2473.969970703125, 45.445960998535156); +const prisonVector20 = new mp.Vector3(1814.2039794921875, 2489.00830078125, 45.44499588012695); +const prisonVector21 = new mp.Vector3(1807.0340576171875, 2535.93212890625, 43.4123420715332); +const prisonVector22 = new mp.Vector3(1809.77587890625, 2590.69775390625, 43.41337966918945); +const prisonVector23 = new mp.Vector3(1819.170654296875, 2597.941650390625, 45.525978088378906); +const prisonVector24 = new mp.Vector3(1819.3084716796875, 2612.3154296875, 45.52067947387695); + const busbaseVector1 = new mp.Vector3(-522.4485, -2138.7021, 7.7564063); const busbaseVector2 = new mp.Vector3(-584.9822, -2072.467, 5.9921026); const busbaseVector3 = new mp.Vector3(-669.1689, -2172.7917, 6.009973); @@ -37,10 +63,14 @@ const polygon_pilotAnfaenger = polygons.add([pilotAnfaengerVector1, pilotAnfaeng const polygon_pilotProfi = polygons.add([pilotProfiVector1, pilotProfiVector2, pilotProfiVector3, pilotProfiVector4], 15, false, [255, 155, 0, 255], 0); const polygon_muellbase = polygons.add([muellbaseVector1, muellbaseVector2, muellbaseVector3], 15, false, [255, 155, 0, 255], 0); +const polygon_prison = polygons.add([prisonVector1, prisonVector2, prisonVector3, prisonVector4, prisonVector5, prisonVector6, prisonVector7, prisonVector8, + prisonVector9, prisonVector10, prisonVector11, prisonVector12, prisonVector13, prisonVector14, prisonVector15, prisonVector16, + prisonVector17, prisonVector18, prisonVector19, prisonVector20, prisonVector21, prisonVector22, prisonVector23, prisonVector24], 25, true, [255, 155, 0, 255], 0); + export let listNoDMZones = [polygon_busbase, polygon_stadthalle, polygon_fahrschule, polygon_pilotAnfaenger, polygon_pilotProfi, polygon_muellbase]; export let isInAnyNoDMPolygon; -export default function nodmHandler() { +export default function polygonHandler() { mp.events.add('playerEnterPolygon', (polygon) => { diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 0ec8ef2d..decabaff 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -186,8 +186,8 @@ ped(); import reportList from './Player/reportmenu'; reportList(globalData); -import nodmHandler from './Player/nodm'; -nodmHandler(); +import polygonHandler from './Player/polygons'; +polygonHandler(); import checkpointHandle from './util/checkpoint'; checkpointHandle(globalData); diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index f5c06a7c..7dd7509a 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -29,7 +29,7 @@ namespace ReallifeGamemode.Server.Wanted new Vector3(1651.512, 2570.2249, 45.564907) }; - //positionInJail: ENTWEDER "cell" ODER "outside" + //positionInJail: ENTWEDER "cell" ODER "outside", TODO: enum oder sowas public static void Check_PutBehindBars(User user, String positionInJail) { user.SetBlipAndNametagColor();