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

Made crossbows and two handed crossbows use same appearance stones.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {

15
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java
View File

@@ -386,10 +386,18 @@ public class AppearanceStone
if (_weaponType != WeaponType.NONE) if (_weaponType != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType))
{
if (_weaponType != WeaponType.CROSSBOW)
{ {
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON);
return false; 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) switch (_handType)
{ {
@@ -474,9 +482,16 @@ public class AppearanceStone
if (holder.getWeaponType() != WeaponType.NONE) if (holder.getWeaponType() != WeaponType.NONE)
{ {
if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType()))
{
if (holder.getWeaponType() != WeaponType.CROSSBOW)
{ {
continue; continue;
} }
else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW))
{
continue;
}
}
switch (holder.getHandType()) switch (holder.getHandType())
{ {