From 73180b5f83ddf50cfd7eab793a9a2e2ef752159a Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sat, 9 Aug 2014 02:48:14 +0200 Subject: [PATCH] Removed rifles from frog temorarily to prevent client-lockups --- scripts/character_builder_terminal.py | 16 ++++++++-------- src/services/equipment/EquipmentService.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 7478d353..7b5326ce 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -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) diff --git a/src/services/equipment/EquipmentService.java b/src/services/equipment/EquipmentService.java index e0dbc024..7d735229 100644 --- a/src/services/equipment/EquipmentService.java +++ b/src/services/equipment/EquipmentService.java @@ -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);