changeset 15:9ffcb493a0f4

Changes for the container system
author KarstenBock@gmx.net
date Sun, 31 Jul 2011 23:48:54 +0200
parents a9019d0ac5f8
children 5c587a0d9ad7
files components/containable.py components/container.py
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/components/containable.py	Sun Jul 31 23:47:28 2011 +0200
+++ b/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
--- a/components/container.py	Sun Jul 31 23:47:28 2011 +0200
+++ b/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