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

Updated AgitDecoInfo packet.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-11 12:24:11 +00:00
parent f632005ccd
commit 3617418be1
98 changed files with 4035 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManager.java
View File

@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.skill.SkillType;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.BuyList;
import org.l2jmobius.gameserver.network.serverpackets.ClanHallDecoration;
import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo;
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
@@ -169,7 +169,7 @@ public class ClanHallManager extends Folk
}
else
{
html.setFile("data/html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm");
html.setFile("data/html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLevel() + ".htm");
}
sendHtmlMessage(player, html);
}
@@ -186,7 +186,7 @@ public class ClanHallManager extends Folk
{
return;
}
final int valbuy = Integer.parseInt(st.nextToken()) + (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() * 100000);
final int valbuy = Integer.parseInt(st.nextToken()) + (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLevel() * 100000);
showBuyWindow(player, valbuy);
}
else if (val.equalsIgnoreCase("support"))
@@ -198,7 +198,7 @@ public class ClanHallManager extends Folk
}
else
{
html.setFile("data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile("data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLevel() + ".htm");
html.replace("%mp%", String.valueOf(getCurrentMp()));
}
sendHtmlMessage(player, html);
@@ -213,7 +213,7 @@ public class ClanHallManager extends Folk
html.setFile("data/html/clanHallManager/functions.htm");
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
{
html.replace("%xp_regen%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "%");
html.replace("%xp_regen%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLevel() + "%");
}
else
{
@@ -221,7 +221,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_regen%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "%");
html.replace("%hp_regen%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLevel() + "%");
}
else
{
@@ -229,7 +229,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
{
html.replace("%mp_regen%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "%");
html.replace("%mp_regen%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLevel() + "%");
}
else
{
@@ -457,7 +457,7 @@ public class ClanHallManager extends Folk
html.setFile("data/html/clanHallManager/edit_recovery" + getClanHall().getGrade() + ".htm");
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
{
html.replace("%hp%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "%");
html.replace("%hp%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLevel() + "%");
html.replace("%hpPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()));
html.replace("%hpDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime()));
html.replace("%hpRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getRate() / 86400000));
@@ -471,7 +471,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
{
html.replace("%exp%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "%");
html.replace("%exp%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLevel() + "%");
html.replace("%expPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()));
html.replace("%expDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime()));
html.replace("%expRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getRate() / 86400000));
@@ -485,7 +485,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
{
html.replace("%mp%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "%");
html.replace("%mp%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLevel() + "%");
html.replace("%mpPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()));
html.replace("%mpDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime()));
html.replace("%mpRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getRate() / 86400000));
@@ -659,7 +659,7 @@ public class ClanHallManager extends Folk
html.setFile("data/html/clanHallManager/edit_other" + getClanHall().getGrade() + ".htm");
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
{
html.replace("%tele%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()));
html.replace("%tele%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLevel()));
html.replace("%telePrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()));
html.replace("%teleDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime()));
html.replace("%teleRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getRate() / 86400000));
@@ -673,7 +673,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
{
html.replace("%support%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()));
html.replace("%support%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLevel()));
html.replace("%supportPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()));
html.replace("%supportDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime()));
html.replace("%supportRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getRate() / 86400000));
@@ -687,7 +687,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
{
html.replace("%item%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()));
html.replace("%item%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLevel()));
html.replace("%itemPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()));
html.replace("%itemDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime()));
html.replace("%itemRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getRate() / 86400000));
@@ -786,7 +786,7 @@ public class ClanHallManager extends Folk
html.setFile("data/html/clanHallManager/deco.htm");
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
{
html.replace("%curtain%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()));
html.replace("%curtain%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLevel()));
html.replace("%curtainPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()));
html.replace("%curtainDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime()));
html.replace("%curtainRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getRate() / 86400000));
@@ -800,7 +800,7 @@ public class ClanHallManager extends Folk
}
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
{
html.replace("%porch%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl()));
html.replace("%porch%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLevel()));
html.replace("%porchPrice%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease()));
html.replace("%porchDate%", format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime()));
html.replace("%porchRate%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getRate() / 86400000));
@@ -868,11 +868,11 @@ public class ClanHallManager extends Folk
return;
}
final NpcHtmlMessage html = new NpcHtmlMessage(1);
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == 0)
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLevel() == 0)
{
return;
}
html.setFile("data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + ".htm");
html.setFile("data/html/clanHallManager/support" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLevel() + ".htm");
html.replace("%mp%", String.valueOf(getCurrentMp()));
sendHtmlMessage(player, html);
}
@@ -1106,6 +1106,6 @@ public class ClanHallManager extends Folk
*/
private void revalidateDeco(Player player)
{
player.sendPacket(new ClanHallDecoration(ClanHallTable.getInstance().getClanHallByOwner(player.getClan())));
player.sendPacket(new AgitDecoInfo(ClanHallTable.getInstance().getClanHallByOwner(player.getClan())));
}
}

36
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java
View File

@@ -73,7 +73,7 @@ public class ClanHall
public class ClanHallFunction
{
final int _type;
private int _lvl;
private int _level;
protected int _fee;
protected int _tempFee;
final long _rate;
@@ -92,7 +92,7 @@ public class ClanHall
public ClanHallFunction(int type, int lvl, int lease, int tempLease, long rate, long time)
{
_type = type;
_lvl = lvl;
_level = lvl;
_fee = lease;
_tempFee = tempLease;
_rate = rate;
@@ -110,12 +110,12 @@ public class ClanHall
}
/**
* Gets the lvl.
* @return the lvl
* Gets the level.
* @return the level
*/
public int getLvl()
public int getLevel()
{
return _lvl;
return _level;
}
/**
@@ -146,12 +146,12 @@ public class ClanHall
}
/**
* Sets the lvl.
* @param lvl the new lvl
* Sets the level.
* @param level the new level
*/
public void setLvl(int lvl)
public void setLevel(int level)
{
_lvl = lvl;
_level = level;
}
/**
@@ -256,7 +256,7 @@ public class ClanHall
statement = con.prepareStatement("INSERT INTO clanhall_functions (hall_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)");
statement.setInt(1, _clanHallId);
statement.setInt(2, _type);
statement.setInt(3, _lvl);
statement.setInt(3, _level);
statement.setInt(4, _fee);
statement.setLong(5, _rate);
statement.setLong(6, _endDate);
@@ -264,7 +264,7 @@ public class ClanHall
else
{
statement = con.prepareStatement("UPDATE clanhall_functions SET lvl=?, lease=?, endTime=? WHERE hall_id=? AND type=?");
statement.setInt(1, _lvl);
statement.setInt(1, _level);
statement.setInt(2, _fee);
statement.setLong(3, _endDate);
statement.setInt(4, _clanHallId);
@@ -676,13 +676,13 @@ public class ClanHall
/**
* Update Function.
* @param type the type
* @param lvl the lvl
* @param level the level
* @param lease the lease
* @param rate the rate
* @param addNew the add new
* @return true, if successful
*/
public boolean updateFunctions(int type, int lvl, int lease, long rate, boolean addNew)
public boolean updateFunctions(int type, int level, int lease, long rate, boolean addNew)
{
if (addNew)
{
@@ -690,9 +690,9 @@ public class ClanHall
{
return false;
}
_functions.put(type, new ClanHallFunction(type, lvl, lease, 0, rate, 0));
_functions.put(type, new ClanHallFunction(type, level, lease, 0, rate, 0));
}
else if ((lvl == 0) && (lease == 0))
else if ((level == 0) && (lease == 0))
{
removeFunction(type);
}
@@ -707,12 +707,12 @@ public class ClanHall
}
_functions.remove(type);
_functions.put(type, new ClanHallFunction(type, lvl, lease, diffLease, rate, -1));
_functions.put(type, new ClanHallFunction(type, level, lease, diffLease, rate, -1));
}
else
{
_functions.get(type).setLease(lease);
_functions.get(type).setLvl(lvl);
_functions.get(type).setLevel(level);
_functions.get(type).dbSave(false);
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java
View File

@@ -1008,7 +1008,7 @@ public class Formulas
final ClanHall clansHall = ClanHallTable.getInstance().getClanHallById(clanHallIndex);
if ((clansHall != null) && (clansHall.getFunction(ClanHall.FUNC_RESTORE_HP) != null))
{
hpRegenMultiplier *= 1 + (clansHall.getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() / 100);
hpRegenMultiplier *= 1 + (clansHall.getFunction(ClanHall.FUNC_RESTORE_HP).getLevel() / 100);
}
}
}
@@ -1082,7 +1082,7 @@ public class Formulas
final ClanHall clansHall = ClanHallTable.getInstance().getClanHallById(clanHallIndex);
if ((clansHall != null) && (clansHall.getFunction(ClanHall.FUNC_RESTORE_MP) != null))
{
mpRegenMultiplier *= 1 + (clansHall.getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() / 100);
mpRegenMultiplier *= 1 + (clansHall.getFunction(ClanHall.FUNC_RESTORE_MP).getLevel() / 100);
}
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java
View File

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.residences.ClanHall;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.ZoneRespawn;
import org.l2jmobius.gameserver.network.serverpackets.ClanHallDecoration;
import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo;
/**
* A clan hall zone
@@ -77,7 +77,7 @@ public class ClanHallZone extends ZoneRespawn
}
// Send decoration packet
((Player) creature).sendPacket(new ClanHallDecoration(clanHall));
((Player) creature).sendPacket(new AgitDecoInfo(clanHall));
// Send a message
if ((clanHall.getOwnerId() != 0) && (clanHall.getOwnerId() == ((Player) creature).getClanId()))

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/OutgoingPackets.java
View File

@@ -207,7 +207,7 @@ public enum OutgoingPackets
ETC_STATUS_UPDATE(0xF3),
SHORT_BUFF_STATUS_UPDATE(0xF4),
SSQ_STATUS(0xF5),
CLAN_HALL_DECORATION(0xF7),
AGIT_DECO_INFO(0xF7),
SIGNS_SKY(0xF8),
GAME_GUARD_QUERY(0xF9),
FRIEND_LIST(0xFA),

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
View File

@@ -153,7 +153,7 @@ public class RequestRestartPoint implements IClientIncomingPacket
loc = MapRegionData.getInstance().getTeleToLocation(_player, TeleportWhereType.CLANHALL);
if ((ClanHallTable.getInstance().getClanHallByOwner(_player.getClan()) != null) && (ClanHallTable.getInstance().getClanHallByOwner(_player.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP) != null))
{
_player.restoreExp(ClanHallTable.getInstance().getClanHallByOwner(_player.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl());
_player.restoreExp(ClanHallTable.getInstance().getClanHallByOwner(_player.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP).getLevel());
}
break;
}

65
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
View File

@@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @author Steuf
*/
public class ClanHallDecoration implements IClientOutgoingPacket
public class AgitDecoInfo implements IClientOutgoingPacket
{
private final ClanHall _clanHall;
public ClanHallDecoration(ClanHall clanHall)
public AgitDecoInfo(ClanHall clanHall)
{
_clanHall = clanHall;
}
@@ -36,15 +36,15 @@ public class ClanHallDecoration implements IClientOutgoingPacket
@Override
public boolean write(PacketWriter packet)
{
OutgoingPackets.CLAN_HALL_DECORATION.writeId(packet);
packet.writeD(_clanHall.getId()); // clanhall id
// FUNC_RESTORE_HP
OutgoingPackets.AGIT_DECO_INFO.writeId(packet);
packet.writeD(_clanHall.getId());
// Fireplace
ClanHallFunction function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_HP);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 220)) || ((_clanHall.getGrade() == 1) && (function.getLvl() < 160)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 260)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 300)))
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 220)) || ((_clanHall.getGrade() == 1) && (function.getLevel() < 160)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 260)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 300)))
{
packet.writeC(1);
}
@@ -52,14 +52,14 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
// FUNC_RESTORE_MP
// Carpet - Statue
function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_MP);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
packet.writeC(0);
}
else if ((((_clanHall.getGrade() == 0) || (_clanHall.getGrade() == 1)) && (function.getLvl() < 25)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 30)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 40)))
else if ((((_clanHall.getGrade() == 0) || (_clanHall.getGrade() == 1)) && (function.getLevel() < 25)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 30)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 40)))
{
packet.writeC(1);
packet.writeC(1);
@@ -69,13 +69,13 @@ public class ClanHallDecoration implements IClientOutgoingPacket
packet.writeC(2);
packet.writeC(2);
}
// FUNC_RESTORE_EXP
// Chandelier
function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_EXP);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 25)) || ((_clanHall.getGrade() == 1) && (function.getLvl() < 30)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 40)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 50)))
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 25)) || ((_clanHall.getGrade() == 1) && (function.getLevel() < 30)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 40)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 50)))
{
packet.writeC(1);
}
@@ -83,13 +83,13 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
// FUNC_TELEPORT
// Mirror
function = _clanHall.getFunction(ClanHall.FUNC_TELEPORT);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (function.getLvl() < 2)
else if (function.getLevel() < 2)
{
packet.writeC(1);
}
@@ -97,14 +97,15 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
// Crystal
packet.writeC(0);
// CURTAINS
// Curtain
function = _clanHall.getFunction(ClanHall.FUNC_DECO_CURTAINS);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (function.getLvl() <= 1)
else if (function.getLevel() <= 1)
{
packet.writeC(1);
}
@@ -112,13 +113,13 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
// FUNC_ITEM_CREATE
// Magic Curtain
function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 2)) || (function.getLvl() < 3))
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 2)) || (function.getLevel() < 3))
{
packet.writeC(1);
}
@@ -126,14 +127,14 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
// FUNC_SUPPORT
// Support? - Flag
function = _clanHall.getFunction(ClanHall.FUNC_SUPPORT);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
packet.writeC(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 2)) || ((_clanHall.getGrade() == 1) && (function.getLvl() < 4)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 5)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 8)))
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 2)) || ((_clanHall.getGrade() == 1) && (function.getLevel() < 4)) || ((_clanHall.getGrade() == 2) && (function.getLevel() < 5)) || ((_clanHall.getGrade() == 3) && (function.getLevel() < 8)))
{
packet.writeC(1);
packet.writeC(1);
@@ -143,13 +144,13 @@ public class ClanHallDecoration implements IClientOutgoingPacket
packet.writeC(2);
packet.writeC(2);
}
// Front Plateform
// Front platform
function = _clanHall.getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (function.getLvl() <= 1)
else if (function.getLevel() <= 1)
{
packet.writeC(1);
}
@@ -157,13 +158,13 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
// FUNC_ITEM_CREATE
// Item create?
function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
if ((function == null) || (function.getLvl() == 0))
if ((function == null) || (function.getLevel() == 0))
{
packet.writeC(0);
}
else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 2)) || (function.getLvl() < 3))
else if (((_clanHall.getGrade() == 0) && (function.getLevel() < 2)) || (function.getLevel() < 3))
{
packet.writeC(1);
}
@@ -171,8 +172,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket
{
packet.writeC(2);
}
packet.writeD(0);
packet.writeD(0);
return true;
}
}