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

Several braces code format.

Browse Source
This commit is contained in:
MobiusDev
2017-09-08 17:33:31 +00:00
parent f0043b3271
commit edb23d3285
618 changed files with 10828 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -205,20 +205,30 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (func)
{
case Castle.FUNC_RESTORE_EXP:
{
fee = (level == 45) ? Config.CS_EXPREG1_FEE : Config.CS_EXPREG2_FEE;
break;
}
case Castle.FUNC_RESTORE_HP:
{
fee = (level == 300) ? Config.CS_HPREG1_FEE : Config.CS_HPREG2_FEE;
break;
}
case Castle.FUNC_RESTORE_MP:
{
fee = (level == 40) ? Config.CS_MPREG1_FEE : Config.CS_MPREG2_FEE;
break;
}
case Castle.FUNC_SUPPORT:
{
fee = (level == 5) ? Config.CS_SUPPORT1_FEE : Config.CS_SUPPORT2_FEE;
break;
}
case Castle.FUNC_TELEPORT:
{
fee = (level == 1) ? Config.CS_TELE1_FEE : Config.CS_TELE2_FEE;
break;
}
}
return fee;
}
@@ -229,20 +239,30 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (func)
{
case Castle.FUNC_RESTORE_EXP:
{
ratio = Config.CS_EXPREG_FEE_RATIO;
break;
}
case Castle.FUNC_RESTORE_HP:
{
ratio = Config.CS_HPREG_FEE_RATIO;
break;
}
case Castle.FUNC_RESTORE_MP:
{
ratio = Config.CS_MPREG_FEE_RATIO;
break;
}
case Castle.FUNC_SUPPORT:
{
ratio = Config.CS_SUPPORT_FEE_RATIO;
break;
}
case Castle.FUNC_TELEPORT:
{
ratio = Config.CS_TELE_FEE_RATIO;
break;
}
}
return ratio;
}
@@ -257,14 +277,20 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (level)
{
case 2:
{
price = Config.OUTER_DOOR_UPGRADE_PRICE2;
break;
}
case 3:
{
price = Config.OUTER_DOOR_UPGRADE_PRICE3;
break;
}
case 5:
{
price = Config.OUTER_DOOR_UPGRADE_PRICE5;
break;
}
}
break;
}
@@ -273,14 +299,20 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (level)
{
case 2:
{
price = Config.INNER_DOOR_UPGRADE_PRICE2;
break;
}
case 3:
{
price = Config.INNER_DOOR_UPGRADE_PRICE3;
break;
}
case 5:
{
price = Config.INNER_DOOR_UPGRADE_PRICE5;
break;
}
}
break;
}
@@ -289,14 +321,20 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (level)
{
case 2:
{
price = Config.WALL_UPGRADE_PRICE2;
break;
}
case 3:
{
price = Config.WALL_UPGRADE_PRICE3;
break;
}
case 5:
{
price = Config.WALL_UPGRADE_PRICE5;
break;
}
}
break;
}
@@ -310,17 +348,25 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (level)
{
case 1:
{
price = Config.TRAP_UPGRADE_PRICE1;
break;
}
case 2:
{
price = Config.TRAP_UPGRADE_PRICE2;
break;
}
case 3:
{
price = Config.TRAP_UPGRADE_PRICE3;
break;
}
case 4:
{
price = Config.TRAP_UPGRADE_PRICE4;
break;
}
}
return price;
}
@@ -379,14 +425,20 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (fortress.getFortState())
{
case 1:
{
fortStatus = "1300122";
break;
}
case 2:
{
fortStatus = "1300124";
break;
}
default:
{
fortStatus = "1300123";
break;
}
}
sb.append("<fstring>1300" + fortId + "</fstring>");
sb.append(" (<fstring>" + fortType + "</fstring>)");
@@ -1144,15 +1196,22 @@ public final class CastleChamberlain extends AbstractNpcAI
switch (evt.getRequest())
{
case 3: // Seed info
{
player.sendPacket(new ExShowSeedInfo(castleId, evt.isNextPeriod(), true));
break;
}
case 4: // Crop info
{
player.sendPacket(new ExShowCropInfo(castleId, evt.isNextPeriod(), true));
break;
}
case 5: // Basic info
{
player.sendPacket(new ExShowManorDefaultInfo(true));
break;
}
case 7: // Seed settings
{
if (manor.isManorApproved())
{
player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM);
@@ -1160,7 +1219,9 @@ public final class CastleChamberlain extends AbstractNpcAI
}
player.sendPacket(new ExShowSeedSetting(castleId));
break;
}
case 8: // Crop settings
{
if (manor.isManorApproved())
{
player.sendPacket(SystemMessageId.A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM);
@@ -1168,8 +1229,11 @@ public final class CastleChamberlain extends AbstractNpcAI
}
player.sendPacket(new ExShowCropSetting(castleId));
break;
}
default:
{
_log.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!");
}
}
}
}

