Browse Source

Use refactorized get_brain_part

Bastien Sevajol 9 years ago
parent
commit
0373363df5

+ 4 - 11
intelligine/synergy/event/transport/PutableEvent.py View File

@@ -30,7 +30,7 @@ class PutableEvent(NearEvent):
30 30
             raise NotConcernedEvent()
31 31
 
32 32
         object_near_id = parameters[self._near_name][0]
33
-        brain_part = self._get_brain_part(object_id, context)
33
+        brain_part = self._get_brain_part(context, object_id, BRAIN_PART_PUT)
34 34
 
35 35
         if not brain_part.can_put(context, object_id, object_near_id):
36 36
             raise NotConcernedEvent()
@@ -48,14 +48,7 @@ class PutableEvent(NearEvent):
48 48
     def _can_put(object_id, context):
49 49
         return not context.metas.value.get(CANT_PUT_STILL, object_id, allow_empty=True)
50 50
 
51
-    @staticmethod
52
-    def _get_brain_part(object_id, context):
53
-        # TODO: refatc au dessus ?
54
-        object_brain_schema = context.metas.value.get(BRAIN_SCHEMA, object_id)
55
-        return object_brain_schema[BRAIN_PART_PUT]
56
-
57
-    @staticmethod
58
-    def _object_can_put(object_id, context, object_to_put_id):
59
-        object_brain_schema = context.metas.value.get(BRAIN_SCHEMA, object_id)
60
-        object_take_brain_part = object_brain_schema[BRAIN_PART_PUT]
51
+    @classmethod
52
+    def _object_can_put(cls, object_id, context, object_to_put_id):
53
+        object_take_brain_part = cls._get_brain_part(context, object_id, BRAIN_PART_PUT)
61 54
         return object_take_brain_part.can_put(context, object_id, object_to_put_id)

+ 3 - 4
intelligine/synergy/event/transport/TakeableEvent.py View File

@@ -35,8 +35,7 @@ class TakeableEvent(NearEvent):
35 35
     def _can_carry(object_id, context):
36 36
         return not context.metas.value.get(CANT_CARRY_STILL, object_id, allow_empty=True)
37 37
 
38
-    @staticmethod
39
-    def _object_can_take(object_id, context, object_to_take_id):
40
-        object_brain_schema = context.metas.value.get(BRAIN_SCHEMA, object_id)
41
-        object_take_brain_part = object_brain_schema[BRAIN_PART_TAKE]
38
+    @classmethod
39
+    def _object_can_take(cls, object_id, context, object_to_take_id):
40
+        object_take_brain_part = cls._get_brain_part(context, object_id, BRAIN_PART_TAKE)
42 41
         return object_take_brain_part.can_take(context, object_id, object_to_take_id)