From bc8770d36913897fc6f83e2e974a72fcdd808479 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 12 Apr 2022 11:40:33 +0000 Subject: [PATCH] Updated Beast Farm NPCs. Contributed by CostyKiller. --- .../dist/game/data/buylists/3136600.xml | 5 +- .../dist/game/data/html/merchant/31366.htm | 10 +-- .../game/data/html/teleporter/31537-1.htm | 5 ++ .../dist/game/data/html/teleporter/31537.htm | 6 ++ .../ai/areas/BeastFarm/Tunatun/31537-01.html | 4 - .../ai/areas/BeastFarm/Tunatun/31537-02.html | 5 -- .../ai/areas/BeastFarm/Tunatun/31537-03.html | 6 -- .../ai/areas/BeastFarm/Tunatun/31537-04.html | 5 -- .../ai/areas/BeastFarm/Tunatun/31537-05.html | 3 - .../ai/areas/BeastFarm/Tunatun/31537-06.html | 3 - .../ai/areas/BeastFarm/Tunatun/31537.html | 5 -- .../ai/areas/BeastFarm/Tunatun/Tunatun.java | 87 ------------------- .../dist/game/data/stats/npcs/31500-31599.xml | 2 +- .../game/data/teleporters/others/Tunatun.xml | 8 ++ 14 files changed, 26 insertions(+), 128 deletions(-) create mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537-1.htm create mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537.htm delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-01.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-02.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-03.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-04.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-05.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-06.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537.html delete mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java create mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/teleporters/others/Tunatun.xml diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/buylists/3136600.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/buylists/3136600.xml index bcc26fa7cf..ccfcc6cecb 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/buylists/3136600.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/buylists/3136600.xml @@ -5,8 +5,7 @@ - - + + - diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/html/merchant/31366.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/html/merchant/31366.htm index 7243c5519c..753eb69535 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/html/merchant/31366.htm +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/html/merchant/31366.htm @@ -1,8 +1,6 @@ Feed Seller:
-Welcome to the Beast Farm! Anyone can raise a beast in this place. If you are lucky, that beast will then tamely follow you. If you are not so lucky, well...you better hope you can defeat the creature!
-Anyway, I sell feed for beasts here: Golden Spice and Crystal Spice.
-Golden Spice helps beasts grow larger, while Crystal Spice helps bones and skins become tougher. If you want a beast to become rich, feed it Golden Spice. If you want to raise it strong, feed it Crystal Spice.
-Why not buy both and compare their effects?
- - +Welcome to the Beast Farm! Here we breed ferocious beasts! Whether the beasts will obey or attack you depends of your luck
+I sell feed for the beasts. There are two types of it: Golden Spice and Crystal Spice.Golden Spice makes beasts sturdier, and Crystal one makes them stronger. Buy and try to use both types of the feed, you'll figure out what to do.
+The beasts you see here have already fully grown. It's useless to feed them, you'll see no effect whatsoever. Why don't you try talking to Beast Herder Tunatun? He manages the Farm and knows more about it than I do.
+ \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537-1.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537-1.htm new file mode 100644 index 0000000000..d7991f98f4 --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537-1.htm @@ -0,0 +1,5 @@ +Beast Herder Tunatun:
+As you can see, the area surrounding the Beast Farm has changed. in order to protect the beasts from the enemies I took a good care of them and feed them well. Maybe even too well, they've become violent. So we've sent the youngest and the friendliest beasts to the safe place in the north.
+They still can be breed, they just need food. But the way to the north may be dangerous for the travelers. I can teleport you there if you want.
+ + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537.htm new file mode 100644 index 0000000000..665ff6af1d --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/html/teleporter/31537.htm @@ -0,0 +1,6 @@ +Beast Herder Tunatun:
+Welcome to the Beast Farm! My name is Tunatun and I'm in charge here. I started working here in order to better understand the beasts, but I got a little carried away, he-he.
+Although, I'm the manager, it doesn't mean I can make them obey me. I only make deals with Feed Sellers and hire adventurers.
+But I've heard the news about the changes at the Clan Hall Siege area.
+ + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-01.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-01.html deleted file mode 100644 index f9cb0c0b21..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-01.html +++ /dev/null @@ -1,4 +0,0 @@ -Beast Herder Tunatun:
-You wanted a Whip? Don't you already have one?
-If you don't, I can give you one again. Unfortunately, if you already have one, I can't give you another. Resources are pretty limited out here, I'm sure you can understand. - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-02.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-02.html deleted file mode 100644 index 9f1dab4277..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-02.html +++ /dev/null @@ -1,5 +0,0 @@ -Beast Herder Tunatun:
-You...? You don't look that strong. Raising beasts is not an easy thing.
-It could be really dangerious if something goes wrong. It's OK when they are young, but it becomes too dangerous for you to handle when they're are fully grown up.
-Maybe it would be better for you to come back again when you become a little more stronger. Then, I will gladly give you this Beast Handler's Whip. - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-03.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-03.html deleted file mode 100644 index ba96b28e52..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-03.html +++ /dev/null @@ -1,6 +0,0 @@ -Beast Herder Tunatun:
-Are you interested in Beast Training? I'll give you a Handler's Whip.
-You didn't forget about Beast Training techniques, did you? If you want, I can tell you about them again.
- - - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-04.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-04.html deleted file mode 100644 index 56da121c8c..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-04.html +++ /dev/null @@ -1,5 +0,0 @@ -Beast Herder Tunatun:
-In order to give orders to the beasts, you need this Whip.
-One beast used to be our limit, but thanks to the Beast Handler's Whip, it isn't a problem controlling more.
- - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-05.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-05.html deleted file mode 100644 index acd817badd..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-05.html +++ /dev/null @@ -1,3 +0,0 @@ -Beast Herder Tunatun:
-Look for Feed Sellers in this area like the one standing next to me. The feed you buy from them can be given to Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, and Alpine Buffalo. The more feed you give each beast, the more they'll grow.
Remember though, tamed beasts will run away if you run out of feed to give them. So be careful. - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-06.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-06.html deleted file mode 100644 index cfadbc4fec..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537-06.html +++ /dev/null @@ -1,3 +0,0 @@ -Beast Herder Tunatun:
-Oh, I see. I hope you will get a good result. - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537.html b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537.html deleted file mode 100644 index e7909bc1af..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/31537.html +++ /dev/null @@ -1,5 +0,0 @@ -Beast Herder Tunatun:
-Hi! Welcome to the Beast Farm. My name is Tunatun and I'm the one in charge here. I got this job because I thought I'd be able to commune with the beasts. After all, my pet kitty back home absolutely loved me. On this farm though, it's not so easy.
As a matter of fact, I'm having a lot of trouble with these beasts. They tend to fight back if you try to feed or tame them, so I've hired a Feed Seller and various adventurers to help me manage and protect the farm. At this point, there's not much else I can do.
- - - \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java deleted file mode 100644 index 6b4a147550..0000000000 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/BeastFarm/Tunatun/Tunatun.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program 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. - * - * This program 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.areas.BeastFarm.Tunatun; - -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.Player; - -import ai.AbstractNpcAI; - -/** - * Beast Herder Tunatun AI. - * @author Adry_85 - */ -public class Tunatun extends AbstractNpcAI -{ - // NPC - private static final int TUNATUN = 31537; - // Item - private static final int BEAST_HANDLERS_WHIP = 15473; - // Misc - private static final int MIN_LEVEL = 82; - - private Tunatun() - { - addStartNpc(TUNATUN); - addFirstTalkId(TUNATUN); - addTalkId(TUNATUN); - } - - @Override - public String onAdvEvent(String event, Npc npc, Player player) - { - String htmltext = getNoQuestMsg(player); - switch (event) - { - case "31537-04.html": - case "31537-05.html": - case "31537-06.html": - { - htmltext = event; - break; - } - case "whip": - { - { - if (!hasQuestItems(player, BEAST_HANDLERS_WHIP)) - { - if (player.getLevel() >= MIN_LEVEL) - { - giveItems(player, BEAST_HANDLERS_WHIP, 1); - htmltext = "31537-03.html"; - } - else - { - htmltext = "31537-02.html"; - } - } - else - { - htmltext = "31537-01.html"; - } - } - break; - } - } - return htmltext; - } - - public static void main(String[] args) - { - new Tunatun(); - } -} \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31500-31599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31500-31599.xml index c470708e3f..0f6d6b2406 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31500-31599.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31500-31599.xml @@ -1549,7 +1549,7 @@ - + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/teleporters/others/Tunatun.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/teleporters/others/Tunatun.xml new file mode 100644 index 0000000000..18a16491df --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/teleporters/others/Tunatun.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file