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

Removed useless AltOlyRestrictedItems entries.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-17 22:24:53 +00:00
parent e811d35dfd
commit c12a44b9a5
36 changed files with 258 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/dist/game/config/Olympiad.ini vendored
View File

@@ -129,8 +129,8 @@ AltOlyAnnounceGames = True
# Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350)
# Equipped items will be moved to inventory during port.
# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774
AltOlyRestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774
# Default:
AltOlyRestrictedItems =
# Enchant limit for items during Olympiad battles. Disabled = -1.
# Default: -1

1
L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/items/14700-14799.xml vendored
View File

@@ -981,6 +981,7 @@
<set name="is_dropable" val="false" />
<set name="is_sellable" val="false" />
<set name="is_depositable" val="false" />
<set name="is_oly_restricted" val="true" />
<set name="item_skill" val="8325-1;8326-1" /> <!-- Wild Rose Pig Candy -->
<set name="time" val="20160" />
<for>

18
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
View File

@@ -608,7 +608,7 @@ public class Config
public static boolean ALT_OLY_LOG_FIGHTS;
public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS;
public static boolean ALT_OLY_ANNOUNCE_GAMES;
public static List<Integer> LIST_OLY_RESTRICTED_ITEMS;
public static List<Integer> LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>();
public static int ALT_OLY_ENCHANT_LIMIT;
public static int ALT_OLY_WAIT_TIME;
public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS;
@@ -2489,11 +2489,19 @@ public class Config
ALT_OLY_LOG_FIGHTS = Olympiad.getBoolean("AltOlyLogFights", false);
ALT_OLY_SHOW_MONTHLY_WINNERS = Olympiad.getBoolean("AltOlyShowMonthlyWinners", true);
ALT_OLY_ANNOUNCE_GAMES = Olympiad.getBoolean("AltOlyAnnounceGames", true);
final String[] olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774").split(",");
LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItems.length);
for (String id : olyRestrictedItems)
final String olyRestrictedItems = Olympiad.getString("AltOlyRestrictedItems", "").trim();
if (!olyRestrictedItems.isEmpty())
{
LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id));
final String[] olyRestrictedItemsSplit = olyRestrictedItems.split(",");
LIST_OLY_RESTRICTED_ITEMS = new ArrayList<>(olyRestrictedItemsSplit.length);
for (String id : olyRestrictedItemsSplit)
{
LIST_OLY_RESTRICTED_ITEMS.add(Integer.parseInt(id));
}
}
else // In case of reload with removal of all items ids.
{
LIST_OLY_RESTRICTED_ITEMS.clear();
}
ALT_OLY_ENCHANT_LIMIT = Olympiad.getInt("AltOlyEnchantLimit", -1);
ALT_OLY_WAIT_TIME = Olympiad.getInt("AltOlyWaitTime", 120);