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

Proper usage for party range configuration.

Browse Source
This commit is contained in:
MobiusDev 2019-01-23 01:50:11 +00:00
parent b5faf6464b
commit 283f87c38e
49 changed files with 105 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/dist/game/config/Character.ini vendored
View File

@ -585,17 +585,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 7 # Default: 7
AltPartyMaxMembers = 7 AltPartyMaxMembers = 7
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
View File

@ -250,7 +250,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1592,7 +1591,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2457,7 +2457,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2503,7 +2503,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2566,7 +2566,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2697,7 +2697,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_2.5_Underground/dist/game/config/Character.ini vendored
View File

@ -585,17 +585,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 7 # Default: 7
AltPartyMaxMembers = 7 AltPartyMaxMembers = 7
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
View File

@ -256,7 +256,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1607,7 +1606,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2459,7 +2459,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2505,7 +2505,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2568,7 +2568,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2699,7 +2699,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_3.0_Helios/dist/game/config/Character.ini vendored
View File

@ -585,17 +585,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 7 # Default: 7
AltPartyMaxMembers = 7 AltPartyMaxMembers = 7
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
View File

@ -256,7 +256,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1615,7 +1614,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2460,7 +2460,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2506,7 +2506,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2569,7 +2569,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2700,7 +2700,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_4.0_GrandCrusade/dist/game/config/Character.ini vendored
View File

@ -561,17 +561,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 7 # Default: 7
AltPartyMaxMembers = 7 AltPartyMaxMembers = 7
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
View File

@ -250,7 +250,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1602,7 +1601,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2460,7 +2460,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2506,7 +2506,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2569,7 +2569,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2700,7 +2700,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_5.0_Salvation/dist/game/config/Character.ini vendored
View File

@ -561,17 +561,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 7 # Default: 7
AltPartyMaxMembers = 7 AltPartyMaxMembers = 7
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/Config.java
View File

@ -250,7 +250,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1602,7 +1601,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2460,7 +2460,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2506,7 +2506,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2569,7 +2569,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2700,7 +2700,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_5.5_EtinasFate/dist/game/config/Character.ini vendored
View File

@ -561,17 +561,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 7 # Default: 7
AltPartyMaxMembers = 7 AltPartyMaxMembers = 7
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/Config.java
View File

@ -250,7 +250,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1602,7 +1601,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2460,7 +2460,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2506,7 +2506,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2569,7 +2569,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2700,7 +2700,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

6
L2J_Mobius_C6_Interlude/dist/game/config/main/AltSettings.ini vendored
View File

@ -20,10 +20,10 @@ AutoLearnSkills = False
# AutoLearn DivineInspiration: True to enable, False to disable # AutoLearn DivineInspiration: True to enable, False to disable
AutoLearnDivineInspiration = False AutoLearnDivineInspiration = False
# Party range for l2attackable (default 1600) # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# Party range for l2party (default 1400)
AltPartyRange2 = 1400
# Weight Limit multiplier - default 1 # Weight Limit multiplier - default 1
# If >1 - Weight Limit Double # If >1 - Weight Limit Double

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java
View File

