diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80800-80899.xml index 9d3f55bbb5..9847cee2f8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80800-80899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80800-80899.xml @@ -12,8 +12,17 @@ + + + 50 + 15 + 15 + 15 + 15 + 15 + 15 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80900-80999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80900-80999.xml index 8ff7ca0c01..09af10cedd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80900-80999.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80900-80999.xml @@ -861,7 +861,7 @@ - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml index 1a5b32e649..cd2b7bc479 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81000-81099.xml @@ -418,11 +418,18 @@ + + + + + + + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81100-81199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81100-81199.xml index ba799f45b3..6e6ba6a06f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81100-81199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81100-81199.xml @@ -179,11 +179,17 @@ + + + + + + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81300-81399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81300-81399.xml index c367d74d7e..dcda2dc4ac 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81300-81399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/81300-81399.xml @@ -1043,6 +1043,13 @@ + + + + + + + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39200-39299.xml index bd2abbb06e..b36174bf14 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39200-39299.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39200-39299.xml @@ -98,9 +98,30 @@ icon.etc_charm_of_luck_i00 - A1 - 4 + A2 + 1 + 1800 + SONGPYEN_BUFF + false + 5 + SELF + SINGLE + true 5000 + 4 + + + + + + 5 + PER + + + 5 + PER + + A1 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39600-39699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39600-39699.xml index 7db1eac491..6f0391f323 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39600-39699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/39600-39699.xml @@ -21,11 +21,30 @@ icon.armor_t2000_b_i00 - A1 + 1 + 86400 + APPEARANCE_POTION + AVE_RED_LIBRA_29 + A2 + 5000 + 1 + NONE + 5 + -1 + 0 + true 4 1500 - 5000 - 780 + SELF + SINGLE + S + + + + APPEARANCE_POTION,1 + + + @@ -81,10 +100,32 @@ icon.armor_t2000_b_i00 - - A1 - 1500 + 1 + 5 + A2 5000 + 1 + NONE + 5 + -1 + 0 + 4 + 1500 + SELF + SINGLE + S + + + 39602 + + + + + + APPEARANCE_POTION,1 + + + @@ -215,7 +256,21 @@ icon.skill0000 + 1 + 81367 A1 + 5 + -1 + SELF + SINGLE + + + + + + 10000 + + diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java index f233ed66c8..56f3be66b6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java @@ -263,6 +263,8 @@ public enum AbnormalType AIR_LIGHT(-1), PK_DEBUFF1(-1), PK_DEBUFF2(-1), + SONGPYEN_BUFF(-1), + APPEARANCE_POTION(-1), AB_HAWK_EYE(0), ALL_ATTACK_DOWN(1), ALL_ATTACK_UP(2), diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/48200-48299.xml index 6101cfb471..48c8913914 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/48200-48299.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/48200-48299.xml @@ -435,8 +435,15 @@ + + + + + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml index 1b6836cbe5..b7f52b5a5a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml @@ -12,8 +12,17 @@ + + + 50 + 15 + 15 + 15 + 15 + 15 + 15 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80900-80999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80900-80999.xml index 6b14aeb0e1..52ba9d5736 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80900-80999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80900-80999.xml @@ -861,7 +861,7 @@ - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml index 955cd6c0a0..a9bb893f5f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81000-81099.xml @@ -418,11 +418,18 @@ + + + + + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81100-81199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81100-81199.xml index 07a995d311..08f9c7e519 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81100-81199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81100-81199.xml @@ -179,11 +179,17 @@ + + + + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81300-81399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81300-81399.xml index 0827700f11..81e3ab1699 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81300-81399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81300-81399.xml @@ -1043,6 +1043,13 @@ + + + + + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81800-81899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81800-81899.xml index e0d7a8daae..1f7d9f721c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81800-81899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/81800-81899.xml @@ -821,7 +821,7 @@ - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml index 5fa103c7e6..d45b044057 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml @@ -96,11 +96,140 @@ 500 - - icon.etc_charm_of_luck_i00 - A1 + + + + + icon.etc_charm_of_luck_i00 + icon.ev_ricecake_potion + + A2 + + 1 + 2 + + 1800 + SONGPYEN_BUFF + false + 5 + SELF + SINGLE + true + + 5000 + 2000 + 4 - 5000 + + + + + + 100 + + + 100 + FIRE + + + 100 + WATER + + + 100 + WIND + + + 100 + EARTH + + + 100 + HOLY + + + 100 + DARK + + + + 20 + 10 + + PER + + + + 20 + 10 + + PER + + + + 1 + 10 + + PER + + + + 1 + 10 + + PER + + + + 1 + 20 + + PER + + + + 1 + 20 + + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 30 + DIFF + + A1 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39600-39699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39600-39699.xml index 1ef651ad2e..ebb51eb384 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39600-39699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39600-39699.xml @@ -21,11 +21,30 @@ icon.armor_t2000_b_i00 - A1 + 1 + 86400 + APPEARANCE_POTION + AVE_RED_LIBRA_29 + A2 + 5000 + 1 + NONE + 5 + -1 + 0 + true 4 1500 - 5000 - 780 + SELF + SINGLE + S + + + + APPEARANCE_POTION,1 + + + @@ -81,10 +100,32 @@ icon.armor_t2000_b_i00 - - A1 - 1500 + 1 + 5 + A2 5000 + 1 + NONE + 5 + -1 + 0 + 4 + 1500 + SELF + SINGLE + S + + + 39602 + + + + + + APPEARANCE_POTION,1 + + + @@ -214,7 +255,21 @@ icon.skill0000 + 1 + 81367 A1 + 5 + -1 + SELF + SINGLE + + + + + + 10000 + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java index 2a5961580e..c7b30febf7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java @@ -264,6 +264,8 @@ public enum AbnormalType PK_DEBUFF1(-1), PK_DEBUFF2(-1), ERATON(-1), + SONGPYEN_BUFF(-1), + APPEARANCE_POTION(-1), AB_HAWK_EYE(0), ALL_ATTACK_DOWN(1), ALL_ATTACK_UP(2), diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/multisell/2466.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/multisell/2466.xml new file mode 100644 index 0000000000..94c25742b6 --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/multisell/2466.xml @@ -0,0 +1,41 @@ + + + + 34604 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34604-1.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34604-1.htm new file mode 100644 index 0000000000..b90b7bbaba --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34604-1.htm @@ -0,0 +1,5 @@ + +I don't understand your surprise. In Chuseok, which falls on the 15th day of the 8th moon of the lunar calendar, the largest full moon rises in the sky once a year. Right now it is shining brightly in the center of Giran. I can take you there, you'll see with your own eyes.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34604.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34604.htm new file mode 100644 index 0000000000..e7767445fb --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34604.htm @@ -0,0 +1,8 @@ +Happy holiday, traveler!
+Have you seen this huge moon on Giran Square? I look at it an think that the specks on the moon are similar in shape to... a carrot. What do they remind you of?
+Imagine, there is a belief that the dark markings on the near side of the moon are a giant rabbit that cooks rice cakes. And if you look at the moon and you see the outline of such a rabbit, then you need to make a wish right away, because it will certainly come true.
+*rabbit laughs*
+Ha! To be honest, I'm terribly bad at cooking, but I love making others happy. If suddenly you have a Wish Ticket, then I will exchange it for supplies that will definitely come in handy on your travels. How do I get a ticket? Look at the moon and make a wish!
+ + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-1.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-1.htm new file mode 100644 index 0000000000..89a3d316bc --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-1.htm @@ -0,0 +1,5 @@ + +You can make a wish at the Full Moon once a day. For this you will receive a Wish Ticket. Take it to the Moon Rabbit to exchange for a small gift in honor of the Chuseok holiday.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-2.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-2.htm new file mode 100644 index 0000000000..a6d99f130f --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-2.htm @@ -0,0 +1,6 @@ + +In honor of the celebration, the moon is ready to give you the Full Moon's Energy buff.
+It is valid for 24 hours. Every hour that energy fills your body, you will receive a Chuseok Gift Bag in your inventory. In total - 24 small but pleasant gifts. You can renew the buff at any time.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-no-level.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-no-level.htm new file mode 100644 index 0000000000..d4d2165908 --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605-no-level.htm @@ -0,0 +1,4 @@ + +I'm sorry, but you have to be at least level 105.
+ + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605.htm b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605.htm new file mode 100644 index 0000000000..c9c50d3276 --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/34605.htm @@ -0,0 +1,5 @@ + +*A large and bright moon appeared in Giran. One has only to look at her, as the soul immediately becomes calm*
+ + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java new file mode 100644 index 0000000000..47595dcafc --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java @@ -0,0 +1,154 @@ +/* + * 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 events.ChuseokHarvestFestival; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.util.Calendar; +import java.util.logging.Level; + +import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.quest.LongTimeEvent; + +/** + * @URL https://l2central.info/main/events_and_promos/1459.html + * @author CostyKiller + */ +public class ChuseokHarvestFestival extends LongTimeEvent +{ + // NPCs + private static final int MOON_RABBIT = 34604; + private static final int FULL_MOON = 34605; + // Item + private static final int WISH_TICKET = 82196; + // Skill + private static final SkillHolder ENERGY_BUFF = new SkillHolder(34288, 1); // Full Moon's Festive Energy + // Misc + private static final String CHUSEOK_HARVEST_FESTIVAL_VAR = "CHUSEOK_HARVEST_FESTIVAL_TICKET_RECEIVED"; + private static final int PLAYER_LEVEL = 105; + // Moon Location + private static final Location FULL_MOON_LOC = new Location(81241, 148863, -3472); + + public ChuseokHarvestFestival() + { + addStartNpc(MOON_RABBIT); + addFirstTalkId(MOON_RABBIT, FULL_MOON); + addTalkId(MOON_RABBIT, FULL_MOON); + + if (isEventPeriod()) + { + startQuestTimer("schedule", 1000, null, null); + } + } + + @Override + public String onAdvEvent(String event, Npc npc, Player player) + { + String htmltext = event; + switch (event) + { + case "getTicket": + { + if (player.getLevel() < PLAYER_LEVEL) + { + htmltext = "no-level.htm"; + break; + } + else if (player.getVariables().getBoolean(CHUSEOK_HARVEST_FESTIVAL_VAR, false)) + { + player.sendMessage("This character has already received a ticket. An account can receive a ticket once a day."); + return null; + } + else + { + giveItems(player, WISH_TICKET, 1); + player.getVariables().set(CHUSEOK_HARVEST_FESTIVAL_VAR, true); + player.getVariables().storeMe(); + // htmltext = "34065-successful.htm"; // TODO: Addd retail html if any. + break; + } + } + case "getBuff": + { + if (player.getLevel() < PLAYER_LEVEL) + { + htmltext = "no-level.htm"; + break; + } + npc.setTarget(player); + npc.doCast(ENERGY_BUFF.getSkill()); + return null; + } + case "moveToTheMoon": + { + player.teleToLocation(FULL_MOON_LOC, true); + return ""; + } + case "schedule": + { + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 6); + calendar.set(Calendar.MINUTE, 30); + cancelQuestTimers("reset"); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); + break; + } + case "reset": + { + // Update data for offline players. + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement ps = con.prepareStatement("DELETE FROM character_variables WHERE var=?")) + { + ps.setString(1, CHUSEOK_HARVEST_FESTIVAL_VAR); + ps.executeUpdate(); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "Could not reset Chuseok Harvest Festival Event var: ", e); + } + + // Update data for online players. + for (Player plr : World.getInstance().getPlayers()) + { + plr.getVariables().remove(CHUSEOK_HARVEST_FESTIVAL_VAR); + plr.getVariables().storeMe(); + } + + cancelQuestTimers("schedule"); + startQuestTimer("schedule", 1000, null, null); + break; + } + } + return htmltext; + } + + @Override + public String onFirstTalk(Npc npc, Player player) + { + return npc.getId() + ".htm"; + } + + public static void main(String[] args) + { + new ChuseokHarvestFestival(); + } +} \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/config.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/config.xml new file mode 100644 index 0000000000..f0c4e6cc3d --- /dev/null +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/config.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/48200-48299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/48200-48299.xml index 9509e87a1b..a36c390383 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/48200-48299.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/48200-48299.xml @@ -430,13 +430,20 @@ - - + + + + + + + + + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80800-80899.xml index 2cba4a8c97..eab71b0b46 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80800-80899.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80800-80899.xml @@ -12,8 +12,17 @@ + + + 50 + 15 + 15 + 15 + 15 + 15 + 15 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80900-80999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80900-80999.xml index c74c6075b7..0ecbb54a78 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80900-80999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/80900-80999.xml @@ -861,7 +861,7 @@ - + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81000-81099.xml index 66e8528f28..94bceaf4e9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81000-81099.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81000-81099.xml @@ -411,11 +411,18 @@ + + + + + + + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81100-81199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81100-81199.xml index fa3d30ae48..ad150c5788 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81100-81199.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81100-81199.xml @@ -179,11 +179,17 @@ + + + + + + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81300-81399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81300-81399.xml index d4597bf5ca..8f4e593dbc 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81300-81399.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81300-81399.xml @@ -1035,8 +1035,8 @@ 114 - - + + @@ -1045,6 +1045,13 @@ + + + + + + + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81800-81899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81800-81899.xml index c67a57e163..1887c56c51 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81800-81899.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/81800-81899.xml @@ -805,7 +805,7 @@ - + @@ -818,7 +818,7 @@ - + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82100-82199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82100-82199.xml index 9aea6d9a5b..4009bfa14d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82100-82199.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/items/82100-82199.xml @@ -1154,8 +1154,8 @@ - - + + @@ -1168,27 +1168,22 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34200-34299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34200-34299.xml index 8026fdbf15..64a09a36f2 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34200-34299.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/34200-34299.xml @@ -999,9 +999,62 @@ A1 - + icon.skill0000 - A1 + 1 + 3600 + EVENT_BUFF + S_EVENT_MOON_AVE + 1000 + 105 + A2 + NONE + 5 + TARGET + SINGLE + true + false + + + 105 + + + + + 82195 + 1 + + + + + 34288 + + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + 21 + 22 + 23 + 24 + + + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml index f19d625f97..a2acc927f9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml @@ -95,12 +95,141 @@ 500 500 - - - icon.etc_charm_of_luck_i00 - A1 + + + + + + icon.etc_charm_of_luck_i00 + icon.ev_ricecake_potion + + A2 + + 1 + 2 + + 1800 + SONGPYEN_BUFF + false + 5 + SELF + SINGLE + true + + 5000 + 2000 + 4 - 5000 + + + + + + 100 + + + 100 + FIRE + + + 100 + WATER + + + 100 + WIND + + + 100 + EARTH + + + 100 + HOLY + + + 100 + DARK + + + + 20 + 10 + + PER + + + + 20 + 10 + + PER + + + + 1 + 10 + + PER + + + + 1 + 10 + + PER + + + + 1 + 20 + + PER + + + + 1 + 20 + + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 20 + PER + + + 30 + DIFF + + A1 diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39600-39699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39600-39699.xml index 9eb9376d64..9359202374 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39600-39699.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39600-39699.xml @@ -21,11 +21,30 @@ icon.armor_t2000_b_i00 - A1 + 1 + 86400 + APPEARANCE_POTION + AVE_RED_LIBRA_29 + A2 + 5000 + 1 + NONE + 5 + -1 + 0 + true 4 1500 - 5000 - 780 + SELF + SINGLE + S + + + + APPEARANCE_POTION,1 + + + @@ -81,10 +100,32 @@ icon.armor_t2000_b_i00 - - A1 - 1500 + 1 + 5 + A2 5000 + 1 + NONE + 5 + -1 + 0 + 4 + 1500 + SELF + SINGLE + S + + + 39602 + + + + + + APPEARANCE_POTION,1 + + + @@ -214,7 +255,21 @@ icon.skill0000 + 1 + 81367 A1 + 5 + -1 + SELF + SINGLE + + + + + + 10000 + + diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java index 46b458fdcf..697d9e6702 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/AbnormalType.java @@ -266,6 +266,9 @@ public enum AbnormalType ERATON(-1), DK_AURA(-1), SPIRIT_ALTAR(-1), + EVENT_BUFF(-1), + SONGPYEN_BUFF(-1), + APPEARANCE_POTION(-1), AB_HAWK_EYE(0), ALL_ATTACK_DOWN(1), ALL_ATTACK_UP(2),