From 36df1513874c0d0dba6e63970e81054d5a1a220d Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 2 Dec 2018 03:30:01 +0000
Subject: [PATCH] Removed olympiad class matches. Contributed by Iris.
---
.../OlyManager/OlyManager-joinMatch.html | 5 ++--
.../OlyManager/OlyManager-joinMatchClass.html | 16 -----------
.../ai/others/OlyManager/OlyManager.java | 27 ++-----------------
.../OlyManager/OlyManager-joinMatch.html | 5 ++--
.../OlyManager/OlyManager-joinMatchClass.html | 16 -----------
.../ai/others/OlyManager/OlyManager.java | 27 ++-----------------
.../OlyManager/OlyManager-joinMatch.html | 5 ++--
.../OlyManager/OlyManager-joinMatchClass.html | 16 -----------
.../ai/others/OlyManager/OlyManager.java | 27 ++-----------------
.../OlyManager/OlyManager-joinMatch.html | 5 ++--
.../OlyManager/OlyManager-joinMatchClass.html | 16 -----------
.../ai/others/OlyManager/OlyManager.java | 27 ++-----------------
12 files changed, 16 insertions(+), 176 deletions(-)
delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
index 5c3b01f378..c1abdedaa6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
@@ -3,12 +3,11 @@
|
- | This week's match is 1 vs 1 Class Individual Match,1 vs 1 All-class Battle. |
+ | Would you like to register for the Grand Olympiad? |
|
| (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
|
- |
- |
+ |
|
|
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
deleted file mode 100644
index 14ed9c0aeb..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- |
- | This week's match is 1 vs 1 Class Individual Match. |
- |
- | (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
- |
- |
- |
- |
-
- |
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 2796ef65f9..3cdf5ed18d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -16,9 +16,6 @@
*/
package ai.others.OlyManager;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.temporal.WeekFields;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -101,22 +98,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
else
{
- switch (LocalDate.now().get(WeekFields.of(DayOfWeek.MONDAY, 7).weekOfMonth()))
- {
- case 1:
- case 2:
- case 3: // First 3 weeks of month is 1v1 + 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatch.html");
- break;
- }
- default:// Rest is only 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatchClass.html");
- break;
- }
- }
-
+ htmltext = getHtm(player, "OlyManager-joinMatch.html");
htmltext = htmltext.replace("%olympiad_round%", String.valueOf(Olympiad.getInstance().getPeriod()));
htmltext = htmltext.replace("%olympiad_week%", String.valueOf(Olympiad.getInstance().getCurrentCycle()));
htmltext = htmltext.replace("%olympiad_participant%", String.valueOf(OlympiadManager.getInstance().getCountOpponents()));
@@ -124,7 +106,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
break;
}
case "register1v1":
- case "register1v1class":
{
if (player.isSubClassActive())
{
@@ -142,13 +123,9 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
}
- else if (event.equals("register1v1"))
- {
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
- }
else
{
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.CLASSED);
+ OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
}
break;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
index 5c3b01f378..c1abdedaa6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
@@ -3,12 +3,11 @@
|
|
- | This week's match is 1 vs 1 Class Individual Match,1 vs 1 All-class Battle. |
+ | Would you like to register for the Grand Olympiad? |
|
| (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
|
- |
- |
+ |
|
|
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
deleted file mode 100644
index 14ed9c0aeb..0000000000
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- |
- | This week's match is 1 vs 1 Class Individual Match. |
- |
- | (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
- |
- |
- |
- |
-
- |
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 2796ef65f9..3cdf5ed18d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -16,9 +16,6 @@
*/
package ai.others.OlyManager;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.temporal.WeekFields;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -101,22 +98,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
else
{
- switch (LocalDate.now().get(WeekFields.of(DayOfWeek.MONDAY, 7).weekOfMonth()))
- {
- case 1:
- case 2:
- case 3: // First 3 weeks of month is 1v1 + 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatch.html");
- break;
- }
- default:// Rest is only 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatchClass.html");
- break;
- }
- }
-
+ htmltext = getHtm(player, "OlyManager-joinMatch.html");
htmltext = htmltext.replace("%olympiad_round%", String.valueOf(Olympiad.getInstance().getPeriod()));
htmltext = htmltext.replace("%olympiad_week%", String.valueOf(Olympiad.getInstance().getCurrentCycle()));
htmltext = htmltext.replace("%olympiad_participant%", String.valueOf(OlympiadManager.getInstance().getCountOpponents()));
@@ -124,7 +106,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
break;
}
case "register1v1":
- case "register1v1class":
{
if (player.isSubClassActive())
{
@@ -142,13 +123,9 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
}
- else if (event.equals("register1v1"))
- {
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
- }
else
{
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.CLASSED);
+ OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
}
break;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
index 5c3b01f378..c1abdedaa6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
@@ -3,12 +3,11 @@
|
|
- | This week's match is 1 vs 1 Class Individual Match,1 vs 1 All-class Battle. |
+ | Would you like to register for the Grand Olympiad? |
|
| (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
|
- |
- |
+ |
|
|
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
deleted file mode 100644
index 14ed9c0aeb..0000000000
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- |
- | This week's match is 1 vs 1 Class Individual Match. |
- |
- | (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
- |
- |
- |
- |
-
- |
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 2796ef65f9..3cdf5ed18d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -16,9 +16,6 @@
*/
package ai.others.OlyManager;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.temporal.WeekFields;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -101,22 +98,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
else
{
- switch (LocalDate.now().get(WeekFields.of(DayOfWeek.MONDAY, 7).weekOfMonth()))
- {
- case 1:
- case 2:
- case 3: // First 3 weeks of month is 1v1 + 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatch.html");
- break;
- }
- default:// Rest is only 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatchClass.html");
- break;
- }
- }
-
+ htmltext = getHtm(player, "OlyManager-joinMatch.html");
htmltext = htmltext.replace("%olympiad_round%", String.valueOf(Olympiad.getInstance().getPeriod()));
htmltext = htmltext.replace("%olympiad_week%", String.valueOf(Olympiad.getInstance().getCurrentCycle()));
htmltext = htmltext.replace("%olympiad_participant%", String.valueOf(OlympiadManager.getInstance().getCountOpponents()));
@@ -124,7 +106,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
break;
}
case "register1v1":
- case "register1v1class":
{
if (player.isSubClassActive())
{
@@ -142,13 +123,9 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
}
- else if (event.equals("register1v1"))
- {
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
- }
else
{
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.CLASSED);
+ OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
}
break;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
index 5c3b01f378..c1abdedaa6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html
@@ -3,12 +3,11 @@
|
|
- | This week's match is 1 vs 1 Class Individual Match,1 vs 1 All-class Battle. |
+ | Would you like to register for the Grand Olympiad? |
|
| (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
|
- |
- |
+ |
|
|
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
deleted file mode 100644
index 14ed9c0aeb..0000000000
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- |
- | This week's match is 1 vs 1 Class Individual Match. |
- |
- | (Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%) |
- |
- |
- |
- |
-
- |
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 2796ef65f9..3cdf5ed18d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -16,9 +16,6 @@
*/
package ai.others.OlyManager;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.temporal.WeekFields;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -101,22 +98,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
else
{
- switch (LocalDate.now().get(WeekFields.of(DayOfWeek.MONDAY, 7).weekOfMonth()))
- {
- case 1:
- case 2:
- case 3: // First 3 weeks of month is 1v1 + 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatch.html");
- break;
- }
- default:// Rest is only 1v1 class matches
- {
- htmltext = getHtm(player, "OlyManager-joinMatchClass.html");
- break;
- }
- }
-
+ htmltext = getHtm(player, "OlyManager-joinMatch.html");
htmltext = htmltext.replace("%olympiad_round%", String.valueOf(Olympiad.getInstance().getPeriod()));
htmltext = htmltext.replace("%olympiad_week%", String.valueOf(Olympiad.getInstance().getCurrentCycle()));
htmltext = htmltext.replace("%olympiad_participant%", String.valueOf(OlympiadManager.getInstance().getCountOpponents()));
@@ -124,7 +106,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
break;
}
case "register1v1":
- case "register1v1class":
{
if (player.isSubClassActive())
{
@@ -142,13 +123,9 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY);
}
- else if (event.equals("register1v1"))
- {
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
- }
else
{
- OlympiadManager.getInstance().registerNoble(player, CompetitionType.CLASSED);
+ OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
}
break;
}
|