From d010a6b3f30c5c37eee1db971a81f50e69d6de7a Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sat, 9 Aug 2014 02:20:58 +0200 Subject: [PATCH] Analyzed rifle bug --- scripts/character_builder_terminal.py | 44 +++++++++---------- .../objects/creature/CreatureObject.java | 2 +- src/services/equipment/EquipmentService.java | 7 ++- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 29675e3f..7478d353 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -379,35 +379,35 @@ def combatLevelDown(owner): 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.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"); - pistol.setWeaponType(WeaponType.PISTOL); - pistol.setAttackSpeed(0.4); - pistol.setMinDamage(259); - pistol.setMaxDamage(518); - pistol.setMaxRange(35); + pistol.setDamageType('energy') + pistol.setWeaponType(WeaponType.PISTOL) + pistol.setAttackSpeed(0.4) + pistol.setMinDamage(259) + pistol.setMaxDamage(518) + pistol.setMaxRange(35) carbine = core.objectService.createObject('object/weapon/ranged/carbine/shared_carbine_e11.iff', owner.getPlanet()) - carbine.setDamageType("energy"); - carbine.setWeaponType(WeaponType.CARBINE); - carbine.setAttackSpeed(0.6); - carbine.setMinDamage(389); - carbine.setMaxDamage(780); - carbine.setMaxRange(50); + carbine.setDamageType('energy') + carbine.setWeaponType(WeaponType.CARBINE) + carbine.setAttackSpeed(0.6) + carbine.setMinDamage(389) + carbine.setMaxDamage(780) + carbine.setMaxRange(50) heavy = core.objectService.createObject('object/weapon/ranged/heavy/shared_som_lava_cannon.iff', owner.getPlanet()) - heavy.setDamageType("energy"); - heavy.setWeaponType(WeaponType.HEAVYWEAPON); - heavy.setAttackSpeed(1); - heavy.setMinDamage(850); - heavy.setMaxDamage(1350); + heavy.setDamageType('energy') + heavy.setWeaponType(WeaponType.HEAVYWEAPON) + heavy.setAttackSpeed(1) + heavy.setMinDamage(850) + heavy.setMaxDamage(1350) heavy.setStringAttribute('wpn_elemental_type', 'Heat') heavy.setStringAttribute('wpn_elemental_value', '50') heavy.setMaxRange(64) diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index b61a7f72..a84a3a73 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -901,7 +901,7 @@ public class CreatureObject extends TangibleObject implements Serializable { } IoBuffer weaponIdDelta = messageBuilder.buildWeaponIdDelta(weaponId); - + tools.CharonPacketUtils.printAnalysis(weaponIdDelta, "buildWeaponIdDelta"); notifyObservers(weaponIdDelta, true); } diff --git a/src/services/equipment/EquipmentService.java b/src/services/equipment/EquipmentService.java index f5220c53..e0dbc024 100644 --- a/src/services/equipment/EquipmentService.java +++ b/src/services/equipment/EquipmentService.java @@ -165,7 +165,12 @@ public class EquipmentService implements INetworkDispatch { if(func != null) func.__call__(Py.java2py(core), Py.java2py(actor), Py.java2py(item)); if(!actor.getEquipmentList().contains(item.getObjectID())) { - if(item instanceof WeaponObject) actor.setWeaponId(item.getObjectID()); + //if(item instanceof WeaponObject){ + //A rifle is not identified as a true WeaponObject ?!?!?!?! + if (item.getTemplate().contains("object/weapon/")){ + actor.setWeaponId(item.getObjectID()); + System.out.println("WEAPON IDENTIFIED!"); + } actor.addObjectToEquipList(item); processItemAtrributes(actor, item, true); }