19
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java vendored
View File

@@ -103,25 +103,35 @@ public final class CastleTeleporter extends AbstractNpcAI
final int unknowInt = Integer.parseInt(st.nextToken());
final StatsSet npcParams = npc.getParameters();
Location teleLoc = null;
switch (unknowInt)
{
case 0:
{
teleLoc = getTeleportLocation(npcParams, "01", "02", "03");
break;
}
case 1:
{
teleLoc = getTeleportLocation(npcParams, "11", "12", "13");
break;
}
case 2:
{
teleLoc = getTeleportLocation(npcParams, "21", "22", "23");
break;
}
case 3:
{
teleLoc = getTeleportLocation(npcParams, "31", "32", "33");
break;
}
case 4:
{
teleLoc = getTeleportLocation(npcParams, "41", "42", "43");
break;
}
case 5:
{
if (isOwner(player, npc))
{
teleLoc = new Location(npcParams.getInt("pos_x51"), npcParams.getInt("pos_y51"), npcParams.getInt("pos_z51"));
@@ -131,6 +141,7 @@ public final class CastleTeleporter extends AbstractNpcAI
return "CastleTeleporter-noAuthority.html";
}
break;
}
}
if (teleLoc != null)
@@ -209,7 +220,9 @@ public final class CastleTeleporter extends AbstractNpcAI
case 35308:
case 35352:
case 35544:
{
return "CastleTeleporter-01";
}
case 35093:
case 35135:
case 35177:
@@ -217,7 +230,9 @@ public final class CastleTeleporter extends AbstractNpcAI
case 35309:
case 35353:
case 35545:
{
return "CastleTeleporter-02";
}
case 35094:
case 35136:
case 35178:
@@ -225,7 +240,9 @@ public final class CastleTeleporter extends AbstractNpcAI
case 35310:
case 35354:
case 35546:
{
return "CastleTeleporter-03";
}
}
return String.valueOf(npc.getId());
}

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java vendored
View File

@@ -61,11 +61,16 @@ public final class CastleWarehouse extends AbstractNpcAI
case "warehouse-01.html":
case "warehouse-02.html":
case "warehouse-03.html":
{
break;
}
case "warehouse-04.html":
{
htmltext = (!isMyLord) ? "warehouse-no.html" : getHtm(player.getHtmlPrefix(), "warehouse-04.html").replace("%blood%", Integer.toString(player.getClan().getBloodAllianceCount()));
break;
}
case "Receive":
{
if (!isMyLord)
{
htmltext = "warehouse-no.html";
@@ -81,7 +86,9 @@ public final class CastleWarehouse extends AbstractNpcAI
htmltext = "warehouse-06.html";
}
break;
}
case "Exchange":
{
if (!isMyLord)
{
htmltext = "warehouse-no.html";
@@ -97,9 +104,12 @@ public final class CastleWarehouse extends AbstractNpcAI
htmltext = "warehouse-07.html";
}
break;
}
default:
{
htmltext = null;
break;
}
}
return htmltext;
}

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java vendored
View File

@@ -272,10 +272,14 @@ public final class ClanHallManager extends AbstractNpcAI
case 1:
case 2:
case 3:
{
((L2MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1)));
break;
}
default:
{
htmltext = "ClanHallManager-noFunction.html";
}
}
break;
}

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java vendored
View File

@@ -86,13 +86,19 @@ public final class AdminClanHall implements IAdminCommandHandler
switch (actionVal)
{
case "inside":
{
loc = clanHall.getOwnerLocation();
break;
}
case "outside":
{
loc = clanHall.getBanishLocation();
break;
}
default:
{
loc = player.getLocation();
}
}
player.teleToLocation(loc);
}

14
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java vendored
View File

@@ -192,26 +192,40 @@ public class AdminLogin implements IAdminCommandHandler
switch (currentType)
{
case 0x01:
{
nameType += "Normal";
break;
}
case 0x02:
{
nameType += "Relax";
break;
}
case 0x04:
{
nameType += "Test";
break;
}
case 0x08:
{
nameType += "NoLabel";
break;
}
case 0x10:
{
nameType += "Restricted";
break;
}
case 0x20:
{
nameType += "Event";
break;
}
case 0x40:
{
nameType += "Free";
break;
}
}
}
}

