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

Sync with L2JServer Jan 9th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-09 19:55:02 +00:00
parent 9c9b0aaff7
commit 4c2db62a63
618 changed files with 19803 additions and 7853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
trunk/java/com/l2jserver/gameserver/model/entity/Castle.java
View File

@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -33,8 +34,11 @@ import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.CastleData;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.enums.CastleSide;
import com.l2jserver.gameserver.enums.MountType;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.CastleManorManager;
@@ -43,31 +47,40 @@ import com.l2jserver.gameserver.instancemanager.SiegeManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.TowerSpawn;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.holders.CastleSpawnHolder;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.skills.CommonSkill;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.zone.type.L2CastleZone;
import com.l2jserver.gameserver.model.zone.type.L2ResidenceTeleportZone;
import com.l2jserver.gameserver.model.zone.type.L2SiegeZone;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExCastleState;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
public final class Castle extends AbstractResidence
{
protected static final Logger _log = Logger.getLogger(Castle.class.getName());
private final List<L2DoorInstance> _doors = new ArrayList<>();
private final List<L2Npc> _sideNpcs = new ArrayList<>();
private int _ownerId = 0;
private Siege _siege = null;
private Calendar _siegeDate;
private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege
private Calendar _siegeTimeRegistrationEndDate; // last siege end date + 1 day
private int _taxPercent = 0;
private double _taxRate = 0;
private CastleSide _castleSide = null;
private double _taxRate;
private long _treasury = 0;
private boolean _showNpcCrest = false;
private L2SiegeZone _zone = null;
@@ -231,11 +244,9 @@ public final class Castle extends AbstractResidence
{
super(castleId);
load();
/*
* if (getResidenceId() == 7 || castleId == 9) // Goddard and Schuttgart _nbArtifact = 2;
*/
_function = new FastMap<>();
initResidenceZone();
spawnSideNpcs();
if (getOwnerId() != 0)
{
loadFunctions();
@@ -257,15 +268,17 @@ public final class Castle extends AbstractResidence
return null;
}
public synchronized void engrave(L2Clan clan, L2Object target)
public synchronized void engrave(L2Clan clan, L2Object target, CastleSide side)
{
if (!_artefacts.contains(target))
{
return;
}
setSide(side);
setOwner(clan);
final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_HAS_SUCCEEDED_IN_S2);
msg.addString(clan.getName());
msg.addString(getName());
getSiege().announceToPlayer(msg, true);
}
@@ -282,34 +295,42 @@ public final class Castle extends AbstractResidence
return;
}
if (getName().equalsIgnoreCase("Schuttgart") || getName().equalsIgnoreCase("Goddard"))
switch (getName().toLowerCase())
{
Castle rune = CastleManager.getInstance().getCastle("rune");
if (rune != null)
case "schuttgart":
case "goddard":
{
long runeTax = (long) (amount * rune.getTaxRate());
if (rune.getOwnerId() > 0)
final Castle rune = CastleManager.getInstance().getCastle("rune");
if (rune != null)
{
rune.addToTreasury(runeTax);
final long runeTax = (long) (amount * rune.getTaxRate());
if (rune.getOwnerId() > 0)
{
rune.addToTreasury(runeTax);
}
amount -= runeTax;
}
amount -= runeTax;
break;
}
case "dion":
case "giran":
case "gludio":
case "innadril":
case "oren":
{
final Castle aden = CastleManager.getInstance().getCastle("aden");
if (aden != null)
{
final long adenTax = (long) (amount * aden.getTaxRate()); // Find out what Aden gets from the current castle instance's income
if (aden.getOwnerId() > 0)
{
aden.addToTreasury(adenTax); // Only bother to really add the tax to the treasury if not npc owned
}
amount -= adenTax; // Subtract Aden's income from current castle instance's income
}
break;
}
}
if (!getName().equalsIgnoreCase("aden") && !getName().equalsIgnoreCase("Rune") && !getName().equalsIgnoreCase("Schuttgart") && !getName().equalsIgnoreCase("Goddard")) // If current castle instance is not Aden, Rune, Goddard or Schuttgart.
{
Castle aden = CastleManager.getInstance().getCastle("aden");
if (aden != null)
{
long adenTax = (long) (amount * aden.getTaxRate()); // Find out what Aden gets from the current castle instance's income
if (aden.getOwnerId() > 0)
{
aden.addToTreasury(adenTax); // Only bother to really add the tax to the treasury if not npc owned
}
amount -= adenTax; // Subtract Aden's income from current castle instance's income
}
}
addToTreasuryNoTax(amount);
}
@@ -513,6 +534,7 @@ public final class Castle extends AbstractResidence
{
removeResidentialSkills(member);
member.sendSkillList();
member.broadcastUserInfo();
}
}
}
@@ -559,6 +581,7 @@ public final class Castle extends AbstractResidence
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
}
setSide(CastleSide.NEUTRAL);
updateOwnerInDB(null);
if (getSiege().isInProgress())
{
@@ -572,24 +595,6 @@ public final class Castle extends AbstractResidence
_function.clear();
}
public void setTaxPercent(int taxPercent)
{
_taxPercent = taxPercent;
_taxRate = _taxPercent / 100.0;
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE castle SET taxPercent = ? WHERE id = ?"))
{
ps.setInt(1, taxPercent);
ps.setInt(2, getResidenceId());
ps.execute();
}
catch (Exception e)
{
_log.log(Level.WARNING, e.getMessage(), e);
}
}
/**
* Respawn all doors on castle grounds.
*/
@@ -642,7 +647,8 @@ public final class Castle extends AbstractResidence
_siegeTimeRegistrationEndDate.setTimeInMillis(rs.getLong("regTimeEnd"));
_isTimeRegistrationOver = rs.getBoolean("regTimeOver");
_taxPercent = rs.getInt("taxPercent");
_castleSide = Enum.valueOf(CastleSide.class, rs.getString("side"));
_treasury = rs.getLong("treasury");
_showNpcCrest = rs.getBoolean("showNpcCrest");
@@ -650,8 +656,8 @@ public final class Castle extends AbstractResidence
_ticketBuyCount = rs.getInt("ticketBuyCount");
}
}
_taxRate = _taxPercent / 100.0;
setTaxRate(getTaxPercent() / 100);
ps2.setInt(1, getResidenceId());
try (ResultSet rs = ps2.executeQuery())
{
@@ -945,7 +951,25 @@ public final class Castle extends AbstractResidence
public final int getTaxPercent()
{
return _taxPercent;
final int taxPercent;
switch (getSide())
{
case LIGHT:
taxPercent = Config.CASTLE_TAX_LIGHT;
break;
case DARK:
taxPercent = Config.CASTLE_TAX_DARK;
break;
default:
taxPercent = Config.CASTLE_TAX_NEUTRAL;
break;
}
return taxPercent;
}
public void setTaxRate(double taxRate)
{
_taxRate = taxRate;
}
public final double getTaxRate()
@@ -1122,9 +1146,90 @@ public final class Castle extends AbstractResidence
}
}
// TODO: Implement me
public int getState()
@Override
public void giveResidentialSkills(L2PcInstance player)
{
return 1;
super.giveResidentialSkills(player);
final Skill skill = getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill();
player.addSkill(skill);
}
@Override
public void removeResidentialSkills(L2PcInstance player)
{
super.removeResidentialSkills(player);
player.removeSkill(CommonSkill.ABILITY_OF_DARKNESS.getId());
player.removeSkill(CommonSkill.ABILITY_OF_LIGHT.getId());
}
public void spawnSideNpcs()
{
_sideNpcs.stream().filter(Objects::nonNull).forEach(L2Npc::deleteMe);
_sideNpcs.clear();
for (CastleSpawnHolder holder : getSideSpawns())
{
if (holder != null)
{
final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(holder.getNpcId());
if (npcTemplate == null)
{
_log.warning(Castle.class.getSimpleName() + ": Spawn of the nonexisting NPC ID: " + holder.getNpcId());
return;
}
L2Spawn spawn;
try
{
spawn = new L2Spawn(npcTemplate);
}
catch (Exception e)
{
_log.warning(Castle.class.getSimpleName() + ": " + e.getMessage());
return;
}
spawn.setX(holder.getX());
spawn.setY(holder.getY());
spawn.setZ(holder.getZ());
spawn.setHeading(holder.getHeading());
final L2Npc npc = spawn.doSpawn(false);
npc.broadcastInfo();
_sideNpcs.add(npc);
}
}
}
public List<CastleSpawnHolder> getSideSpawns()
{
return CastleData.getInstance().getSpawnsForSide(getResidenceId(), getSide());
}
public void setSide(CastleSide side)
{
if (_castleSide == side)
{
return;
}
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE castle SET side = ? WHERE id = ?"))
{
ps.setString(1, side.toString());
ps.setInt(2, getResidenceId());
ps.execute();
}
catch (Exception e)
{
_log.log(Level.WARNING, e.getMessage(), e);
}
_castleSide = side;
setTaxRate(getTaxPercent() / 100);
Broadcast.toAllOnlinePlayers(new ExCastleState(this));
spawnSideNpcs();
}
public CastleSide getSide()
{
return _castleSide;
}
}

