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

Removed olympiad class matches.

Browse Source 
Contributed by Iris.
This commit is contained in:
MobiusDev
2018-12-02 03:30:01 +00:00
parent 727fcee34b
commit 36df151387
12 changed files with 16 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatch.html vendored
View File

@@ -3,12 +3,11 @@
<tr><td valign="top" align="center">
<table border=0 cellpadding=0 cellspacing=0>
<tr><td height=50></td></tr>
<tr><td align=center>This week's match is 1 vs 1 Class Individual Match,<br1>1 vs 1 All-class Battle.</td></tr>
<tr><td align=center>Would you like to register for the Grand Olympiad?</td></tr>
<tr><td height=15></td></tr>
<tr><td align=center><font color="bea27b">(Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%)</font></td></tr>
<tr><td height=34></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager register1v1class" msg="1482" value="1 vs. 1 Class Individual Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Apply_Down" fore="L2UI_CT1.OlympiadWnd_DF_Apply"></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager register1v1" msg="1481" value="1 vs. 1 Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight1None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight1None"></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager register1v1" msg="1481" value="1 vs. 1 Open Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight1None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight1None"></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager index" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
<tr><td height=30></td></tr>
</table>

16
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager-joinMatchClass.html vendored
View File

@@ -1,16 +0,0 @@
<html><body scroll="no">
<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
<tr><td valign="top" align="center">
<table border=0 cellpadding=0 cellspacing=0>
<tr><td height=50></td></tr>
<tr><td align=center>This week's match is 1 vs 1 Class Individual Match.</td></tr>
<tr><td height=15></td></tr>
<tr><td align=center><font color="bea27b">(Round %olympiad_round%, Week %olympiad_week%, Number of current participants: %olympiad_participant%)</font></td></tr>
<tr><td height=34></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager register1v1class" msg="1481" value="1 vs 1 Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight1None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight1None"></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager index" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
<tr><td height=80></td></tr>
</table>
</td></tr>
</table>
</body></html>

27
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -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;
}