projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

WeaponObject now uses the WeaponType datatable

Browse Source
This commit is contained in:
Ziggeh
2014-04-16 23:29:17 +02:00
parent 2a5855f5ef
commit d810b60c4a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/weapon/WeaponObject.java
+3 -2
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package resources.objects.weapon;
import resources.datatables.WeaponType;
import resources.objects.tangible.TangibleObject;
import com.sleepycat.persist.model.NotPersistent;
@@ -196,7 +197,7 @@ public class WeaponObject extends TangibleObject {
int weaponType = getWeaponType();
if(weaponType == 4 || weaponType == 5 || weaponType == 6 || weaponType == 7 || weaponType == 9 || weaponType == 10 || weaponType == 11)
if(weaponType == WeaponType.ONEHANDEDMELEE || weaponType == WeaponType.TWOHANDEDMELEE || weaponType == WeaponType.UNARMED || weaponType == WeaponType.POLEARMMELEE || weaponType == WeaponType.ONEHANDEDSABER || weaponType == WeaponType.TWOHANDEDSABER || weaponType == WeaponType.POLEARMSABER)
return true;
return false;
@@ -207,7 +208,7 @@ public class WeaponObject extends TangibleObject {
int weaponType = getWeaponType();
if(weaponType == 0 || weaponType == 1 || weaponType == 2 || weaponType == 3)
if(weaponType == WeaponType.RIFLE || weaponType == WeaponType.CARBINE || weaponType == WeaponType.PISTOL || weaponType == WeaponType.FLAMETHROWER || weaponType == WeaponType.HEAVYWEAPON)
return true;
return false;