2
trunk/java/com/l2jserver/gameserver/model/entity/FortSiege.java
View File

@@ -35,6 +35,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.enums.FortTeleportWhoType;
import com.l2jserver.gameserver.enums.SiegeClanType;
import com.l2jserver.gameserver.instancemanager.FortManager;
import com.l2jserver.gameserver.instancemanager.FortSiegeGuardManager;
import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
@@ -43,7 +44,6 @@ import com.l2jserver.gameserver.model.FortSiegeSpawn;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2SiegeClan;
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.TeleportWhereType;

10
trunk/java/com/l2jserver/gameserver/model/entity/Message.java
View File

@@ -86,10 +86,14 @@ public class Message
_returned = rset.getBoolean("isReturned");
_itemId = rset.getInt("itemId");
_enchantLvl = rset.getInt("enchantLvl");
final String[] elemDef = rset.getString("elementals").split(";");
for (int i = 0; i < 6; i++)
final String elemental = rset.getString("elementals");
if (elemental != null)
{
_elementals[i] = Integer.parseInt(elemDef[i]);
final String[] elemDef = elemental.split(";");
for (int i = 0; i < 6; i++)
{
_elementals[i] = Integer.parseInt(elemDef[i]);
}
}
}

162
trunk/java/com/l2jserver/gameserver/model/entity/RecoBonus.java
View File