@ -367,7 +367,6 @@ public final class Config
public static boolean ALT_GAME_CANCEL_CAST; public static boolean ALT_GAME_CANCEL_CAST;
public static boolean ALT_GAME_TIREDNESS; public static boolean ALT_GAME_TIREDNESS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_GAME_SHIELD_BLOCKS; public static boolean ALT_GAME_SHIELD_BLOCKS;
public static int ALT_PERFECT_SHLD_BLOCK; public static int ALT_PERFECT_SHLD_BLOCK;
public static boolean ALT_GAME_MOB_ATTACK_AI; public static boolean ALT_GAME_MOB_ATTACK_AI;
@ -1840,7 +1839,6 @@ public final class Config
ALT_GAME_FREIGHTS = Boolean.parseBoolean(altSettings.getProperty("AltGameFreights", "false")); ALT_GAME_FREIGHTS = Boolean.parseBoolean(altSettings.getProperty("AltGameFreights", "false"));
ALT_GAME_FREIGHT_PRICE = Integer.parseInt(altSettings.getProperty("AltGameFreightPrice", "1000")); ALT_GAME_FREIGHT_PRICE = Integer.parseInt(altSettings.getProperty("AltGameFreightPrice", "1000"));
ALT_PARTY_RANGE = Integer.parseInt(altSettings.getProperty("AltPartyRange", "1600")); ALT_PARTY_RANGE = Integer.parseInt(altSettings.getProperty("AltPartyRange", "1600"));
ALT_PARTY_RANGE2 = Integer.parseInt(altSettings.getProperty("AltPartyRange2", "1400"));
REMOVE_CASTLE_CIRCLETS = Boolean.parseBoolean(altSettings.getProperty("RemoveCastleCirclets", "true")); REMOVE_CASTLE_CIRCLETS = Boolean.parseBoolean(altSettings.getProperty("RemoveCastleCirclets", "true"));
LIFE_CRYSTAL_NEEDED = Boolean.parseBoolean(altSettings.getProperty("LifeCrystalNeeded", "true")); LIFE_CRYSTAL_NEEDED = Boolean.parseBoolean(altSettings.getProperty("LifeCrystalNeeded", "true"));
SP_BOOK_NEEDED = Boolean.parseBoolean(altSettings.getProperty("SpBookNeeded", "true")); SP_BOOK_NEEDED = Boolean.parseBoolean(altSettings.getProperty("SpBookNeeded", "true"));

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -163,7 +163,7 @@ public class L2Party
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -195,7 +195,7 @@ public class L2Party
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -669,7 +669,7 @@ public class L2Party
for (L2PcInstance member : membersList) for (L2PcInstance member : membersList)
{ {
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
continue; continue;
} }

