Made crossbows and two handed crossbows use same appearance stones.

This commit is contained in:
MobiusDev 2019-01-05 03:03:23 +00:00
parent ec54c58377
commit bce6369eee
10 changed files with 180 additions and 30 deletions

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())

View File

@ -387,8 +387,16 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
if (_weaponType != WeaponType.CROSSBOW)
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false;
}
}
switch (_handType)
@ -475,7 +483,14 @@ public class AppearanceStone
{
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
continue;
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{
continue;
}
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType())