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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java vendored
View File

@@ -84,9 +84,7 @@ final class DevastatedCastle extends ClanHallSiegeEngine
final int id = clan.getId();
if (_damageToGustav.containsKey(id))
{
int newDamage = _damageToGustav.get(id);
newDamage += damage;
_damageToGustav.put(id, newDamage);
_damageToGustav.put(id, (_damageToGustav.get(id) + damage));
}
else
{

3
trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java vendored
View File

@@ -117,8 +117,7 @@ final class FortressOfResistance extends ClanHallSiegeEngine
final int clanId = player.getClanId();
if (clanId > 0)
{
final long clanDmg = (_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage;
_damageToNurka.put(clanId, clanDmg);
_damageToNurka.put(clanId, ((_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage));
}
return null;
}

7
trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@@ -91,9 +91,7 @@ final class FortressOfTheDead extends ClanHallSiegeEngine
final int id = clan.getId();
if ((id > 0) && _damageToLidia.containsKey(id))
{
int newDamage = _damageToLidia.get(id);
newDamage += damage;
_damageToLidia.put(id, newDamage);
_damageToLidia.put(id, (_damageToLidia.get(id) + damage));
}
else
{
@@ -158,8 +156,7 @@ final class FortressOfTheDead extends ClanHallSiegeEngine
if ((hoursLeft < 0) || (hoursLeft > 6))
{
cancelSiegeTask();
final long scheduleTime = (24 - hoursLeft) * 10 * 60000;
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), scheduleTime);
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), ((24 - hoursLeft) * 10 * 60000));
}
else
{

160
trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -22,7 +22,6 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -75,57 +74,59 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
int spotLeft = 4;
if (_rainbow.getOwnerId() > 0)
if (_rainbow.getOwnerId() <= 0)
{
final L2Clan owner = ClanTable.getInstance().getClan(_rainbow.getOwnerId());
if (owner != null)
return;
}
final L2Clan owner = ClanTable.getInstance().getClan(_rainbow.getOwnerId());
if (owner != null)
{
_rainbow.free();
owner.setHideoutId(0);
_acceptedClans.add(owner);
--spotLeft;
}
for (int i = 0; i < spotLeft; i++)
{
long counter = 0;
L2Clan clan = null;
for (int clanId : _warDecreesCount.keySet())
{
_rainbow.free();
owner.setHideoutId(0);
_acceptedClans.add(owner);
--spotLeft;
}
for (int i = 0; i < spotLeft; i++)
{
long counter = 0;
L2Clan clan = null;
for (int clanId : _warDecreesCount.keySet())
final L2Clan actingClan = ClanTable.getInstance().getClan(clanId);
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
{
final L2Clan actingClan = ClanTable.getInstance().getClan(clanId);
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
{
_warDecreesCount.remove(clanId);
continue;
}
final long count = _warDecreesCount.get(clanId);
if (count > counter)
{
counter = count;
clan = actingClan;
}
_warDecreesCount.remove(clanId);
continue;
}
if ((clan != null) && (_acceptedClans.size() < 4))
final long count = _warDecreesCount.get(clanId);
if (count > counter)
{
_acceptedClans.add(clan);
final L2PcInstance leader = clan.getLeader().getPlayerInstance();
if (leader != null)
{
leader.sendMessage("Your clan has been accepted to join the RainBow Srpings Chateau siege!");
}
counter = count;
clan = actingClan;
}
}
if (_acceptedClans.size() >= 2)
if ((clan != null) && (_acceptedClans.size() < 4))
{
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStart(), 3600000);
_rainbow.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
}
else
{
Broadcast.toAllOnlinePlayers("Rainbow Springs Chateau siege aborted due lack of population");
_acceptedClans.add(clan);
final L2PcInstance leader = clan.getLeader().getPlayerInstance();
if (leader != null)
{
leader.sendMessage("Your clan has been accepted to join the RainBow Srpings Chateau siege!");
}
}
}
if (_acceptedClans.size() >= 2)
{
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStart(), 3600000);
_rainbow.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
}
else
{
Broadcast.toAllOnlinePlayers("Rainbow Springs Chateau siege aborted due lack of population");
}
}
}
@@ -194,8 +195,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
{
for (int arenaId : ARENA_ZONES)
{
final Collection<L2Character> chars = ZoneManager.getInstance().getZoneById(arenaId).getCharactersInside();
for (L2Character chr : chars)
for (L2Character chr : ZoneManager.getInstance().getZoneById(arenaId).getCharactersInside())
{
if (chr != null)
{
@@ -285,18 +285,20 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
loadAttackers();
_rainbow = CHSiegeManager.getInstance().getSiegableHall(RAINBOW_SPRINGS);
if (_rainbow != null)
if (_rainbow == null)
{
final long delay = _rainbow.getNextSiegeTime();
if (delay > -1)
{
setRegistrationEndString(delay - 3600000);
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), delay);
}
else
{
_log.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!");
}
return;
}
final long delay = _rainbow.getNextSiegeTime();
if (delay > -1)
{
setRegistrationEndString(delay - 3600000);
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), delay);
}
else
{
_log.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!");
}
}
@@ -317,35 +319,20 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
else if (npcId == CARETAKER)
{
if (_rainbow.isInSiege())
html = _rainbow.isInSiege() ? "game_manager003.htm" : "game_manager001.htm";
}
else if (Util.contains(YETIS, npcId) && _rainbow.isInSiege())
{
if (!player.isClanLeader())
{
html = "game_manager003.htm";
html = "no_clan_leader.htm";
}
else
{
html = "game_manager001.htm";
}
}
else if (Util.contains(YETIS, npcId))
{
// TODO: Review.
if (_rainbow.isInSiege())
{
if (!player.isClanLeader())
final L2Clan clan = player.getClan();
if (_acceptedClans.contains(clan) && (npcId == YETIS[_acceptedClans.indexOf(clan)]))
{
html = "no_clan_leader.htm";
}
else
{
final L2Clan clan = player.getClan();
if (_acceptedClans.contains(clan))
{
final int index = _acceptedClans.indexOf(clan);
if (npcId == YETIS[index])
{
html = "yeti_main.htm";
}
}
html = "yeti_main.htm";
}
}
}
@@ -769,8 +756,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static void reduceGourdHp(int index, L2PcInstance player)
{
final L2Spawn gourd = _gourds[index];
gourd.getLastSpawn().reduceCurrentHp(1000, player, null);
_gourds[index].getLastSpawn().reduceCurrentHp(1000, player, null);
}
private static void increaseGourdHp(int index)
@@ -789,8 +775,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
continue;
}
final Collection<L2Character> chars = ZoneManager.getInstance().getZoneById(id).getCharactersInside();
for (L2Character chr : chars)
for (L2Character chr : ZoneManager.getInstance().getZoneById(id).getCharactersInside())
{
if (chr != null)
{
@@ -813,17 +798,14 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
final int randomPos = getRandom(length);
final String message = _textPassages[randomPos];
if (_usedTextPassages.containsKey(message))
if (_usedTextPassages.containsKey(_textPassages[randomPos]))
{
shoutRandomText(npc);
}
else
{
_usedTextPassages.put(message, new ArrayList<L2Clan>());
final NpcSay say = new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), message);
npc.broadcastPacket(say);
_usedTextPassages.put(_textPassages[randomPos], new ArrayList<L2Clan>());
npc.broadcastPacket((new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), _textPassages[randomPos])));
}
}