18
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -300,7 +300,7 @@ public class Quest extends ManagedScript
/** /**
* @param player : The player instance to check. * @param player : The player instance to check.
* @return true if the given player got an online clan member sponsor in a 1500 radius range. * @return true if the given player got an online clan member sponsor in a 1600 radius range.
*/ */
public static boolean getSponsor(L2PcInstance player) public static boolean getSponsor(L2PcInstance player)
{ {
@ -324,7 +324,7 @@ public class Quest extends ManagedScript
{ {
// The sponsor is online, retrieve player instance and check distance. // The sponsor is online, retrieve player instance and check distance.
final L2PcInstance sponsor = member.getPlayerInstance(); final L2PcInstance sponsor = member.getPlayerInstance();
if ((sponsor != null) && player.isInsideRadius(sponsor, 1500, true, false)) if ((sponsor != null) && player.isInsideRadius(sponsor, Config.ALT_PARTY_RANGE, true, false))
{ {
return true; return true;
} }
@ -335,7 +335,7 @@ public class Quest extends ManagedScript
/** /**
* @param player : The player instance to check. * @param player : The player instance to check.
* @return the apprentice of the given player. He must be online, and in a 1500 radius range. * @return the apprentice of the given player. He must be online, and in a 1600 radius range.
*/ */
public static L2PcInstance getApprentice(L2PcInstance player) public static L2PcInstance getApprentice(L2PcInstance player)
{ {
@ -359,7 +359,7 @@ public class Quest extends ManagedScript
{ {
// The apprentice is online, retrieve player instance and check distance. // The apprentice is online, retrieve player instance and check distance.
final L2PcInstance academic = member.getPlayerInstance(); final L2PcInstance academic = member.getPlayerInstance();
if ((academic != null) && player.isInsideRadius(academic, 1500, true, false)) if ((academic != null) && player.isInsideRadius(academic, Config.ALT_PARTY_RANGE, true, false))
{ {
return academic; return academic;
} }
@ -1611,7 +1611,7 @@ public class Quest extends ManagedScript
* @param npc : the instance of a L2Npc to compare distance * @param npc : the instance of a L2Npc to compare distance
* @param var : a tuple specifying a quest condition that must be satisfied for a party member to be considered. * @param var : a tuple specifying a quest condition that must be satisfied for a party member to be considered.
* @param value : a tuple specifying a quest condition that must be satisfied for a party member to be considered. * @param value : a tuple specifying a quest condition that must be satisfied for a party member to be considered.
* @return Player : Player for a random party member that matches the specified condition, or null if no match. If the var is null, null is returned (i.e. no condition is applied). The party member must be within 1500 distance from the npc. If npc is null, distance condition is ignored. * @return Player : Player for a random party member that matches the specified condition, or null if no match. If the var is null, null is returned (i.e. no condition is applied). The party member must be within 1600 distance from the npc. If npc is null, distance condition is ignored.
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, L2NpcInstance npc, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, L2NpcInstance npc, String var, String value)
{ {
@ -1647,8 +1647,8 @@ public class Quest extends ManagedScript
* @param player the instance of a player whose party is to be searched * @param player the instance of a player whose party is to be searched
* @param var a tuple specifying a quest condition that must be satisfied for a party member to be considered. * @param var a tuple specifying a quest condition that must be satisfied for a party member to be considered.
* @param value * @param value
* @return L2PcInstance: L2PcInstance for a random party member that matches the specified condition, or null if no match. If the var is null, any random party member is returned (i.e. no condition is applied). The party member must be within 1500 distance from the target of the reference * @return L2PcInstance: L2PcInstance for a random party member that matches the specified condition, or null if no match. If the var is null, any random party member is returned (i.e. no condition is applied). The party member must be within 1600 distance from the target of the reference
* player, or if no target exists, 1500 distance from the player itself. * player, or if no target exists, 1600 distance from the player itself.
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -1693,7 +1693,7 @@ public class Quest extends ManagedScript
for (L2PcInstance partyMember : party.getPartyMembers()) for (L2PcInstance partyMember : party.getPartyMembers())
{ {
temp = partyMember.getQuestState(_name); temp = partyMember.getQuestState(_name);
if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, 1500, true, false)) if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, Config.ALT_PARTY_RANGE, true, false))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -1799,7 +1799,7 @@ public class Quest extends ManagedScript
{ {
temp = partyMember.getQuestState(_name); temp = partyMember.getQuestState(_name);
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius(target, 1500, true, false)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius(target, Config.ALT_PARTY_RANGE, true, false))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }

8
L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini vendored
View File

@ -664,17 +664,11 @@ AltClanMembersForWar = 15
# Party # Party
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java vendored
View File

@ -636,7 +636,7 @@ public abstract class AbstractSagaQuest extends Quest
for (L2PcInstance player1 : party.getMembers()) for (L2PcInstance player1 : party.getMembers())
{ {
final QuestState st1 = findQuest(player1); final QuestState st1 = findQuest(player1);
if ((st1 != null) && player1.isInsideRadius2D(player, Config.ALT_PARTY_RANGE2)) if ((st1 != null) && player1.isInsideRadius2D(player, Config.ALT_PARTY_RANGE))
{ {
if (st1.isCond(15)) if (st1.isCond(15))
{ {

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
View File

@ -254,7 +254,6 @@ public final class Config
public static boolean ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH; public static boolean ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH;
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1889,7 +1888,6 @@ public final class Config
ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH = Character.getBoolean("AltMembersCanWithdrawFromClanWH", false); ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH = Character.getBoolean("AltMembersCanWithdrawFromClanWH", false);
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -158,7 +158,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -184,7 +184,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -714,7 +714,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

9
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -68,6 +68,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcQuestHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcQuestHtmlMessage;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager; import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest main class. * Quest main class.
@ -2195,7 +2196,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2232,7 +2233,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && temp.get(var).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && temp.get(var).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2279,7 +2280,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2405,7 +2406,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || com.l2jmobius.gameserver.util.Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini vendored
View File

@ -537,17 +537,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 9 # Default: 9
AltPartyMaxMembers = 9 AltPartyMaxMembers = 9
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
View File

@ -255,7 +255,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1542,7 +1541,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2418,7 +2418,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2464,7 +2464,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2527,7 +2527,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2658,7 +2658,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Character.ini vendored
View File

@ -537,17 +537,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 9 # Default: 9
AltPartyMaxMembers = 9 AltPartyMaxMembers = 9
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
View File

@ -255,7 +255,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1546,7 +1545,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2418,7 +2418,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2464,7 +2464,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2527,7 +2527,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2658,7 +2658,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini vendored
View File

@ -537,17 +537,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 9 # Default: 9
AltPartyMaxMembers = 9 AltPartyMaxMembers = 9
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java
View File

@ -255,7 +255,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1546,7 +1545,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2418,7 +2418,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2464,7 +2464,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2527,7 +2527,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2658,7 +2658,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**

8
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Character.ini vendored
View File

@ -537,17 +537,11 @@ AltClanMembersTimeForBonus = 30mins
# Default: 9 # Default: 9
AltPartyMaxMembers = 9 AltPartyMaxMembers = 9
# CONFUSING(nothing to do with party) -> When you made damage to a mob # When you made damage to a mob and are inside this range, you will be considered as player to reward.
# and are inside this range, you will be considered as player to reward.
# Checks for party range to mob to calculate rewards(exp, items). # Checks for party range to mob to calculate rewards(exp, items).
# Default: 1600 # Default: 1600
AltPartyRange = 1600 AltPartyRange = 1600
# 1. Used for Adena distribution in party
# 2. Used to handle random and by turn party loot
# Default: 1400
AltPartyRange2 = 1400
# If true, when party leader leaves party, next member in party will be the leader. # If true, when party leader leaves party, next member in party will be the leader.
# If false the party be will dispersed. # If false the party be will dispersed.
# Default: False # Default: False

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/Config.java
View File

@ -255,7 +255,6 @@ public final class Config
public static boolean REMOVE_CASTLE_CIRCLETS; public static boolean REMOVE_CASTLE_CIRCLETS;
public static int ALT_PARTY_MAX_MEMBERS; public static int ALT_PARTY_MAX_MEMBERS;
public static int ALT_PARTY_RANGE; public static int ALT_PARTY_RANGE;
public static int ALT_PARTY_RANGE2;
public static boolean ALT_LEAVE_PARTY_LEADER; public static boolean ALT_LEAVE_PARTY_LEADER;
public static boolean INITIAL_EQUIPMENT_EVENT; public static boolean INITIAL_EQUIPMENT_EVENT;
public static long STARTING_ADENA; public static long STARTING_ADENA;
@ -1546,7 +1545,6 @@ public final class Config
REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true); REMOVE_CASTLE_CIRCLETS = Character.getBoolean("RemoveCastleCirclets", true);
ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7); ALT_PARTY_MAX_MEMBERS = Character.getInt("AltPartyMaxMembers", 7);
ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600); ALT_PARTY_RANGE = Character.getInt("AltPartyRange", 1600);
ALT_PARTY_RANGE2 = Character.getInt("AltPartyRange2", 1400);
ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false); ALT_LEAVE_PARTY_LEADER = Character.getBoolean("AltLeavePartyLeader", false);
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
STARTING_ADENA = Character.getLong("StartingAdena", 0); STARTING_ADENA = Character.getLong("StartingAdena", 0);

6
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -170,7 +170,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> availableMembers = new ArrayList<>(); final List<L2PcInstance> availableMembers = new ArrayList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
availableMembers.add(member); availableMembers.add(member);
} }
@ -196,7 +196,7 @@ public class L2Party extends AbstractPlayerGroup
try try
{ {
member = _members.get(_itemLastLoot); member = _members.get(_itemLastLoot);
if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
return member; return member;
} }
@ -802,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup
final List<L2PcInstance> toReward = new LinkedList<>(); final List<L2PcInstance> toReward = new LinkedList<>();
for (L2PcInstance member : _members) for (L2PcInstance member : _members)
{ {
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
{ {
toReward.add(member); toReward.add(member);
} }

8
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -2418,7 +2418,7 @@ public class Quest extends AbstractScript implements IIdentifiable
* @param value the value of the specified quest variable the random party member must have * @param value the value of the specified quest variable the random party member must have
* @return a random party member that matches the specified conditions or {@code null} if no match was found.<br> * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
* If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br> * If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
* The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself * The party member must be within a range of 1600 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
*/ */
public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value)
{ {
@ -2464,7 +2464,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2527,7 +2527,7 @@ public class Quest extends AbstractScript implements IIdentifiable
continue; continue;
} }
temp = partyMember.getQuestState(getName()); temp = partyMember.getQuestState(getName());
if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, 1500)) if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius3D(target, Config.ALT_PARTY_RANGE))
{ {
candidates.add(partyMember); candidates.add(partyMember);
} }
@ -2658,7 +2658,7 @@ public class Quest extends AbstractScript implements IIdentifiable
private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target)
{ {
return (target == null) || Util.checkIfInRange(1500, player, target, true); return (target == null) || Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true);
} }
/** /**