50
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@@ -128,34 +128,50 @@ public final class AdminPForge implements IAdminCommandHandler
case 'B':
case 'x':
case 'X':
{
// array
break;
}
case 'c':
case 'C':
{
// byte
break;
}
case 'h':
case 'H':
{
// word
break;
}
case 'd':
case 'D':
{
// dword
break;
}
case 'q':
case 'Q':
{
// qword
break;
}
case 'f':
case 'F':
{
// double
break;
}
case 's':
case 'S':
{
// string
break;
}
default:
{
return false;
}
}
}
@@ -169,7 +185,9 @@ public final class AdminPForge implements IAdminCommandHandler
case "sc":
case "sb":
case "cs":
{
return true;
}
}
return false;
@@ -401,9 +419,12 @@ public final class AdminPForge implements IAdminCommandHandler
switch (value)
{
case "$oid":
{
value = String.valueOf(activeChar.getObjectId());
break;
}
case "$boid":
{
boat = activeChar.getBoat();
if (boat != null)
{
@@ -414,28 +435,44 @@ public final class AdminPForge implements IAdminCommandHandler
value = "0";
}
break;
}
case "$title":
{
value = activeChar.getTitle();
break;
}
case "$name":
{
value = activeChar.getName();
break;
}
case "$x":
{
value = String.valueOf(activeChar.getX());
break;
}
case "$y":
{
value = String.valueOf(activeChar.getY());
break;
}
case "$z":
{
value = String.valueOf(activeChar.getZ());
break;
}
case "$heading":
{
value = String.valueOf(activeChar.getHeading());
break;
}
case "$toid":
{
value = String.valueOf(activeChar.getTargetId());
break;
}
case "$tboid":
{
target = activeChar.getTarget();
if ((target != null) && (target instanceof L2Playable))
{
@@ -450,7 +487,9 @@ public final class AdminPForge implements IAdminCommandHandler
}
}
break;
}
case "$ttitle":
{
target = activeChar.getTarget();
if ((target != null) && (target instanceof L2Character))
{
@@ -461,7 +500,9 @@ public final class AdminPForge implements IAdminCommandHandler
value = "";
}
break;
}
case "$tname":
{
target = activeChar.getTarget();
if (target != null)
{
@@ -472,7 +513,9 @@ public final class AdminPForge implements IAdminCommandHandler
value = "";
}
break;
}
case "$tx":
{
target = activeChar.getTarget();
if (target != null)
{
@@ -483,7 +526,9 @@ public final class AdminPForge implements IAdminCommandHandler
value = "0";
}
break;
}
case "$ty":
{
target = activeChar.getTarget();
if (target != null)
{
@@ -494,7 +539,9 @@ public final class AdminPForge implements IAdminCommandHandler
value = "0";
}
break;
}
case "$tz":
{
target = activeChar.getTarget();
if (target != null)
{
@@ -505,7 +552,9 @@ public final class AdminPForge implements IAdminCommandHandler
value = "0";
}
break;
}
case "$theading":
{
target = activeChar.getTarget();
if (target != null)
{
@@ -516,6 +565,7 @@ public final class AdminPForge implements IAdminCommandHandler
value = "0";
}
break;
}
}
if (method.equals("sc") || method.equals("sb"))

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

@@ -375,14 +375,20 @@ public class AdminSpawn implements IAdminCommandHandler
{
default:
case 0:
{
_log.info("('',1," + i + "," + x + "," + y + "," + z + ",0,0," + h + ",60,0,0),");
break;
}
case 1:
{
_log.info("<spawn npcId=\"" + i + "\" x=\"" + x + "\" y=\"" + y + "\" z=\"" + z + "\" heading=\"" + h + "\" respawn=\"0\" />");
break;
}
case 2:
{
_log.info("{ " + i + ", " + x + ", " + y + ", " + z + ", " + h + " },");
break;
}
}
}

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@@ -328,23 +328,35 @@ public class AdminTeleport implements IAdminCommandHandler
switch (player.getRace())
{
case ELF:
{
regionName = "elf_town";
break;
}
case DARK_ELF:
{
regionName = "darkelf_town";
break;
}
case ORC:
{
regionName = "orc_town";
break;
}
case DWARF:
{
regionName = "dwarf_town";
break;
}
case KAMAEL:
{
regionName = "kamael_town";
break;
}
case HUMAN:
default:
{
regionName = "talking_island_town";
}
}
player.teleToLocation(MapRegionManager.getInstance().getMapRegionByName(regionName).getSpawnLoc(), true, null);

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Augment.java vendored
View File

@@ -44,11 +44,15 @@ public class Augment implements IBypassHandler
switch (Integer.parseInt(command.substring(8, 9).trim()))
{
case 1:
{
activeChar.sendPacket(ExShowVariationMakeWindow.STATIC_PACKET);
return true;
}
case 2:
{
activeChar.sendPacket(ExShowVariationCancelWindow.STATIC_PACKET);
return true;
}
}
}
catch (Exception e)

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java vendored
View File

