From cf57f53de7277bcc9bc13d02cab540b3b8cb21f4 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 11 Jan 2020 13:02:06 +0000
Subject: [PATCH] Sel Mahum Training Grounds update and Plains of Lizardmen
adjustments. Contributed by Edoo.
---
.../dist/game/config/Custom/RandomSpawns.ini | 3 +-
.../SelMahumDrill.java | 17 +-
.../SelMahumSquad.java | 6 +-
.../data/spawns/Oren/PlainsOfLizardman.xml | 148 +-
.../spawns/Oren/SelMahumTrainingGrounds.xml | 1743 +++++++++--------
.../dist/game/data/stats/npcs/18900-18999.xml | 18 +-
.../dist/game/data/stats/npcs/24300-24399.xml | 532 +++--
7 files changed, 1393 insertions(+), 1074 deletions(-)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/RandomSpawns.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/RandomSpawns.ini
index 6d4572f873..b1f6e87179 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/RandomSpawns.ini
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Custom/RandomSpawns.ini
@@ -20,4 +20,5 @@ MobsSpawnNotRandom = 18812,18813,18814,22138,\
18242,18243,18256,31452,31468,31469,31470,31471,31472,31473,31474,31475,31476,31477,31478,\
31479,31480,31481,31482,31483,31484,31485,31486,31487,\
22911,22912,22913,22914,22915,22916,22917,22918,22919,22923,22925,22927,\
-19546,27457
+19546,27457,24343,24344,24345,24346,24347,24348,24349,24350,24351,24352,24353,24354,24355,\
+24356,24357,24358
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index 5a08308603..209cfe29f6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -38,17 +38,18 @@ public class SelMahumDrill extends AbstractNpcAI
{
private static final int[] MAHUM_CHIEFS =
{
- 22775, // Sel Mahum Drill Sergeant
- 22776, // Sel Mahum Training Officer
- 22778, // Sel Mahum Drill Sergeant
+ 24343, // Sel Mahum Drill Sergeant
+ 24344 // Sel Mahum Training Officer
};
private static final int[] MAHUM_SOLDIERS =
{
- 22780, // Sel Mahum Recruit
- 22782, // Sel Mahum Recruit
- 22783, // Sel Mahum Soldier
- 22784, // Sel Mahum Recruit
- 22785, // Sel Mahum Soldier
+ 24348, // Sel Mahum Recruit
+ 24350, // Sel Mahum Recruit
+ 24351, // Sel Mahum Soldier
+ 24352, // Sel Mahum Recruit
+ 24353, // Sel Mahum Soldier
+ 24354, // Sel Mahum Soldier
+ 24355, // Sel Mahum Soldier
};
private static final int[] CHIEF_SOCIAL_ACTIONS =
{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index 404f133528..c07b80759e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -48,9 +48,9 @@ public class SelMahumSquad extends AbstractNpcAI
// Sel Mahum Squad Leaders
private static final int[] SQUAD_LEADERS =
{
- 22786,
- 22787,
- 22788
+ 24354,
+ 24355,
+ 24356
};
private static final NpcStringId[] CHEF_FSTRINGS =
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/PlainsOfLizardman.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/PlainsOfLizardman.xml
index ec65ad898c..f497ff0595 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/PlainsOfLizardman.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/PlainsOfLizardman.xml
@@ -1,7 +1,9 @@
-
-
+
+
+
+
@@ -228,16 +230,136 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/SelMahumTrainingGrounds.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/SelMahumTrainingGrounds.xml
index 9e077ac2bc..a37cd80f7e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/SelMahumTrainingGrounds.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Oren/SelMahumTrainingGrounds.xml
@@ -12,27 +12,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -40,27 +40,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -68,27 +68,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -96,27 +96,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -124,27 +124,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -152,29 +152,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -182,27 +182,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -210,27 +210,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -238,27 +238,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -266,23 +266,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -290,25 +290,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -316,23 +316,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -340,23 +340,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -364,24 +364,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -389,24 +389,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -414,27 +414,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -442,23 +442,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -466,22 +466,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -489,27 +489,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -517,23 +517,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -541,28 +541,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -570,19 +570,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -590,23 +590,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -614,27 +614,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -642,25 +642,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -668,19 +668,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -688,21 +688,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -710,19 +710,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -730,23 +730,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -754,23 +754,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -778,107 +778,106 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -888,20 +887,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -910,256 +909,276 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml
index e26e212531..ceb83a66b7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/18900-18999.xml
@@ -457,18 +457,17 @@
-
-
+
HUMANOID
MALE
-
-
-
-
-
+
+
+
+
+
@@ -493,11 +492,6 @@
false
2
-
-
- XEL_PRIVATE
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/24300-24399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/24300-24399.xml
index 8085a204f8..9576e07341 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/24300-24399.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/24300-24399.xml
@@ -1607,292 +1607,474 @@
-
-
- ETC
- FEMALE
+
+ HUMANOID
+ MALE
+
-
+
+
+
-
+
-
-
+
-
+
+
+
+
+
+ false
+ 2
+
+
+