From ccc0bf22d305303853a415dca807bfb25e891a82 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 24 Jul 2015 20:28:11 +0000 Subject: [PATCH] Dragon Valley changes. Contributed by Stayway. --- trunk/dist/game/data/buylists/3013700.xml | 2 +- trunk/dist/game/data/html/default/33796-1.htm | 4 ++ trunk/dist/game/data/html/default/33796.htm | 6 ++ trunk/dist/game/data/html/default/33972.htm | 5 ++ trunk/dist/game/data/html/merchant/31045.htm | 3 +- .../dist/game/data/html/teleporter/33970.htm | 13 ++++ .../dist/game/data/html/teleporter/33971.htm | 7 ++ .../dist/game/data/html/teleporter/33973.htm | 9 +++ trunk/dist/game/data/scripts.cfg | 3 + .../ai/individual/MercenaryCaptain.java | 65 +++++++++++++++++++ .../game/data/scripts/ai/individual/Namo.java | 65 +++++++++++++++++++ .../data/scripts/ai/individual/Rakun.java | 65 +++++++++++++++++++ .../dist/game/data/stats/npcs/30900-30999.xml | 4 +- .../dist/game/data/stats/npcs/33900-33999.xml | 18 ++--- trunk/dist/tools/sql/game/spawnlist.sql | 15 +++-- trunk/dist/tools/sql/game/teleport.sql | 13 ++++ 16 files changed, 279 insertions(+), 18 deletions(-) create mode 100644 trunk/dist/game/data/html/default/33796-1.htm create mode 100644 trunk/dist/game/data/html/default/33796.htm create mode 100644 trunk/dist/game/data/html/default/33972.htm create mode 100644 trunk/dist/game/data/html/teleporter/33970.htm create mode 100644 trunk/dist/game/data/html/teleporter/33971.htm create mode 100644 trunk/dist/game/data/html/teleporter/33973.htm create mode 100644 trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java create mode 100644 trunk/dist/game/data/scripts/ai/individual/Namo.java create mode 100644 trunk/dist/game/data/scripts/ai/individual/Rakun.java diff --git a/trunk/dist/game/data/buylists/3013700.xml b/trunk/dist/game/data/buylists/3013700.xml index c5c3ec0bf0..92f2984abf 100644 --- a/trunk/dist/game/data/buylists/3013700.xml +++ b/trunk/dist/game/data/buylists/3013700.xml @@ -2,6 +2,7 @@ 30137 + 31045 @@ -46,7 +47,6 @@ - diff --git a/trunk/dist/game/data/html/default/33796-1.htm b/trunk/dist/game/data/html/default/33796-1.htm new file mode 100644 index 0000000000..26a575d0f3 --- /dev/null +++ b/trunk/dist/game/data/html/default/33796-1.htm @@ -0,0 +1,4 @@ +Verna:
+Did you see towering red rocks protruding from the ground on your way here? We managed to seal some of them with help from Dwarves, but many more remain unsealed. Some of them even appear and disappear repeatedly! They're called "Spicula Clone Generator Yin", and are proof that Nomil's defenses have spread to these lands. Nomil's Cave and Nomil's Garden where Spicula Clone Generator Boz resides are most affected by the defense system. it is said that Boz creates more Spiculas when it's attacked or recognizes intruders.
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33796.htm b/trunk/dist/game/data/html/default/33796.htm new file mode 100644 index 0000000000..e040fca52f --- /dev/null +++ b/trunk/dist/game/data/html/default/33796.htm @@ -0,0 +1,6 @@ +Verna:
+Have you seen the cave around here? +It's infested with Spiculas created by Spicula Clone Generator Boz. All because of one stupid Dwarf...
+ + + \ No newline at end of file diff --git a/trunk/dist/game/data/html/default/33972.htm b/trunk/dist/game/data/html/default/33972.htm new file mode 100644 index 0000000000..808a523963 --- /dev/null +++ b/trunk/dist/game/data/html/default/33972.htm @@ -0,0 +1,5 @@ +Rakun:
+There's a lot of strange activity caused by the contortion in the dimension. This is creating cyclones big and smal in Dragon Valley, and dragons have been seen emerging from these cyclones.
+In order to enhance their strength, the dragons are growing Dragon Hatclings during the day.
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/html/merchant/31045.htm b/trunk/dist/game/data/html/merchant/31045.htm index 6736a50a81..2b41b363db 100644 --- a/trunk/dist/game/data/html/merchant/31045.htm +++ b/trunk/dist/game/data/html/merchant/31045.htm @@ -1,7 +1,6 @@ Kitzka:
Well, OK! Now, you don't have to make a long trip to Giran just for supplies! Brave merchants aren't picky about trading places. Welcome to Dragon Valley, where only the brave dare to enter!
- + - \ No newline at end of file diff --git a/trunk/dist/game/data/html/teleporter/33970.htm b/trunk/dist/game/data/html/teleporter/33970.htm new file mode 100644 index 0000000000..19cc9bb1d6 --- /dev/null +++ b/trunk/dist/game/data/html/teleporter/33970.htm @@ -0,0 +1,13 @@ +Mercenary Captain:
+During the day, this place is crawling with dragons and at night, the Undead fill up on Dragon Vitality, causing instability in the atmosphere.
+A red fissure appears only at night, and if you go near it, you might caught in the Reaper's Seal effect, so be careful!
+ + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/html/teleporter/33971.htm b/trunk/dist/game/data/html/teleporter/33971.htm new file mode 100644 index 0000000000..9870957e18 --- /dev/null +++ b/trunk/dist/game/data/html/teleporter/33971.htm @@ -0,0 +1,7 @@ +Mercenary:
+Good work getting this far, considering the dangers of the dragons and the Undead. You're probably aware that Dragon Valley's southern region is way more dangerous than the other parts.
+I will teleport you to some place safer, at least.
+ + + + \ No newline at end of file diff --git a/trunk/dist/game/data/html/teleporter/33973.htm b/trunk/dist/game/data/html/teleporter/33973.htm new file mode 100644 index 0000000000..a250c82e67 --- /dev/null +++ b/trunk/dist/game/data/html/teleporter/33973.htm @@ -0,0 +1,9 @@ +Namo:
+After the sixth seal was broken, a rift appeared between the dimension and Material Realm. No thanks to this rift, the Undead encroach at night while dragons are up to no good during the day. Danger now always lurks at the base in Dragon Valley.
+Dragon Valley is the most dangerous in the south, so do be careful!
+ + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg index 2a7e56f2ff..190f5be740 100644 --- a/trunk/dist/game/data/scripts.cfg +++ b/trunk/dist/game/data/scripts.cfg @@ -177,6 +177,8 @@ ai/individual/Lumi.java ai/individual/Mahram.java ai/individual/Mai.java ai/individual/MarinSmith.java +ai/individual/MercenaryCaptain.java +ai/individual/Namo.java ai/individual/Orfen.java ai/individual/Oris.java ai/individual/QueenAnt.java @@ -184,6 +186,7 @@ ai/individual/QueenShyeed.java ai/individual/RagnaOrcCommander.java ai/individual/RagnaOrcSeer.java ai/individual/RagnaOrcHero.java +ai/individual/Rakun.java ai/individual/ScarletVanHalisha.java ai/individual/Shannon.java ai/individual/SinEater.java diff --git a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java new file mode 100644 index 0000000000..ecba6864b3 --- /dev/null +++ b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java @@ -0,0 +1,65 @@ +/* + * 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.individual; + +import ai.npc.AbstractNpcAI; + +import com.l2jserver.gameserver.enums.ChatType; +import com.l2jserver.gameserver.model.actor.L2Npc; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; +import com.l2jserver.gameserver.network.NpcStringId; + +/** + * Mercenary Captain AI. + * @author Gladicek + * @Changed by Stayway + */ +public final class MercenaryCaptain extends AbstractNpcAI +{ + // NPC + private static final int MERCENARY_CAPTAIN = 33970; + + private MercenaryCaptain() + { + super(MercenaryCaptain.class.getSimpleName(), "ai/individual"); + addSpawnId(MERCENARY_CAPTAIN); + } + + @Override + public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) + { + if (event.equals("SPAM_TEXT") && (npc != null)) + { + broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTH_BE_CAREFUL, 1000); + } + return super.onAdvEvent(event, npc, player); + } + + @Override + public String onSpawn(L2Npc npc) + { + startQuestTimer("SPAM_TEXT", 12000, npc, null, true); + return super.onSpawn(npc); + } + + public static void main(String[] args) + { + new MercenaryCaptain(); + } +} \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/ai/individual/Namo.java b/trunk/dist/game/data/scripts/ai/individual/Namo.java new file mode 100644 index 0000000000..0a80beced1 --- /dev/null +++ b/trunk/dist/game/data/scripts/ai/individual/Namo.java @@ -0,0 +1,65 @@ +/* + * 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.individual; + +import ai.npc.AbstractNpcAI; + +import com.l2jserver.gameserver.enums.ChatType; +import com.l2jserver.gameserver.model.actor.L2Npc; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; +import com.l2jserver.gameserver.network.NpcStringId; + +/** + * Mercenary Captain AI. + * @author Gladicek + * @Changed by Stayway + */ +public final class Namo extends AbstractNpcAI +{ + // NPC + private static final int NAMO = 33973; + + private Namo() + { + super(Namo.class.getSimpleName(), "ai/individual"); + addSpawnId(NAMO); + } + + @Override + public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) + { + if (event.equals("SPAM_TEXT") && (npc != null)) + { + broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT, 1000); + } + return super.onAdvEvent(event, npc, player); + } + + @Override + public String onSpawn(L2Npc npc) + { + startQuestTimer("SPAM_TEXT", 12000, npc, null, true); + return super.onSpawn(npc); + } + + public static void main(String[] args) + { + new Namo(); + } +} \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/ai/individual/Rakun.java b/trunk/dist/game/data/scripts/ai/individual/Rakun.java new file mode 100644 index 0000000000..acc9c5534e --- /dev/null +++ b/trunk/dist/game/data/scripts/ai/individual/Rakun.java @@ -0,0 +1,65 @@ +/* + * 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.individual; + +import ai.npc.AbstractNpcAI; + +import com.l2jserver.gameserver.enums.ChatType; +import com.l2jserver.gameserver.model.actor.L2Npc; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; +import com.l2jserver.gameserver.network.NpcStringId; + +/** + * Mercenary Captain AI. + * @author Gladicek + * @Changed by Stayway + */ +public final class Rakun extends AbstractNpcAI +{ + // NPC + private static final int RAKUN = 33972; + + private Rakun() + { + super(Rakun.class.getSimpleName(), "ai/individual"); + addSpawnId(RAKUN); + } + + @Override + public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) + { + if (event.equals("SPAM_TEXT") && (npc != null)) + { + broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT, 1000); + } + return super.onAdvEvent(event, npc, player); + } + + @Override + public String onSpawn(L2Npc npc) + { + startQuestTimer("SPAM_TEXT", 12000, npc, null, true); + return super.onSpawn(npc); + } + + public static void main(String[] args) + { + new Rakun(); + } +} \ No newline at end of file diff --git a/trunk/dist/game/data/stats/npcs/30900-30999.xml b/trunk/dist/game/data/stats/npcs/30900-30999.xml index d90cc185b0..4d996c66a3 100644 --- a/trunk/dist/game/data/stats/npcs/30900-30999.xml +++ b/trunk/dist/game/data/stats/npcs/30900-30999.xml @@ -1193,7 +1193,7 @@ - + @@ -1212,7 +1212,7 @@ - + diff --git a/trunk/dist/game/data/stats/npcs/33900-33999.xml b/trunk/dist/game/data/stats/npcs/33900-33999.xml index d4ddf29d91..a0475b8799 100644 --- a/trunk/dist/game/data/stats/npcs/33900-33999.xml +++ b/trunk/dist/game/data/stats/npcs/33900-33999.xml @@ -1188,10 +1188,10 @@ - - + HUMAN - FEMALE + MALE + @@ -1205,10 +1205,10 @@ - - + HUMAN - FEMALE + MALE + @@ -1239,10 +1239,10 @@ - - + HUMAN - FEMALE + MALE + diff --git a/trunk/dist/tools/sql/game/spawnlist.sql b/trunk/dist/tools/sql/game/spawnlist.sql index ecc5a8b531..4b5ce96f81 100644 --- a/trunk/dist/tools/sql/game/spawnlist.sql +++ b/trunk/dist/tools/sql/game/spawnlist.sql @@ -34946,10 +34946,6 @@ INSERT INTO `spawnlist` VALUES -- Theodric ("dragon_valley", 1, 30755, 131176, 114676, -3720, 0, 0, 21124, 60, 0, 0, 0), -- Separated Soul -("lair_of_antharas", 1, 32868, 148558, 110541, -3944, 0, 0, 28938, 60, 0, 0, 0), --- Separated Soul -("lair_of_antharas", 1, 32869, 146014, 111226, -3560, 0, 0, 2366, 60, 0, 0, 0), --- Separated Soul ("lair_of_antharas", 1, 32891, 131156, 114177, -3704, 0, 0, 27664, 60, 0, 0, 0), -- [24_22] @@ -53911,3 +53907,14 @@ INSERT INTO `spawnlist` VALUES ('Stronghold 3', 1, 19196, -91820, 44538, -2532, 0, 0, 57691, 60, 0, 0, 0), ('Stronghold 3', 1, 19196, -79503, 53782, -3385, 0, 0, 31900, 60, 0, 0, 0), ('Stronghold 3', 1, 19196, -75763, 43097, -2714, 0, 0, 27931, 60, 0, 0, 0); + +INSERT INTO `spawnlist` VALUES +('Dragon Valley', 1, 33970, 80042, 116033, -3680, 0, 0, 44928, 60, 0, 0, 0), +('Dragon Valley', 1, 33970, 102396, 113152, -3727, 0, 0, 43643, 60, 0, 0, 0), +('Dragon Valley', 1, 31045, 102504, 113128, -3727, 0, 0, 39138, 60, 0, 0, 0), +('Dragon Valley', 1, 32890, 102352, 113306, -3727, 0, 0, 38314, 60, 0, 0, 0), +('Dragon Valley', 1, 33972, 102238, 113296, -3727, 0, 0, 50632, 60, 0, 0, 0), +('Dragon Valley', 1, 33973, 72224, 116720, -3693, 0, 0, 25811, 60, 0, 0, 0); + +DELETE FROM `spawnlist` WHERE `npc_templateid` = 32869 AND `locx` = 146014 AND `locy` = 111226 AND `locz` = -3560; +DELETE FROM `spawnlist` WHERE `npc_templateid` = 32868 AND `locx` = 148558 AND `locy` = 110541 AND `locz` = -3944; diff --git a/trunk/dist/tools/sql/game/teleport.sql b/trunk/dist/tools/sql/game/teleport.sql index a0c4b37554..a29c2e50ee 100644 --- a/trunk/dist/tools/sql/game/teleport.sql +++ b/trunk/dist/tools/sql/game/teleport.sql @@ -1075,3 +1075,16 @@ INSERT INTO `teleport` (`Description`, `id`, `loc_x`, `loc_y`, `loc_z`, `price`, INSERT INTO `teleport` VALUES ('Isle of Souls Harbor -> Gludin', 1140, -80684, 149770, -3040, 7300, 0, 57), ('Isle of Souls Harbor -> Rune Township', 1141, 43835, -47749, -792, 10000, 0, 57); + +INSERT INTO `teleport` VALUES +('Dragon Valley - Town of Giran', 3317001, 83497, 148015, -3400, 0, 0, 57), +('Namo - Dragon Valley Junction', 3317002, 80012, 115911, -3672, 1900, 0, 57), +('Whirling Vortex Junction', 3317003, 102278, 113038, -3720, 1900, 0, 57), +('Namo - Entrance to Antharas Lair', 3317004, 131116, 114333, -3704, 1900, 0, 57), +('Northern Dragon Valley', 3317005, 87712, 106060, -3176, 0, 0, 57), +('Southern Dragon Valley', 3317006, 88016, 118852, -3056, 0, 0, 57), +('Northern Whirling Vortex', 3317007, 108064, 112432, -3008, 0, 0, 57), +('Southern Dragon Valley', 3317008, 109918, 121266, -3720, 0, 0, 57), +('Deep in Whirling Vortex', 3317009, 119506, 112331, -3688, 0, 0, 57), +('Antharas Lair - Barrier Bridge', 3317010, 146129, 111232, -3568, 0, 0, 57), +('Deep in Anthars'' Lair', 3317011, 148447, 110582, -3944, 0, 0, 57);