@@ -1,162 +0,0 @@
/*
* Copyright (C) 2004-2015 L2J Server
*
* This file is part of L2J Server.
*
* L2J Server is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J Server is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.model.entity;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author Gnacik
*/
public final class RecoBonus
{
private static final int[][] _recoBonus =
{
{
25,
50,
50,
50,
50,
50,
50,
50,
50,
50
},
{
16,
33,
50,
50,
50,
50,
50,
50,
50,
50
},
{
12,
25,
37,
50,
50,
50,
50,
50,
50,
50
},
{
10,
20,
30,
40,
50,
50,
50,
50,
50,
50
},
{
8,
16,
25,
33,
41,
50,
50,
50,
50,
50
},
{
7,
14,
21,
28,
35,
42,
50,
50,
50,
50
},
{
6,
12,
18,
25,
31,
37,
43,
50,
50,
50
},
{
5,
11,
16,
22,
27,
33,
38,
44,
50,
50
},
{
5,
10,
15,
20,
25,
30,
35,
40,
45,
50
}
};
public static int getRecoBonus(L2PcInstance activeChar)
{
if ((activeChar != null) && activeChar.isOnline() && (activeChar.getRecomHave() != 0))
{
final int lvl = activeChar.getLevel() / 10;
final int exp = (Math.min(100, activeChar.getRecomHave()) - 1) / 10;
return _recoBonus[lvl][exp];
}
return 0;
}
public static double getRecoMultiplier(L2PcInstance activeChar)
{
double multiplier = 1.0;
final double bonus = getRecoBonus(activeChar);
if (bonus > 0)
{
multiplier += (bonus / 100);
}
return multiplier;
}
}

12
trunk/java/com/l2jserver/gameserver/model/entity/Siege.java
View File

@@ -38,6 +38,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.datatables.SiegeScheduleData;
import com.l2jserver.gameserver.enums.SiegeClanType;
import com.l2jserver.gameserver.enums.SiegeTeleportWhoType;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.MercTicketManager;
@@ -47,7 +48,6 @@ import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2ClanMember;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2SiegeClan;
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.SiegeScheduleDate;
@@ -299,6 +299,11 @@ public class Siege implements Siegable
continue;
}
for (L2PcInstance member : clan.getOnlineMembers(0))
{
member.checkItemRestriction();
}
clan.clearSiegeKills();
clan.clearSiegeDeaths();
}
@@ -311,6 +316,11 @@ public class Siege implements Siegable
continue;
}
for (L2PcInstance member : clan.getOnlineMembers(0))
{
member.checkItemRestriction();
}
clan.clearSiegeKills();
clan.clearSiegeDeaths();
}

2
trunk/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
View File

@@ -35,11 +35,11 @@ import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.enums.SiegeClanType;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2SiegeClan;
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.Location;

2
trunk/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java
View File

@@ -24,9 +24,9 @@ import java.util.Calendar;
import java.util.logging.Level;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.enums.SiegeClanType;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2SiegeClan;
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;