lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Freya Celebration event variable fix.

Browse Source 
Thanks to gigilo1968.
This commit is contained in:
MobiusDevelopment
2020-04-15 09:15:26 +00:00
parent e88b73abbc
commit 759c0177aa
9 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long _curr_time = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long _reuse_time = value == "" ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (_curr_time > _reuse_time)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (_reuse_time - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HR_S3_MIN); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HR_S3_MIN);

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -41,6 +41,7 @@ public class FreyaCelebration extends LongTimeEvent
private static final int FREYA_POTION = 15440; private static final int FREYA_POTION = 15440;
private static final int FREYA_GIFT = 17138; private static final int FREYA_GIFT = 17138;
// Misc // Misc
private static final String RESET_VAR = "FreyaCelebration";
private static final int HOURS = 20; private static final int HOURS = 20;
private static final int[] SKILLS = private static final int[] SKILLS =
@@ -78,18 +79,17 @@ public class FreyaCelebration extends LongTimeEvent
{ {
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{ {
final long currTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
final String value = player.getVariables().getString("FreyaCelebration"); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
final long reuseTime = value.equals("") ? 0 : Long.parseLong(value); if (currentTime > reuseTime)
if (currTime > reuseTime)
{ {
takeItems(player, Inventory.ADENA_ID, 1); takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1); giveItems(player, FREYA_POTION, 1);
player.getVariables().set("FreyaCelebration", Long.toString(System.currentTimeMillis() + (HOURS * 3600000))); player.getVariables().set(RESET_VAR, currentTime + (HOURS * 3600000));
} }
else else
{ {
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000; final long remainingTime = (reuseTime - currentTime) / 1000;
final int hours = (int) (remainingTime / 3600); final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60); final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);