From 1302da33fc454dfaf5572244715459ade1544705 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 17 Aug 2015 20:35:15 +0000
Subject: [PATCH] Wastelands improvements. Contributed by Stayway.
---
trunk/dist/game/data/html/guard/33516.htm | 4 +
trunk/dist/game/data/html/guard/33517.htm | 4 +
trunk/dist/game/data/scripts.cfg | 1 +
.../scripts/ai/group_template/Wasteland.java | 78 +
.../dist/game/data/stats/npcs/19100-19199.xml | 317 +-
.../dist/game/data/stats/npcs/20000-20099.xml | 15 +-
.../dist/game/data/stats/npcs/22700-22799.xml | 10538 ++++++++++------
.../dist/game/data/stats/npcs/23000-23099.xml | 610 +-
.../dist/game/data/stats/npcs/25400-25499.xml | 136 +-
.../dist/game/data/stats/npcs/25500-25599.xml | 5689 ++++++---
.../dist/game/data/stats/npcs/27400-27499.xml | 490 +-
.../dist/game/data/stats/npcs/33500-33599.xml | 418 +-
trunk/dist/tools/sql/game/spawnlist.sql | 14 +
13 files changed, 11448 insertions(+), 6866 deletions(-)
create mode 100644 trunk/dist/game/data/html/guard/33516.htm
create mode 100644 trunk/dist/game/data/html/guard/33517.htm
create mode 100644 trunk/dist/game/data/scripts/ai/group_template/Wasteland.java
diff --git a/trunk/dist/game/data/html/guard/33516.htm b/trunk/dist/game/data/html/guard/33516.htm
new file mode 100644
index 0000000000..116434fd8a
--- /dev/null
+++ b/trunk/dist/game/data/html/guard/33516.htm
@@ -0,0 +1,4 @@
+Guard Lef:
+I don't mean to brag, but I think that the soldiers who were sent after Sakum are the most skilled Elite Soldiers in all Gludio.
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/guard/33517.htm b/trunk/dist/game/data/html/guard/33517.htm
new file mode 100644
index 0000000000..0ad490a8d9
--- /dev/null
+++ b/trunk/dist/game/data/html/guard/33517.htm
@@ -0,0 +1,4 @@
+Guard Shuazen:
+Your face shows suffering. Always watch your back.
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg
index 666751979e..21161daf1b 100644
--- a/trunk/dist/game/data/scripts.cfg
+++ b/trunk/dist/game/data/scripts.cfg
@@ -141,6 +141,7 @@ ai/group_template/StakatoNest.java
ai/group_template/SummonPc.java
ai/group_template/TurekOrcs.java
ai/group_template/WarriorFishingBlock.java
+ai/group_template/Wasteland.java
ai/group_template/YeSagira.java
# Individual
diff --git a/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java b/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java
new file mode 100644
index 0000000000..acd8ae4e21
--- /dev/null
+++ b/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2004-2015 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package ai.group_template;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2QuestGuardInstance;
+
+/**
+ * Wasteland AI.
+ * @author Stayway, Mobius
+ */
+public class Wasteland extends AbstractNpcAI
+{
+ // NPCs
+ private static final int JOEL = 33516;
+ private static final int SHUAZEN = 33517;
+ private static final int GUARD = 19126;
+
+ public Wasteland()
+ {
+ super(Wasteland.class.getSimpleName(), "ai/group_template");
+ addSpawnId(JOEL, SHUAZEN, GUARD);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead())
+ {
+ for (L2Character nearby : npc.getKnownList().getKnownCharactersInRadius(npc.getAggroRange()))
+ {
+ if (npc.isInCombat())
+ {
+ break;
+ }
+ if (nearby.isMonster())
+ {
+ ((L2QuestGuardInstance) npc).addDamage(nearby, 1, null);
+ break;
+ }
+ }
+ startQuestTimer("GUARD_AGGRO", 10000, npc, null);
+ }
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ startQuestTimer("GUARD_AGGRO", 5000, npc, null);
+ return super.onSpawn(npc);
+ }
+
+ public static void main(String[] args)
+ {
+ new Wasteland();
+ }
+}
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/npcs/19100-19199.xml b/trunk/dist/game/data/stats/npcs/19100-19199.xml
index 3de15f2026..069f61d528 100644
--- a/trunk/dist/game/data/stats/npcs/19100-19199.xml
+++ b/trunk/dist/game/data/stats/npcs/19100-19199.xml
@@ -3,7 +3,8 @@
ETC
-
+
+
@@ -25,7 +26,8 @@
ETC
-
+
+
@@ -47,7 +49,8 @@
ETC
-
+
+
@@ -69,7 +72,8 @@
ETC
-
+
+
@@ -91,7 +95,8 @@
ETC
-
+
+
@@ -113,7 +118,8 @@
ETC
-
+
+
@@ -135,7 +141,8 @@
ETC
-
+
+
@@ -157,7 +164,8 @@
ETC
-
+
+
@@ -179,7 +187,8 @@
ETC
-
+
+
@@ -201,7 +210,8 @@
ETC
-
+
+
@@ -223,7 +233,8 @@
ETC
-
+
+
@@ -245,7 +256,8 @@
ETC
-
+
+
@@ -267,7 +279,8 @@
ETC
-
+
+
@@ -289,7 +302,8 @@
ETC
-
+
+
@@ -311,7 +325,8 @@
ETC
-
+
+
@@ -336,7 +351,8 @@
CONSTRUCT
-
+
+
@@ -363,7 +379,8 @@
ETC
-
+
+
@@ -385,7 +402,8 @@
HUMANOID
-
+
+
@@ -413,7 +431,8 @@
HUMANOID
-
+
+
@@ -441,7 +460,8 @@
ETC
-
+
+
@@ -463,7 +483,8 @@
ETC
-
+
+
@@ -485,7 +506,8 @@
CONSTRUCT
-
+
+
@@ -511,7 +533,8 @@
CONSTRUCT
-
+
+
@@ -537,7 +560,8 @@
CONSTRUCT
-
+
+
@@ -564,7 +588,8 @@
CONSTRUCT
-
+
+
@@ -591,7 +616,8 @@
CONSTRUCT
-
+
+
@@ -614,13 +640,15 @@
-
+
HUMAN
-
-
+
+
+
+
-
+
@@ -630,10 +658,16 @@
333
-
+
+ false
+
+
+ GUARD
+
+
@@ -642,7 +676,8 @@
HUMAN
-
+
+
@@ -667,7 +702,8 @@
HUMAN
-
+
+
@@ -692,7 +728,8 @@
HUMAN
-
+
+
@@ -717,7 +754,8 @@
ELF
-
+
+
@@ -742,7 +780,8 @@
HUMAN
-
+
+
@@ -767,7 +806,8 @@
HUMAN
-
+
+
@@ -792,7 +832,8 @@
HUMAN
-
+
+
@@ -817,7 +858,8 @@
HUMAN
-
+
+
@@ -842,7 +884,8 @@
CONSTRUCT
-
+
+
@@ -867,7 +910,8 @@
DARK_ELF
-
+
+
@@ -892,7 +936,8 @@
HUMAN
-
+
+
@@ -917,7 +962,8 @@
HUMAN
-
+
+
@@ -942,7 +988,8 @@
ELF
-
+
+
@@ -967,7 +1014,8 @@
HUMAN
-
+
+
@@ -992,7 +1040,8 @@
HUMAN
-
+
+
@@ -1017,7 +1066,8 @@
CONSTRUCT
-
+
+
@@ -1042,7 +1092,8 @@
CONSTRUCT
-
+
+
@@ -1067,7 +1118,8 @@
CONSTRUCT
-
+
+
@@ -1092,7 +1144,8 @@
CONSTRUCT
-
+
+
@@ -1117,7 +1170,8 @@
CONSTRUCT
-
+
+
@@ -1142,7 +1196,8 @@
CONSTRUCT
-
+
+
@@ -1167,7 +1222,8 @@
CONSTRUCT
-
+
+
@@ -1192,7 +1248,8 @@
CONSTRUCT
-
+
+
@@ -1217,7 +1274,8 @@
CONSTRUCT
-
+
+
@@ -1242,7 +1300,8 @@
CONSTRUCT
-
+
+
@@ -1267,7 +1326,8 @@
HUMAN
-
+
+
@@ -1296,7 +1356,8 @@
HUMAN
-
+
+
@@ -1326,7 +1387,8 @@
ANIMAL
-
+
+
@@ -1351,7 +1413,8 @@
HUMAN
-
+
+
@@ -1376,7 +1439,8 @@
ELEMENTAL
-
+
+
@@ -1405,7 +1469,8 @@
HUMANOID
-
+
+
@@ -1431,7 +1496,8 @@
HUMAN
-
+
+
@@ -1457,7 +1523,8 @@
BUG
-
+
+
@@ -1485,7 +1552,8 @@
BUG
-
+
+
@@ -1511,7 +1579,8 @@
CONSTRUCT
-
+
+
@@ -1539,7 +1608,8 @@
CONSTRUCT
-
+
+
@@ -1565,7 +1635,8 @@
HUMAN
-
+
+
@@ -1590,7 +1661,8 @@
BUG
-
+
+
@@ -1616,7 +1688,8 @@
BUG
-
+
+
@@ -1642,7 +1715,8 @@
ORC
-
+
+
@@ -1668,7 +1742,8 @@
ORC
-
+
+
@@ -1694,7 +1769,8 @@
ORC
-
+
+
@@ -1720,7 +1796,8 @@
ORC
-
+
+
@@ -1746,7 +1823,8 @@
CONSTRUCT
-
+
+
@@ -1771,7 +1849,8 @@
BUG
-
+
+
@@ -1797,7 +1876,8 @@
BUG
-
+
+
@@ -1823,7 +1903,8 @@
DWARF
-
+
+
@@ -1848,7 +1929,8 @@
DWARF
-
+
+
@@ -1873,7 +1955,8 @@
DWARF
-
+
+
@@ -1898,7 +1981,8 @@
DWARF
-
+
+
@@ -1923,7 +2007,8 @@
DWARF
-
+
+
@@ -1948,7 +2033,8 @@
DWARF
-
+
+
@@ -1973,7 +2059,8 @@
DWARF
-
+
+
@@ -1998,7 +2085,8 @@
DWARF
-
+
+
@@ -2023,7 +2111,8 @@
DWARF
-
+
+
@@ -2048,7 +2137,8 @@
CONSTRUCT
-
+
+
@@ -2074,7 +2164,8 @@
SIEGE_WEAPON
-
+
+
@@ -2100,7 +2191,8 @@
DWARF
-
+
+
@@ -2125,7 +2217,8 @@
DWARF
-
+
+
@@ -2150,7 +2243,8 @@
DWARF
-
+
+