From 6c703e1fa26ea05930e0f93322cc7fa06effb37f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 19 Sep 2022 23:27:11 +0000 Subject: [PATCH] Proper ItemId requested by Birthday event. --- .../CharacterBirthday/CharacterBirthday.java | 3 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 6 - .../gameserver/taskmanager/TaskManager.java | 2 - .../taskmanager/tasks/TaskBirthday.java | 140 ------------------ .../dist/game/config/General.ini | 16 -- .../java/org/l2jmobius/Config.java | 6 - .../gameserver/taskmanager/TaskManager.java | 2 - .../taskmanager/tasks/TaskBirthday.java | 140 ------------------ .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- .../dist/game/config/General.ini | 4 +- .../java/org/l2jmobius/Config.java | 2 +- 31 files changed, 36 insertions(+), 349 deletions(-) delete mode 100644 L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java delete mode 100644 L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 351399869b..4d354fc43a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -34,10 +34,9 @@ import ai.AbstractNpcAI; /** * @author Gnacik */ - public class CharacterBirthday extends AbstractNpcAI { - // Npcs + // NPCs private static final int ALEGRIA = 32600; private static final int[] GATEKEEPERS = { diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/General.ini b/L2J_Mobius_Classic_1.0/dist/game/config/General.ini index d9760e4c89..c6c57568cc 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_1.0/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java index bdd6d992b4..76b4fe3d9b 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java @@ -602,9 +602,6 @@ public class Config public static boolean CUSTOM_MULTISELL_LOAD; public static boolean CUSTOM_BUYLIST_LOAD; public static int BOOKMARK_CONSUME_ITEM_ID; - public static int ALT_BIRTHDAY_GIFT; - public static String ALT_BIRTHDAY_MAIL_SUBJECT; - public static String ALT_BIRTHDAY_MAIL_TEXT; public static boolean ENABLE_BLOCK_CHECKER_EVENT; public static int MIN_BLOCK_CHECKER_TEAM_MEMBERS; public static boolean HBCE_FAIR_PLAY; @@ -2035,9 +2032,6 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); - ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); - ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); MIN_BLOCK_CHECKER_TEAM_MEMBERS = generalConfig.getInt("BlockCheckerMinTeamMembers", 2); if (MIN_BLOCK_CHECKER_TEAM_MEMBERS < 1) diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index cd161c8959..a9e6c1cfa9 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRestart; @@ -165,7 +164,6 @@ public class TaskManager private void initializate() { - registerTask(new TaskBirthday()); registerTask(new TaskCleanUp()); registerTask(new TaskRecom()); registerTask(new TaskRestart()); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java deleted file mode 100644 index d95f42827a..0000000000 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java +++ /dev/null @@ -1,140 +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 org.l2jmobius.gameserver.taskmanager.tasks; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.logging.Level; - -import org.l2jmobius.Config; -import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.data.sql.CharNameTable; -import org.l2jmobius.gameserver.enums.MailType; -import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.Message; -import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.taskmanager.Task; -import org.l2jmobius.gameserver.taskmanager.TaskManager; -import org.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask; -import org.l2jmobius.gameserver.taskmanager.TaskTypes; -import org.l2jmobius.gameserver.util.Util; - -/** - * @author Nyaran - */ -public class TaskBirthday extends Task -{ - private static final String NAME = "birthday"; - private static final String QUERY = "SELECT charId, createDate FROM characters WHERE createDate LIKE ?"; - private static final Calendar TODAY = Calendar.getInstance(); - private int _count = 0; - - @Override - public String getName() - { - return NAME; - } - - @Override - public void onTimeElapsed(ExecutedTask task) - { - final Calendar lastExecDate = Calendar.getInstance(); - final long lastActivation = task.getLastActivation(); - if (lastActivation > 0) - { - lastExecDate.setTimeInMillis(lastActivation); - } - - final String rangeDate = "[" + Util.getDateString(lastExecDate.getTime()) + "] - [" + Util.getDateString(TODAY.getTime()) + "]"; - for (; !TODAY.before(lastExecDate); lastExecDate.add(Calendar.DATE, 1)) - { - checkBirthday(lastExecDate.get(Calendar.YEAR), lastExecDate.get(Calendar.MONTH), lastExecDate.get(Calendar.DATE)); - } - - LOGGER.info("BirthdayManager: " + _count + " gifts sent. " + rangeDate); - } - - private void checkBirthday(int year, int month, int day) - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement statement = con.prepareStatement(QUERY)) - { - statement.setString(1, "%-" + getNum(month + 1) + "-" + getNum(day)); - try (ResultSet rset = statement.executeQuery()) - { - while (rset.next()) - { - final int playerId = rset.getInt("charId"); - final Calendar createDate = Calendar.getInstance(); - createDate.setTime(rset.getDate("createDate")); - - final int age = year - createDate.get(Calendar.YEAR); - if (age <= 0) - { - continue; - } - - String text = Config.ALT_BIRTHDAY_MAIL_TEXT; - if (text.contains("$c1")) - { - text = text.replace("$c1", CharNameTable.getInstance().getNameById(playerId)); - } - if (text.contains("$s1")) - { - text = text.replace("$s1", String.valueOf(age)); - } - - final Message msg = new Message(playerId, Config.ALT_BIRTHDAY_MAIL_SUBJECT, text, MailType.BIRTHDAY); - final Mail attachments = msg.createAttachments(); - attachments.addItem("Birthday", Config.ALT_BIRTHDAY_GIFT, 1, null, null); - MailManager.getInstance().sendMessage(msg); - _count++; - } - } - } - catch (SQLException e) - { - LOGGER.log(Level.WARNING, "Error checking birthdays. ", e); - } - - // If character birthday is 29-Feb and year isn't leap, send gift on 28-feb - final GregorianCalendar calendar = new GregorianCalendar(); - if ((month == Calendar.FEBRUARY) && (day == 28) && !calendar.isLeapYear(TODAY.get(Calendar.YEAR))) - { - checkBirthday(year, Calendar.FEBRUARY, 29); - } - } - - /** - * @param num the number to format. - * @return the formatted number starting with a 0 if it is lower or equal than 10. - */ - private String getNum(int num) - { - return (num <= 9) ? "0" + num : String.valueOf(num); - } - - @Override - public void initializate() - { - TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", ""); - } -} diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini index 17c91d2687..2d0feee089 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini @@ -583,22 +583,6 @@ CustomBuyListLoad = True BookmarkConsumeItemId = 20033 -# --------------------------------------------------------------------------- -# Birthday Event Settings -# --------------------------------------------------------------------------- - -# Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 - -# Mail Subject -AltBirthdayMailSubject = Happy Birthday! - -# Mail Content -# $c1: Player name -# $s1: Age -AltBirthdayMailText = Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day.\n\nSincerely, Alegria - # --------------------------------------------------------------------------- # Handy's Block Checker Event Settings # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java index bbd8bc5bb4..35a1d17869 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java @@ -612,9 +612,6 @@ public class Config public static boolean CUSTOM_MULTISELL_LOAD; public static boolean CUSTOM_BUYLIST_LOAD; public static int BOOKMARK_CONSUME_ITEM_ID; - public static int ALT_BIRTHDAY_GIFT; - public static String ALT_BIRTHDAY_MAIL_SUBJECT; - public static String ALT_BIRTHDAY_MAIL_TEXT; public static boolean ENABLE_BLOCK_CHECKER_EVENT; public static int MIN_BLOCK_CHECKER_TEAM_MEMBERS; public static boolean HBCE_FAIR_PLAY; @@ -2064,9 +2061,6 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); - ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); - ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); MIN_BLOCK_CHECKER_TEAM_MEMBERS = generalConfig.getInt("BlockCheckerMinTeamMembers", 2); if (MIN_BLOCK_CHECKER_TEAM_MEMBERS < 1) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index cd161c8959..a9e6c1cfa9 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRestart; @@ -165,7 +164,6 @@ public class TaskManager private void initializate() { - registerTask(new TaskBirthday()); registerTask(new TaskCleanUp()); registerTask(new TaskRecom()); registerTask(new TaskRestart()); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java deleted file mode 100644 index d95f42827a..0000000000 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java +++ /dev/null @@ -1,140 +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 org.l2jmobius.gameserver.taskmanager.tasks; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.logging.Level; - -import org.l2jmobius.Config; -import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.data.sql.CharNameTable; -import org.l2jmobius.gameserver.enums.MailType; -import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.Message; -import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.taskmanager.Task; -import org.l2jmobius.gameserver.taskmanager.TaskManager; -import org.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask; -import org.l2jmobius.gameserver.taskmanager.TaskTypes; -import org.l2jmobius.gameserver.util.Util; - -/** - * @author Nyaran - */ -public class TaskBirthday extends Task -{ - private static final String NAME = "birthday"; - private static final String QUERY = "SELECT charId, createDate FROM characters WHERE createDate LIKE ?"; - private static final Calendar TODAY = Calendar.getInstance(); - private int _count = 0; - - @Override - public String getName() - { - return NAME; - } - - @Override - public void onTimeElapsed(ExecutedTask task) - { - final Calendar lastExecDate = Calendar.getInstance(); - final long lastActivation = task.getLastActivation(); - if (lastActivation > 0) - { - lastExecDate.setTimeInMillis(lastActivation); - } - - final String rangeDate = "[" + Util.getDateString(lastExecDate.getTime()) + "] - [" + Util.getDateString(TODAY.getTime()) + "]"; - for (; !TODAY.before(lastExecDate); lastExecDate.add(Calendar.DATE, 1)) - { - checkBirthday(lastExecDate.get(Calendar.YEAR), lastExecDate.get(Calendar.MONTH), lastExecDate.get(Calendar.DATE)); - } - - LOGGER.info("BirthdayManager: " + _count + " gifts sent. " + rangeDate); - } - - private void checkBirthday(int year, int month, int day) - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement statement = con.prepareStatement(QUERY)) - { - statement.setString(1, "%-" + getNum(month + 1) + "-" + getNum(day)); - try (ResultSet rset = statement.executeQuery()) - { - while (rset.next()) - { - final int playerId = rset.getInt("charId"); - final Calendar createDate = Calendar.getInstance(); - createDate.setTime(rset.getDate("createDate")); - - final int age = year - createDate.get(Calendar.YEAR); - if (age <= 0) - { - continue; - } - - String text = Config.ALT_BIRTHDAY_MAIL_TEXT; - if (text.contains("$c1")) - { - text = text.replace("$c1", CharNameTable.getInstance().getNameById(playerId)); - } - if (text.contains("$s1")) - { - text = text.replace("$s1", String.valueOf(age)); - } - - final Message msg = new Message(playerId, Config.ALT_BIRTHDAY_MAIL_SUBJECT, text, MailType.BIRTHDAY); - final Mail attachments = msg.createAttachments(); - attachments.addItem("Birthday", Config.ALT_BIRTHDAY_GIFT, 1, null, null); - MailManager.getInstance().sendMessage(msg); - _count++; - } - } - } - catch (SQLException e) - { - LOGGER.log(Level.WARNING, "Error checking birthdays. ", e); - } - - // If character birthday is 29-Feb and year isn't leap, send gift on 28-feb - final GregorianCalendar calendar = new GregorianCalendar(); - if ((month == Calendar.FEBRUARY) && (day == 28) && !calendar.isLeapYear(TODAY.get(Calendar.YEAR))) - { - checkBirthday(year, Calendar.FEBRUARY, 29); - } - } - - /** - * @param num the number to format. - * @return the formatted number starting with a 0 if it is lower or equal than 10. - */ - private String getNum(int num) - { - return (num <= 9) ? "0" + num : String.valueOf(num); - } - - @Override - public void initializate() - { - TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", ""); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini index 17c91d2687..da28bca5a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index 8e44ded2b3..0a1f052fb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -2063,7 +2063,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini index 17c91d2687..da28bca5a6 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java index d2a2442701..bf201371d4 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java @@ -2067,7 +2067,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini index 17c91d2687..da28bca5a6 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java index d2a2442701..bf201371d4 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java @@ -2067,7 +2067,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini index 17c91d2687..da28bca5a6 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java index d2a2442701..bf201371d4 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java @@ -2067,7 +2067,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini index 5f6983fdad..aeb628b12b 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java index a813c86357..a688e2055c 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java @@ -2119,7 +2119,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini index 17c91d2687..da28bca5a6 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java index 706accc962..7ed541af64 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java @@ -2076,7 +2076,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini index 57c2fca81c..ae38bc9a30 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index c30d91059b..ccb6212c93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -2117,7 +2117,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini index 789976fd4f..9eb8363a3d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini @@ -620,8 +620,8 @@ BookmarkConsumeItemId = 20033 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 7541 +AltBirthdayGift = 7541 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index 6e2fffc624..f9edc05593 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -2078,7 +2078,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 7541); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini index 841f706a3b..dd3690d035 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = -1 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 93998 +AltBirthdayGift = 93998 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java index 2c1d68d1c1..1f3e05833d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -2155,7 +2155,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 93998); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini index 08be2fbab1..c02b1ada80 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = -1 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 72078 +AltBirthdayGift = 72078 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java index 4f94251647..554df2af15 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java @@ -2254,7 +2254,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 72078); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini index 08be2fbab1..c02b1ada80 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini @@ -588,8 +588,8 @@ BookmarkConsumeItemId = -1 # --------------------------------------------------------------------------- # Gift sent with Mail System -# Default: 22187 -AltBirthdayGift = 22187 +# Default: 72078 +AltBirthdayGift = 72078 # Mail Subject AltBirthdayMailSubject = Happy Birthday! diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java index 79987b17bc..9fc25b2016 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java @@ -2289,7 +2289,7 @@ public class Config CUSTOM_MULTISELL_LOAD = generalConfig.getBoolean("CustomMultisellLoad", false); CUSTOM_BUYLIST_LOAD = generalConfig.getBoolean("CustomBuyListLoad", false); BOOKMARK_CONSUME_ITEM_ID = generalConfig.getInt("BookmarkConsumeItemId", -1); - ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 22187); + ALT_BIRTHDAY_GIFT = generalConfig.getInt("AltBirthdayGift", 72078); ALT_BIRTHDAY_MAIL_SUBJECT = generalConfig.getString("AltBirthdayMailSubject", "Happy Birthday!"); ALT_BIRTHDAY_MAIL_TEXT = generalConfig.getString("AltBirthdayMailText", "Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day." + EOL + EOL + "Sincerely, Alegria"); ENABLE_BLOCK_CHECKER_EVENT = generalConfig.getBoolean("EnableBlockCheckerEvent", false);