From 3a097ec870882501cf64b3eb47f8aa582bd885ff Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 25 Dec 2019 11:29:08 +0000
Subject: [PATCH] Conquerable Hall bosses should not be lethable. Contributed
 by Sahar.

---
 .../dist/game/data/scripts/ai/others/NonLethalableNpcs.java | 6 ++++++
 .../FortressOfResistance/FortressOfResistance.java          | 3 +--
 .../dist/game/data/scripts/ai/others/NonLethalableNpcs.java | 6 ++++++
 .../FortressOfResistance/FortressOfResistance.java          | 3 +--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NonLethalableNpcs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
index 1adcd701c6..847752cff7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
@@ -28,6 +28,12 @@ public class NonLethalableNpcs extends AbstractNpcAI
 	private static final int[] NPCS =
 	{
 		35062, // Headquarters
+		// Conquerable Hall bosses.
+		35410, // Gustav
+		35375, // Nurka
+		35629, // Lidia
+		35630, // Alfred
+		35631, // Giselle
 	};
 	
 	public NonLethalableNpcs()
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index ab01be9c18..2cc8d5d43b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -44,8 +44,7 @@ public class FortressOfResistance extends ClanHallSiegeEngine
 	{
 		new Location(45109, 112124, -1900), // 30%
 		new Location(47653, 110816, -2110), // 40%
-		new Location(47247, 109396, -2000)
-		// 30%
+		new Location(47247, 109396, -2000), // 30%
 	};
 	
 	private Spawn _nurka;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
index 1adcd701c6..847752cff7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
@@ -28,6 +28,12 @@ public class NonLethalableNpcs extends AbstractNpcAI
 	private static final int[] NPCS =
 	{
 		35062, // Headquarters
+		// Conquerable Hall bosses.
+		35410, // Gustav
+		35375, // Nurka
+		35629, // Lidia
+		35630, // Alfred
+		35631, // Giselle
 	};
 	
 	public NonLethalableNpcs()
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index ab01be9c18..2cc8d5d43b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -44,8 +44,7 @@ public class FortressOfResistance extends ClanHallSiegeEngine
 	{
 		new Location(45109, 112124, -1900), // 30%
 		new Location(47653, 110816, -2110), // 40%
-		new Location(47247, 109396, -2000)
-		// 30%
+		new Location(47247, 109396, -2000), // 30%
 	};
 	
 	private Spawn _nurka;