From bd9db1c0c86d04517200d60a1622d6d9b2c9129d Mon Sep 17 00:00:00 2001 From: Seefo Date: Tue, 6 May 2014 18:40:19 -0400 Subject: [PATCH] Added container limit checks --- scripts/commands/transferitemmisc.py | 4 ++++ src/resources/objects/tangible/TangibleObject.java | 11 +++++++++++ src/services/EquipmentService.java | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/scripts/commands/transferitemmisc.py b/scripts/commands/transferitemmisc.py index fb2995dd..dfe13587 100644 --- a/scripts/commands/transferitemmisc.py +++ b/scripts/commands/transferitemmisc.py @@ -12,6 +12,10 @@ def run(core, actor, target, commandString): actorContainer = actor.getContainer() if container == None: return + + if(container.isFull()): + actor.sendSystemMessage('That container is full.', 0) + return if container.getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory") or target.getContainer().getTemplate().startswith("object/tangible/inventory/shared_lightsaber_inventory"): core.equipmentService.calculateLightsaberAttributes(actor, target, container) diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index ffa10e36..753752eb 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -685,4 +685,15 @@ public class TangibleObject extends SWGObject implements Serializable { return messageBuilder; } + public boolean isFull() + { + if(getTemplateData().getAttribute("containerVolumeLimit") == null) return false; + + int containerVolumeLimit = getTemplateData().getAttribute("containerVolumeLimit"); + + if(NGECore.getInstance().objectService.objsInContainer(this, this) >= containerVolumeLimit) return true; + + return false; + } + } diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java index 6262735e..917a37b5 100644 --- a/src/services/EquipmentService.java +++ b/src/services/EquipmentService.java @@ -372,8 +372,8 @@ public class EquipmentService implements INetworkDispatch { } else { - minDamageBonus += Integer.parseInt(item.getAttributes().get("@obj_attr_n:componentbonuslow")); // "Min Damage Modified" - maxDamageBonus += Integer.parseInt(item.getAttributes().get("@obj_attr_n:componentbonushigh")); // "Max Damage Modified"" + minDamageBonus += Integer.parseInt(item.getAttributes().get("@obj_attr_n:mindamage")); // "Minimum Damage" + maxDamageBonus += Integer.parseInt(item.getAttributes().get("@obj_attr_n:maxdamage")); // "Maximum Damage" } int saberBaseDamageMin = (int) saber.getAttachment("weaponBaseDamageMin");