From 6d9b0468b56a9090097e4a0d5184cb5109f8a849 Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Thu, 2 May 2024 20:24:56 +0200 Subject: [PATCH 1/2] Correct Promyvion Vahzl trigger areas --- scripts/zones/Promyvion-Vahzl/IDs.lua | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/zones/Promyvion-Vahzl/IDs.lua b/scripts/zones/Promyvion-Vahzl/IDs.lua index 68ddc08ee52..3557d25ff8a 100644 --- a/scripts/zones/Promyvion-Vahzl/IDs.lua +++ b/scripts/zones/Promyvion-Vahzl/IDs.lua @@ -52,22 +52,22 @@ zones[xi.zone.PROMYVION_VAHZL] = { MEMORY_STREAMS = { - [11] = { -2, -2, -122, 2, 2, -117, { 45 } }, -- Floor 1 return - [21] = { -40, -2, 197, -37, 2, 202, { 41 } }, -- Floor 2 return - [31] = { 317, -2, -282, 322, 2, -277, { 42 } }, -- Floor 3 return - [41] = { 277, -2, 38, 282, 2, 42, { 43 } }, -- Floor 4 return - [51] = { -42, -2, -2, -36, 2, 2, { 44 } }, -- Floor 5 return - [16867720] = { -43, -2, -362, -36, 2, -356, { 32 } }, -- Floor 1 MR S - [16867721] = { 76, -2, -43, 82, 2, -37, { 33 } }, -- Floor 1 MR N - [16867718] = { 163, -2, 197, -156, 2, 203, { 30 } }, -- Floor 2 MR N - [16867719] = { 162, -2, 117, -156, 2, 123, { 31 } }, -- Floor 2 MR S - [16867723] = { 155, -2, -163, 163, 2, -156, { 35 } }, -- Floor 3 MR W - [16867724] = { 236, -2, -43, 243, 2, -36, { 36 } }, -- Floor 3 MR N - [16867725] = { 236, -2, -243, 243, 2, -236, { 37 } }, -- Floor 3 MR S - [16867726] = { 356, -2, -82, 362, 2, -76, { 38 } }, -- Floor 3 MR E - [16867722] = { 116, -2, 37, 122, 2, 42, { 34 } }, -- Floor 4 MR SW - [16867727] = { 435, -2, 38, 443, 2, 41, { 39 } }, -- Floor 4 MR SE - [16867728] = { 436, -2, 276, 443, 2, 283, { 40 } }, -- Floor 4 MR NE + [11] = { 0, 3, -120, 0, 0, 0, { 45 } }, -- Floor 1 return + [21] = { -40, 3, 200, 0, 0, 0, { 41 } }, -- Floor 2 return + [31] = { 320, 3, -280, 0, 0, 0, { 42 } }, -- Floor 3 return + [41] = { 280, 3, 40, 0, 0, 0, { 43 } }, -- Floor 4 return + [51] = { -40, 3, 0, 0, 0, 0, { 44 } }, -- Floor 5 return + [16867720] = { -40, 3, -360, 0, 0, 0, { 32 } }, -- Floor 1 MR S + [16867721] = { 80, 3, -40, 0, 0, 0, { 33 } }, -- Floor 1 MR N + [16867718] = { -160, 3, 200, 0, 0, 0, { 30 } }, -- Floor 2 MR N + [16867719] = { -160, 3, 120, 0, 0, 0, { 31 } }, -- Floor 2 MR S + [16867723] = { 160, 3, -160, 0, 0, 0, { 35 } }, -- Floor 3 MR W + [16867724] = { 240, 3, -40, 0, 0, 0, { 36 } }, -- Floor 3 MR N + [16867725] = { 240, 3, -240, 0, 0, 0, { 37 } }, -- Floor 3 MR S + [16867726] = { 360, 3, -80, 0, 0, 0, { 38 } }, -- Floor 3 MR E + [16867722] = { 120, 3, 40, 0, 0, 0, { 34 } }, -- Floor 4 MR SW + [16867727] = { 440, 3, 40, 0, 0, 0, { 39 } }, -- Floor 4 MR SE + [16867728] = { 440, 3, 279, 0, 0, 0, { 40 } }, -- Floor 4 MR NE }, }, } From e754f7f0360dd5eb11e926c5cf559268345f4ba9 Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Sat, 4 May 2024 14:23:48 +0200 Subject: [PATCH 2/2] Correct Promyvion-Dem Trigger Areas --- scripts/zones/Promyvion-Dem/IDs.lua | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/zones/Promyvion-Dem/IDs.lua b/scripts/zones/Promyvion-Dem/IDs.lua index 0ac78a9c4cc..6e2f5e9442c 100644 --- a/scripts/zones/Promyvion-Dem/IDs.lua +++ b/scripts/zones/Promyvion-Dem/IDs.lua @@ -44,26 +44,26 @@ zones[xi.zone.PROMYVION_DEM] = { MEMORY_STREAMS = { - [11] = { 157, -4, -82, 161, 4, -77, { 46 } }, -- Floor 1 return - [21] = { -383, -4, -2, -278, 4, 2, { 41 } }, -- Floor 2 return - [31] = { -160, -4, 437, -157, 4, 441, { 43 } }, -- Floor 3 (North) return - [32] = { -2, -4, -322, 2, 4, -317, { 42 } }, -- Floor 3 (South) return - [41] = { 357, -4, 237, 361, 4, 242, { 44 } }, -- Floor 4 return + [11] = { 160, 3, -80, 0, 0, 0, { 46 } }, -- Floor 1 return + [21] = { -280, 3, 0, 0, 0, 0, { 41 } }, -- Floor 2 return + [31] = { -160, 3, 440, 0, 0, 0, { 43 } }, -- Floor 3 (North) return + [32] = { 0, 3, -320, 0, 0, 0, { 42 } }, -- Floor 3 (South) return + [41] = { 360, 3, 240, 0, 0, 0, { 44 } }, -- Floor 4 return -- TODO: Cleanup prmyvions. It knows where you came from and will only return the apropiate event acordingly. -- Event 44 -> Return to floor 3 South -- Event 45 -> Return to floor 3 North - [16851278] = { 117, -4, -283, 122, 4, -277, { 30 } }, -- Floor 1 MR - [16851282] = { -83, -4, -83, -77, 4, -76, { 36 } }, -- Floor 2 MR SE - Destination: North - [16851283] = { -82, -4, 76, -77, 4, 80, { 37 } }, -- Floor 2 MR NE - Destination: South - [16851284] = { -282, -4, -202, -277, 4, -196, { 34 } }, -- Floor 2 MR SW - Destination: South - [16851285] = { -361, -4, 36, -356, 4, 42, { 35 } }, -- floor 2 MR NW - Destination: North - [16851279] = { 37, -4, -203, 43, 4, -198, { 31 } }, -- Floor 3 (South) MR NE - [16851280] = { -122, -4, -242, -116, 4, -237, { 32 } }, -- Floor 3 (South) MR NW - [16851281] = { -122, -4, -402, -116, 4, -396, { 33 } }, -- Floor 3 (South) MR SW - [16851286] = { -322, -4, 156, -316, 4, 162, { 38 } }, -- Floor 3 (North) MR SW - [16851287] = { -42, -4, 317, -37, 4, 322, { 39 } }, -- Floor 3 (North) MR NE - [16851288] = { -122, -4, 157, -118, 4, 163, { 40 } }, -- Floor 3 (North) MR SE + [16851278] = { 120, 3, -280, 0, 0, 0, { 30 } }, -- Floor 1 MR + [16851282] = { -80, 3, -80, 0, 0, 0, { 36 } }, -- Floor 2 MR SE - Destination: North + [16851283] = { -80, 3, 80, 0, 0, 0, { 37 } }, -- Floor 2 MR NE - Destination: South + [16851284] = { -280, 3, -200, 0, 0, 0, { 34 } }, -- Floor 2 MR SW - Destination: South + [16851285] = { -360, 3, 40, 0, 0, 0, { 35 } }, -- floor 2 MR NW - Destination: North + [16851279] = { 40, 3, -200, 0, 0, 0, { 31 } }, -- Floor 3 (South) MR NE + [16851280] = { -120, 3, -240, 0, 0, 0, { 32 } }, -- Floor 3 (South) MR NW + [16851281] = { -120, 3, -400, 0, 0, 0, { 33 } }, -- Floor 3 (South) MR SW + [16851286] = { -320, 3, 160, 0, 0, 0, { 38 } }, -- Floor 3 (North) MR SW + [16851287] = { -40, 3, 320, 0, 0, 0, { 39 } }, -- Floor 3 (North) MR NE + [16851288] = { -120, 3, 160, 0, 0, 0, { 40 } }, -- Floor 3 (North) MR SE }, }, }