projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

Removed rifles from frog temorarily to prevent client-lockups

Browse Source
This commit is contained in:
CharonInferar
2014-08-09 02:48:14 +02:00
parent 05dca03015
commit 73180b5f83
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/character_builder_terminal.py
+8 -8
View File
@@ -378,13 +378,13 @@ def combatLevelDown(owner):
return
def rangedWeapons(owner, inventory):
rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_e11.iff', owner.getPlanet())
rifle.setDamageType('energy')
rifle.setWeaponType(WeaponType.RIFLE)
rifle.setAttackSpeed(0.8)
rifle.setMinDamage(518)
rifle.setMaxDamage(1035)
rifle.setMaxRange(64)
#rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_e11.iff', owner.getPlanet())
#rifle.setDamageType('energy')
#rifle.setWeaponType(WeaponType.RIFLE)
#rifle.setAttackSpeed(0.8)
#rifle.setMinDamage(518)
#rifle.setMaxDamage(1035)
#rifle.setMaxRange(64)
pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet())
pistol.setDamageType('energy')
@@ -412,7 +412,7 @@ def rangedWeapons(owner, inventory):
heavy.setStringAttribute('wpn_elemental_value', '50')
heavy.setMaxRange(64)
inventory.add(rifle)
#inventory.add(rifle)
inventory.add(pistol)
inventory.add(carbine)
inventory.add(heavy)
src/services/equipment/EquipmentService.java
+1 -1
View File
@@ -169,7 +169,7 @@ public class EquipmentService implements INetworkDispatch {
//A rifle is not identified as a true WeaponObject ?!?!?!?!
if (item.getTemplate().contains("object/weapon/")){
actor.setWeaponId(item.getObjectID());
System.out.println("WEAPON IDENTIFIED!");
//System.out.println("WEAPON IDENTIFIED!");
}
actor.addObjectToEquipList(item);
processItemAtrributes(actor, item, true);