diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/2212.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3429201.xml similarity index 100% rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/2212.xml rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3429201.xml diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/2209.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3429202.xml similarity index 100% rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/2209.xml rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3429202.xml diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3043.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3429203.xml similarity index 100% rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3043.xml rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/3429203.xml diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/34292-01.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/34292-01.htm new file mode 100644 index 0000000000..3165d3e501 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/34292-01.htm @@ -0,0 +1,9 @@ +Event Manager Chef Monkey:
+One morning, I opened my eyes and found myself a genius chef! I am Chef Monkey.
+I have come to the Aden Continent to bring happiness to all through my food! Even the monsters have eaten my food! They drop bananas when they die!
+The fish love the bait I make! They can't get enough! You can use my super bait to catch a special Tuna fish!
+Oh, that will be a great fishing! Especially if you have a delicious Banana Cocktail with you. Alleviate your tiredness with fishing!
+ + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java index 1edcac65ba..1ee5d8ef29 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java @@ -16,89 +16,31 @@ */ package events.ChefMonkeyEvent; -import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.events.EventType; -import com.l2jmobius.gameserver.model.events.ListenerRegisterType; -import com.l2jmobius.gameserver.model.events.annotations.Id; -import com.l2jmobius.gameserver.model.events.annotations.RegisterEvent; -import com.l2jmobius.gameserver.model.events.annotations.RegisterType; -import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcMenuSelect; import com.l2jmobius.gameserver.model.quest.LongTimeEvent; /** - * Chef Monkey Event
- * http://www.lineage2.com/en/news/events/chef-monkey-event-2016.php - * @author ChaosPaladin + * Chef Monkey Event + * @URL https://eu.4gameforum.com/threads/603119/ + * @author Mobius */ public final class ChefMonkeyEvent extends LongTimeEvent { - // NPCs - private static final int EV_CHEF_MONKEY = 34292; + // NPC + private static final int CHEF_MONKEY = 34292; private ChefMonkeyEvent() { - addStartNpc(EV_CHEF_MONKEY); - addFirstTalkId(EV_CHEF_MONKEY); - addTalkId(EV_CHEF_MONKEY); + addStartNpc(CHEF_MONKEY); + addFirstTalkId(CHEF_MONKEY); + addTalkId(CHEF_MONKEY); } @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return "ev_chef_monkey001.htm"; - } - - @Override - public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) - { - String htmltext = null; - - switch (event) - { - case "ev_chef_monkey001.htm": - case "ev_chef_monkey002.htm": - case "ev_chef_monkey003.htm": - case "ev_chef_monkey004.htm": - case "ev_chef_monkey005.htm": - { - htmltext = event; - break; - } - } - return htmltext; - } - - @RegisterEvent(EventType.ON_NPC_MENU_SELECT) - @RegisterType(ListenerRegisterType.NPC) - @Id(EV_CHEF_MONKEY) - public final void OnNpcMenuSelect(OnNpcMenuSelect event) - { - final L2PcInstance player = event.getTalker(); - final L2Npc npc = event.getNpc(); - final int ask = event.getAsk(); - final int reply = event.getReply(); - - if (ask == -303) - { - if (reply == 2209) - { - // I want to buy Monkey Bait - MultisellData.getInstance().separateAndSend(2209, player, npc, false); - } - else if (reply == 2212) - { - // I want to exchange Tuna fish - MultisellData.getInstance().separateAndSend(2212, player, npc, false); - } - else if (reply == 3043) - { - // buy buff cocktail - MultisellData.getInstance().separateAndSend(3043, player, npc, false); - - } - } + return "34292-01.htm"; } public static void main(String[] args) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml index bee683e51f..f423f00ed4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml @@ -18,7 +18,7 @@ - - + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey003.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey003.htm deleted file mode 100644 index 1386153a9f..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey003.htm +++ /dev/null @@ -1,7 +0,0 @@ -Event Manager Chef Monkey:
-So you'd like to know about the Monkey Bait, hmm? It's a type of bait that I've cooked up, and the fish love it! They can't get enough!
-Fishing with the Monkey Bait, you'll be able to fish faster than before! You'll also get more XP.
-Sometimes, you'll get lucky and catch a Chef Monkey's Treasure Chest. I lost it when the fish swarmed around me! But if you manage to fish the Treasure Chest around using my bait, it's yours! I don't have much need for it.
- - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey004.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey004.htm deleted file mode 100644 index 13c47ca784..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey004.htm +++ /dev/null @@ -1,7 +0,0 @@ -Event Manager Chef Monkey:
-The Seed Talisman Manager in the Town of Aden also likes my cooking!
-He asked me to make him a month's worth, so I did.
- - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey005.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey005.htm deleted file mode 100644 index 6cfaa70761..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey005.htm +++ /dev/null @@ -1,8 +0,0 @@ -Event Manager Chef Monkey:
-You'd like to hear about Chef Monkey's Banana Herb, eh? Haha, it's quite something!
-When I first arrive on the Aden continent, I didn't know anything, so I ended up cooking for the monsters! They loved it. When the monsters who had eaten my food died, they dropped Banana Herbs. It was strange.
-Chef Monkey's Banana Herb increases P. Atk., M. Atk, P. Def., and M. Def. by 50% for 5 minutes, and increases XP and SP gained by 10%!
-I've cooked for a lot of monsters! Go out and hunt them!
- - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/2212.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3429201.xml similarity index 100% rename from L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/2212.xml rename to L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3429201.xml diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/2209.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3429202.xml similarity index 100% rename from L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/2209.xml rename to L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3429202.xml diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3043.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3429203.xml similarity index 100% rename from L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3043.xml rename to L2J_Mobius_Classic_2.0_Zaken/dist/game/data/multisell/3429203.xml diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/34292-01.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/34292-01.htm new file mode 100644 index 0000000000..3165d3e501 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/34292-01.htm @@ -0,0 +1,9 @@ +Event Manager Chef Monkey:
+One morning, I opened my eyes and found myself a genius chef! I am Chef Monkey.
+I have come to the Aden Continent to bring happiness to all through my food! Even the monsters have eaten my food! They drop bananas when they die!
+The fish love the bait I make! They can't get enough! You can use my super bait to catch a special Tuna fish!
+Oh, that will be a great fishing! Especially if you have a delicious Banana Cocktail with you. Alleviate your tiredness with fishing!
+ + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java index 1edcac65ba..1ee5d8ef29 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ChefMonkeyEvent.java @@ -16,89 +16,31 @@ */ package events.ChefMonkeyEvent; -import com.l2jmobius.gameserver.data.xml.impl.MultisellData; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.events.EventType; -import com.l2jmobius.gameserver.model.events.ListenerRegisterType; -import com.l2jmobius.gameserver.model.events.annotations.Id; -import com.l2jmobius.gameserver.model.events.annotations.RegisterEvent; -import com.l2jmobius.gameserver.model.events.annotations.RegisterType; -import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcMenuSelect; import com.l2jmobius.gameserver.model.quest.LongTimeEvent; /** - * Chef Monkey Event
- * http://www.lineage2.com/en/news/events/chef-monkey-event-2016.php - * @author ChaosPaladin + * Chef Monkey Event + * @URL https://eu.4gameforum.com/threads/603119/ + * @author Mobius */ public final class ChefMonkeyEvent extends LongTimeEvent { - // NPCs - private static final int EV_CHEF_MONKEY = 34292; + // NPC + private static final int CHEF_MONKEY = 34292; private ChefMonkeyEvent() { - addStartNpc(EV_CHEF_MONKEY); - addFirstTalkId(EV_CHEF_MONKEY); - addTalkId(EV_CHEF_MONKEY); + addStartNpc(CHEF_MONKEY); + addFirstTalkId(CHEF_MONKEY); + addTalkId(CHEF_MONKEY); } @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return "ev_chef_monkey001.htm"; - } - - @Override - public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) - { - String htmltext = null; - - switch (event) - { - case "ev_chef_monkey001.htm": - case "ev_chef_monkey002.htm": - case "ev_chef_monkey003.htm": - case "ev_chef_monkey004.htm": - case "ev_chef_monkey005.htm": - { - htmltext = event; - break; - } - } - return htmltext; - } - - @RegisterEvent(EventType.ON_NPC_MENU_SELECT) - @RegisterType(ListenerRegisterType.NPC) - @Id(EV_CHEF_MONKEY) - public final void OnNpcMenuSelect(OnNpcMenuSelect event) - { - final L2PcInstance player = event.getTalker(); - final L2Npc npc = event.getNpc(); - final int ask = event.getAsk(); - final int reply = event.getReply(); - - if (ask == -303) - { - if (reply == 2209) - { - // I want to buy Monkey Bait - MultisellData.getInstance().separateAndSend(2209, player, npc, false); - } - else if (reply == 2212) - { - // I want to exchange Tuna fish - MultisellData.getInstance().separateAndSend(2212, player, npc, false); - } - else if (reply == 3043) - { - // buy buff cocktail - MultisellData.getInstance().separateAndSend(3043, player, npc, false); - - } - } + return "34292-01.htm"; } public static void main(String[] args) diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml index bee683e51f..f423f00ed4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/config.xml @@ -18,7 +18,7 @@ - - + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey001.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey001.htm deleted file mode 100644 index 971f3036a5..0000000000 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey001.htm +++ /dev/null @@ -1,10 +0,0 @@ -Event Manager Chef Monkey:
-One morning, I opened my eyes and found myself a genius chef! I am Chef Monkey.
-I have come to the Aden Continent to bring happiness to all through my food! Even the monsters have eaten my food! They drop bananas when they die!
-The fish love the bait I make! They can’t get enough! You can use my super bait to catch a special Tuna fish!
-Oh, that will be a great fishing! Especially if you have a delicious Banana Cocktail with you. Alleviate your tiredness with fishing!
- - - - -View \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey002.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey002.htm deleted file mode 100644 index c145a69206..0000000000 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey002.htm +++ /dev/null @@ -1,7 +0,0 @@ -Event Manager Chef Monkey:
-Do you need it explained to you again?
-I , Chef Monkey, am a genius chef! Everybody is after my food: the monsters, the fish, even the Seed Talisman Manager!
-They’ll appreciate my cooking on the Aden Continent as well. That’s why I’ve gone and prepared some Monkey Bait. The fish love it!
- - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey003.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey003.htm deleted file mode 100644 index 1386153a9f..0000000000 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey003.htm +++ /dev/null @@ -1,7 +0,0 @@ -Event Manager Chef Monkey:
-So you'd like to know about the Monkey Bait, hmm? It's a type of bait that I've cooked up, and the fish love it! They can't get enough!
-Fishing with the Monkey Bait, you'll be able to fish faster than before! You'll also get more XP.
-Sometimes, you'll get lucky and catch a Chef Monkey's Treasure Chest. I lost it when the fish swarmed around me! But if you manage to fish the Treasure Chest around using my bait, it's yours! I don't have much need for it.
- - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey004.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey004.htm deleted file mode 100644 index 13c47ca784..0000000000 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey004.htm +++ /dev/null @@ -1,7 +0,0 @@ -Event Manager Chef Monkey:
-The Seed Talisman Manager in the Town of Aden also likes my cooking!
-He asked me to make him a month's worth, so I did.
- - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey005.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey005.htm deleted file mode 100644 index 6cfaa70761..0000000000 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/events/ChefMonkeyEvent/ev_chef_monkey005.htm +++ /dev/null @@ -1,8 +0,0 @@ -Event Manager Chef Monkey:
-You'd like to hear about Chef Monkey's Banana Herb, eh? Haha, it's quite something!
-When I first arrive on the Aden continent, I didn't know anything, so I ended up cooking for the monsters! They loved it. When the monsters who had eaten my food died, they dropped Banana Herbs. It was strange.
-Chef Monkey's Banana Herb increases P. Atk., M. Atk, P. Def., and M. Def. by 50% for 5 minutes, and increases XP and SP gained by 10%!
-I've cooked for a lot of monsters! Go out and hunt them!
- - - \ No newline at end of file