@@ -78,11 +78,15 @@ public class KarmaCount extends AbstractEffect
switch (_mode)
{
case 0: // diff
{
final int newReputation = Math.min(player.getReputation() + _amount, 0);
player.setReputation(newReputation);
break;
}
case 1: // reset
{
player.setReputation(0);
}
}
}
}

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java vendored
View File

@@ -48,13 +48,19 @@ public class EventItem implements IItemHandler
switch (itemId)
{
case 13787: // Handy's Block Checker Bond
{
used = useBlockCheckerItem(activeChar, item);
break;
}
case 13788: // Handy's Block Checker Land Mine
{
used = useBlockCheckerItem(activeChar, item);
break;
}
default:
{
_log.warning("EventItemHandler: Item with id: " + itemId + " is not handled");
}
}
return used;
}

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/SocialAction.java vendored
View File

@@ -57,18 +57,24 @@ public final class SocialAction implements IPlayerActionHandler
case 15: // Shyness
case 28: // Propose
case 29: // Provoke
{
useSocial(activeChar, data.getOptionId());
break;
}
case 30: // Beauty Shop
{
if (useSocial(activeChar, data.getOptionId()))
{
activeChar.broadcastInfo();
}
break;
}
case 16: // Exchange Bows
case 17: // High Five
case 18: // Couple Dance
{
useCoupleSocial(activeChar, data.getOptionId());
}
}
}

32
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java vendored
View File

@@ -62,53 +62,85 @@ public class Enchant implements ITelnetCommand
switch (itemType)
{
case 1:
{
itemType = Inventory.PAPERDOLL_HEAD;
break;
}
case 2:
{
itemType = Inventory.PAPERDOLL_CHEST;
break;
}
case 3:
{
itemType = Inventory.PAPERDOLL_GLOVES;
break;
}
case 4:
{
itemType = Inventory.PAPERDOLL_FEET;
break;
}
case 5:
{
itemType = Inventory.PAPERDOLL_LEGS;
break;
}
case 6:
{
itemType = Inventory.PAPERDOLL_RHAND;
break;
}
case 7:
{
itemType = Inventory.PAPERDOLL_LHAND;
break;
}
case 8:
{
itemType = Inventory.PAPERDOLL_LEAR;
break;
}
case 9:
{
itemType = Inventory.PAPERDOLL_REAR;
break;
}
case 10:
{
itemType = Inventory.PAPERDOLL_LFINGER;
break;
}
case 11:
{
itemType = Inventory.PAPERDOLL_RFINGER;
break;
}
case 12:
{
itemType = Inventory.PAPERDOLL_NECK;
break;
}
case 13:
{
itemType = Inventory.PAPERDOLL_UNDER;
break;
}
case 14:
{
itemType = Inventory.PAPERDOLL_CLOAK;
break;
}
case 15:
{
itemType = Inventory.PAPERDOLL_BELT;
break;
}
default:
{
itemType = 0;
break;
}
}
final boolean success = setEnchant(player, enchant, itemType);
return success ? "Item has been successfully enchanted." : "Failed to enchant player's item!";

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/PartyInfo.java vendored
View File

@@ -47,20 +47,30 @@ public class PartyInfo implements IUserCommandHandler
switch (party.getDistributionType())
{
case FINDERS_KEEPERS:
{
activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_FINDERS_KEEPERS);
break;
}
case RANDOM:
{
activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM);
break;
}
case RANDOM_INCLUDING_SPOIL:
{
activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_RANDOM_INCLUDING_SPOIL);
break;
}
case BY_TURN:
{
activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_BY_TURN);
break;
}
case BY_TURN_INCLUDING_SPOIL:
{
activeChar.sendPacket(SystemMessageId.LOOTING_METHOD_BY_TURN_INCLUDING_SPOIL);
break;
}
}
// Not used in Infinite Odissey

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java vendored
View File

@@ -41,6 +41,7 @@ public class CastleVCmd implements IVoicedCommandHandler
switch (command)
{
case "opendoors":
{
if (!params.equals("castle"))
{
activeChar.sendMessage("Only Castle doors can be open.");
@@ -79,7 +80,9 @@ public class CastleVCmd implements IVoicedCommandHandler
door.openMe();
}
break;
}
case "closedoors":
{
if (!params.equals("castle"))
{
activeChar.sendMessage("Only Castle doors can be closed.");
@@ -115,12 +118,15 @@ public class CastleVCmd implements IVoicedCommandHandler
door2.closeMe();
}
break;
}
case "ridewyvern":
{
if (activeChar.isClanLeader() && (activeChar.getClan().getCastleId() > 0))
{
activeChar.mount(12621, 0, true);
}
break;
}
}
return true;
}