Index: java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java
===================================================================
--- java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java (revision 6125)
+++ java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java (working copy)
@@ -34,6 +34,8 @@
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMatchResult;
import com.l2jserver.gameserver.network.serverpackets.ExOlympiadUserInfo;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
@@ -48,8 +50,8 @@
protected int _damageP1 = 0;
protected int _damageP2 = 0;
- protected Participant _playerOne;
- protected Participant _playerTwo;
+ protected static Participant _playerOne;
+ protected static Participant _playerTwo;
protected OlympiadGameNormal(int id, Participant[] opponents)
{
@@ -132,6 +134,21 @@
}
}
+ public static void showClassOlympiad()
+ {
+ if (Config.ALT_ANUN_CLASS)
+ {
+
+ CreatureSay cs = new CreatureSay(0, Say2.PARTYROOM_COMMANDER, "[Clase Oponente]", _playerTwo.getPlayer().getTemplate().getClassId().name());
+ _playerOne.getPlayer().sendPacket(cs);
+
+ cs = new CreatureSay(0, Say2.PARTYROOM_COMMANDER, "[Clase Oponente]", _playerOne.getPlayer().getTemplate().getClassId().name());
+ _playerTwo.getPlayer().sendPacket(cs);
+
+ }
+ /**/
+ }
+
@Override
protected final boolean portPlayersToArena(List<Location> spawns)
{
@@ -140,6 +157,8 @@
{
result &= portPlayerToArena(_playerOne, spawns.get(0), _stadiumID);
result &= portPlayerToArena(_playerTwo, spawns.get(spawns.size() / 2), _stadiumID);
+ showClassOlympiad();
+
}
catch (Exception e)
{
Index: java/com/l2jserver/Config.java
===================================================================
--- java/com/l2jserver/Config.java (revision 6125)
+++ java/com/l2jserver/Config.java (working copy)
@@ -574,6 +611,8 @@
public static int ALT_OLY_NONCLASSED;
public static int ALT_OLY_TEAMS;
public static int ALT_OLY_REG_DISPLAY;
+ /* OLYMPIAD SEMANA */public static int ALT_OLY_MES;
+ /* Anunciar Clase Oponente */public static boolean ALT_ANUN_CLASS;
@@ -2863,6 +3352,8 @@
ALT_OLY_MAX_WEEKLY_MATCHES_CLASSED = Integer.parseInt(Olympiad.getProperty("AltOlyMaxWeeklyMatchesClassed", "30"));
ALT_OLY_MAX_WEEKLY_MATCHES_TEAM = Integer.parseInt(Olympiad.getProperty("AltOlyMaxWeeklyMatchesTeam", "10"));
ALT_OLY_LOG_FIGHTS = Boolean.parseBoolean(Olympiad.getProperty("AltOlyLogFights", "false"));
+ ALT_ANUN_CLASS = Boolean.parseBoolean(Olympiad.getProperty("AltOlyShowClassOponent", "false"));
ALT_OLY_SHOW_MONTHLY_WINNERS = Boolean.parseBoolean(Olympiad.getProperty("AltOlyShowMonthlyWinners", "true"));
ALT_OLY_ANNOUNCE_GAMES = Boolean.parseBoolean(Olympiad.getProperty("AltOlyAnnounceGames", "true"));
String[] olyRestrictedItems = Olympiad.getProperty("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(",");
Index: dist/game/config/Olympiad.properties
===================================================================
--- dist/game/config/Olympiad.properties (revision 6125)
+++ dist/game/config/Olympiad.properties (working copy)
@@ -159,4 +159,15 @@
+#Anuncia la Clase del Oponente
+#Default False
+AltOlyShowClassOponent = False
Index: java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java
===================================================================
--- java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java (revision 6125)
+++ java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java (working copy)
@@ -220,6 +220,11 @@
_zone.broadcastPacket(sm);
}
+ if (_countDown == 30)
+ {
+ OlympiadGameNormal.showClassOlympiad();
+ }
+
delay = getDelay(BATTLE_START_TIME_FIRST);
if (_countDown <= 0)
{