Addition of Castle first mid victory methods.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2022-02-09 09:13:32 +00:00
parent a87d2c3e8d
commit 413c709bca
111 changed files with 912 additions and 456 deletions

View File

@@ -84,6 +84,13 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
return !player.isSiegeFriend(targetPlayer);
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
{
@@ -125,13 +132,6 @@ public class NotFriend implements IAffectObjectHandler
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
return !player.isSiegeFriend(targetPlayer);
}
// At this point summon should be prevented from attacking friendly targets.
if (creature.isSummon() && (target == creature.getTarget()))
{

View File

@@ -84,6 +84,13 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
return !player.isSiegeFriend(targetPlayer);
}
// Arena.
if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
{
@@ -125,13 +132,6 @@ public class NotFriendPc implements IAffectObjectHandler
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
return !player.isSiegeFriend(targetPlayer);
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}