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

Schuttgart related cleanups.

Browse Source 
Contributed by emilianoify.
This commit is contained in:
MobiusDevelopment
2023-05-10 13:25:39 +03:00
parent bee7dde981
commit a665d710a1
21 changed files with 3 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/CrownTable.java
View File

@@ -39,7 +39,6 @@ public class CrownTable
CROWNS.put(6, 6834); // Innadril
CROWNS.put(7, 6836); // Goddard
CROWNS.put(8, 8182); // Rune
CROWNS.put(9, 8183); // Schuttgart
}
public static Collection<Integer> getCrownList()

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java
View File

@@ -94,11 +94,6 @@ public class MercTicket implements IItemHandler
player.sendMessage("This Mercenary Ticket can only be used in Rune.");
return;
}
case 9:
{
player.sendMessage("This Mercenary Ticket can only be used in Schuttgart.");
return;
}
// player is not in a castle
default:
{

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
View File

@@ -377,11 +377,6 @@ public class ScrollOfEscape implements IItemHandler
_player.teleToLocation(43799, -47727, -798, true); // Rune Castle Town
break;
}
case 7135:
{
_player.teleToLocation(87331, -142842, -1317, true); // Schuttgart Castle Town
break;
}
case 7618:
{
_player.teleToLocation(149864, -81062, -5618, true); // Ketra Orc Village

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Loc.java
View File

@@ -115,11 +115,6 @@ public class Loc implements IUserCommandHandler
msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_GODDARD;
break;
}
case 16:
{
msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_SCHUTTGART;
break;
}
case 17:
{
msg = SystemMessageId.CURRENT_LOCATION_S1_S2_S3_NEAR_THE_FLORAN_VILLAGE;

65
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java
View File

@@ -223,26 +223,6 @@ public class MercTicketManager
20,
20,
20, // Rune
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20,
20, // Schuttgart
};
private static final int[] MERCS_MAX_PER_CASTLE =
{
@@ -254,7 +234,6 @@ public class MercTicketManager
400, // Innadril
400, // Goddard
400, // Rune
400, // Schuttgart
};
private static final int[] ITEM_IDS =
@@ -419,26 +398,6 @@ public class MercTicketManager
7995,
7996,
7997, // Rune
7918,
7919,
7920,
7921,
7922,
7923,
7924,
7925,
7926,
7927,
7931,
7932,
7933,
7934,
7935,
7936,
7937,
7938,
7939,
7940, // Schuttgart
};
private static final int[] NPC_IDS =
@@ -603,26 +562,6 @@ public class MercTicketManager
35037,
35038,
35039, // Rune
35010,
35011,
35012,
35013,
35014,
35015,
35016,
35017,
35018,
35019,
35030,
35031,
35032,
35033,
35034,
35035,
35036,
35037,
35038,
35039, // Schuttgart
};
public int getTicketCastleId(int itemId)
@@ -659,10 +598,6 @@ public class MercTicketManager
{
return 8; // Rune
}
if (((itemId >= ITEM_IDS[160]) && (itemId <= ITEM_IDS[169])) || ((itemId >= ITEM_IDS[170]) && (itemId <= ITEM_IDS[179])))
{
return 9; // Schuttgart
}
return -1;
}

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java
View File

@@ -682,11 +682,6 @@ public class Auctioneer extends Folk
nearestTown = "GODARD";
break;
}
case 16:
{
nearestTown = "SCHUTTGART";
break;
}
default:
{
nearestTown = "ADEN";

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Castle.java
View File

@@ -144,7 +144,7 @@ public class Castle
}
int amount = amountValue;
if (_name.equalsIgnoreCase("Schuttgart") || _name.equalsIgnoreCase("Goddard"))
if (_name.equalsIgnoreCase("Goddard"))
{
final Castle rune = CastleManager.getInstance().getCastle("rune");
if (rune != null)
@@ -158,7 +158,7 @@ public class Castle
amount -= runeTax;
}
}
if (!_name.equalsIgnoreCase("aden") && !_name.equalsIgnoreCase("Rune") && !_name.equalsIgnoreCase("Schuttgart") && !_name.equalsIgnoreCase("Goddard")) // If current castle instance is not Aden, Rune, Goddard or Schuttgart.
if (!_name.equalsIgnoreCase("aden") && !_name.equalsIgnoreCase("Rune") && !_name.equalsIgnoreCase("Goddard")) // If current castle instance is not Aden, Rune or Goddard.
{
final Castle aden = CastleManager.getInstance().getCastle("aden");
if (aden != null)

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/SystemMessageId.java
View File

@@ -5173,9 +5173,6 @@ public class SystemMessageId
@ClientString(id = 1713, message = "The games may be delayed due to an insufficient number of players waiting.")
public static SystemMessageId THE_GAMES_MAY_BE_DELAYED_DUE_TO_AN_INSUFFICIENT_NUMBER_OF_PLAYERS_WAITING;
@ClientString(id = 1714, message = "Current Location: $s1, $s2, $s3 (Near the Town of Schuttgart)")
public static SystemMessageId CURRENT_LOCATION_S1_S2_S3_NEAR_THE_TOWN_OF_SCHUTTGART;
@ClientString(id = 1715, message = "This is a Peaceful Zone\\n- PvP is not allowed in this area.")
public static SystemMessageId THIS_IS_A_PEACEFUL_ZONE_N_PVP_IS_NOT_ALLOWED_IN_THIS_AREA;