Addition of configuration for teleport flags.
This commit is contained in:
@@ -576,6 +576,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -576,6 +576,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2069,6 +2070,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12198,10 +12198,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12214,12 +12226,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -584,6 +584,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -586,6 +586,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2092,6 +2093,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12205,10 +12205,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12221,12 +12233,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -584,6 +584,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -586,6 +586,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2105,6 +2106,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12207,10 +12207,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12223,12 +12235,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -584,6 +584,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -574,6 +574,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2085,6 +2086,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12188,10 +12188,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12204,12 +12216,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -584,6 +584,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -569,6 +569,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2086,6 +2087,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12178,10 +12178,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12194,12 +12206,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -584,6 +584,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -569,6 +569,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2093,6 +2094,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12181,10 +12181,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12197,12 +12209,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -584,6 +584,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -570,6 +570,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2132,6 +2133,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12187,10 +12187,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12203,12 +12215,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -586,6 +586,15 @@ CustomMultisellLoad = True
|
|||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -570,6 +570,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2141,6 +2142,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12204,10 +12204,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12220,12 +12232,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -581,6 +581,15 @@ CustomMultisellLoad = True
|
|||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
# No item consume: -1
|
||||||
|
BookmarkConsumeItemId = -1
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -567,6 +567,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2135,6 +2136,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12322,10 +12322,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12338,12 +12350,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -581,6 +581,15 @@ CustomMultisellLoad = True
|
|||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
# No item consume: -1
|
||||||
|
BookmarkConsumeItemId = -1
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -567,6 +567,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2135,6 +2136,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12349,10 +12349,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12365,12 +12377,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -678,6 +678,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -668,6 +668,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2193,6 +2194,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -13022,10 +13022,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -13038,12 +13050,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement ps = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement ps = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -678,6 +678,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -673,6 +673,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2198,6 +2199,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12915,10 +12915,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12931,12 +12943,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement ps = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement ps = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -580,6 +580,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2037,6 +2038,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12010,10 +12010,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12026,12 +12038,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -580,6 +580,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2041,6 +2042,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12010,10 +12010,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12026,12 +12038,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -580,6 +580,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2041,6 +2042,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -11996,10 +11996,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12012,12 +12024,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -580,6 +580,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2042,6 +2043,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12042,10 +12042,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12058,12 +12070,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -580,6 +580,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2051,6 +2052,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12042,10 +12042,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12058,12 +12070,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -581,6 +581,15 @@ CustomMultisellLoad = True
|
|||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -592,6 +592,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2053,6 +2054,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12033,10 +12033,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12049,12 +12061,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -612,6 +612,16 @@ CustomMultisellLoad = True
|
|||||||
# Default: False
|
# Default: False
|
||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# No item consume: -1
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
BookmarkConsumeItemId = 20033
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -600,6 +600,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2052,6 +2053,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12006,10 +12006,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12022,12 +12034,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -581,6 +581,15 @@ CustomMultisellLoad = True
|
|||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
# No item consume: -1
|
||||||
|
BookmarkConsumeItemId = -1
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -594,6 +594,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2087,6 +2088,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12293,10 +12293,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12309,12 +12321,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -581,6 +581,15 @@ CustomMultisellLoad = True
|
|||||||
CustomBuyListLoad = True
|
CustomBuyListLoad = True
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Teleport Bookmark Settings
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Consume item for teleporting.
|
||||||
|
# Default: 20033 (Teleport Flag)
|
||||||
|
# No item consume: -1
|
||||||
|
BookmarkConsumeItemId = -1
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Birthday Event Settings
|
# Birthday Event Settings
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -594,6 +594,7 @@ public class Config
|
|||||||
public static boolean CUSTOM_ITEMS_LOAD;
|
public static boolean CUSTOM_ITEMS_LOAD;
|
||||||
public static boolean CUSTOM_MULTISELL_LOAD;
|
public static boolean CUSTOM_MULTISELL_LOAD;
|
||||||
public static boolean CUSTOM_BUYLIST_LOAD;
|
public static boolean CUSTOM_BUYLIST_LOAD;
|
||||||
|
public static int BOOKMARK_CONSUME_ITEM_ID;
|
||||||
public static int ALT_BIRTHDAY_GIFT;
|
public static int ALT_BIRTHDAY_GIFT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
public static String ALT_BIRTHDAY_MAIL_SUBJECT;
|
||||||
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
public static String ALT_BIRTHDAY_MAIL_TEXT;
|
||||||
@@ -2090,6 +2091,7 @@ public class Config
|
|||||||
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
CUSTOM_ITEMS_LOAD = General.getBoolean("CustomItemsLoad", false);
|
||||||
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
CUSTOM_MULTISELL_LOAD = General.getBoolean("CustomMultisellLoad", false);
|
||||||
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
CUSTOM_BUYLIST_LOAD = General.getBoolean("CustomBuyListLoad", false);
|
||||||
|
BOOKMARK_CONSUME_ITEM_ID = General.getInt("BookmarkConsumeItemId", -1);
|
||||||
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
ALT_BIRTHDAY_GIFT = General.getInt("AltBirthdayGift", 22187);
|
||||||
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
ALT_BIRTHDAY_MAIL_SUBJECT = General.getString("AltBirthdayMailSubject", "Happy Birthday!");
|
||||||
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
ALT_BIRTHDAY_MAIL_TEXT = General.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");
|
||||||
|
|||||||
+15
-9
@@ -12360,10 +12360,22 @@ public class PlayerInstance extends Playable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_inventory.getInventoryItemCount(20033, 0) == 0)
|
if (Config.BOOKMARK_CONSUME_ITEM_ID > 0)
|
||||||
{
|
{
|
||||||
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
if (_inventory.getInventoryItemCount(Config.BOOKMARK_CONSUME_ITEM_ID, -1) == 0)
|
||||||
return;
|
{
|
||||||
|
if (Config.BOOKMARK_CONSUME_ITEM_ID == 20033)
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
destroyItem("Consume", _inventory.getItemByItemId(Config.BOOKMARK_CONSUME_ITEM_ID).getObjectId(), 1, null, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int id;
|
int id;
|
||||||
@@ -12376,12 +12388,6 @@ public class PlayerInstance extends Playable
|
|||||||
}
|
}
|
||||||
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
|
||||||
|
|
||||||
destroyItem("Consume", _inventory.getItemByItemId(20033).getObjectId(), 1, null, false);
|
|
||||||
|
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
|
|
||||||
sm.addItemName(20033);
|
|
||||||
sendPacket(sm);
|
|
||||||
|
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
PreparedStatement statement = con.prepareStatement(INSERT_TP_BOOKMARK))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user