# HG changeset patch
# User KarstenBock@gmx.net
# Date 1312148934 -7200
# Node ID 799fc37fec6dd02273db6e9084a696e429162213
# Parent  6a637c737d206068c80333e6cedb38082cec4b1e
Changes for the container system

diff -r 6a637c737d20 -r 799fc37fec6d src/parpg/components/containable.py
--- a/src/parpg/components/containable.py	Sun Jul 31 23:47:28 2011 +0200
+++ b/src/parpg/components/containable.py	Sun Jul 31 23:48:54 2011 +0200
@@ -18,4 +18,7 @@
     
     def __init__(self):
         """Constructor"""
-        Component.__init__(bulk=int, weight=int, image=str, container=object)
+        Component.__init__(bulk=int, weight=int, image=str, current_container=object, new_container=object, new_slot=int)
+        self.fields['current_container'].default = None
+        self.fields['new_container'].default = None
+        self.fields['new_slot'].default = -1
diff -r 6a637c737d20 -r 799fc37fec6d src/parpg/components/container.py
--- a/src/parpg/components/container.py	Sun Jul 31 23:47:28 2011 +0200
+++ b/src/parpg/components/container.py	Sun Jul 31 23:48:54 2011 +0200
@@ -20,3 +20,9 @@
     
     def __init__(self):
         Component.__init__(children=list, max_bulk=int)
+        
+def get_bulk(container):
+    bulk = 0
+    for child in container.children:
+        bulk += child.bulk
+    return bulk