Creatureaction exposed

api_v2/models/creature.py

@@ -145,6 +145,12 @@ def experience_points(self):
                 return None
 
 
+    @property
+    def actions(self):
+        """Returns the set of actions that are related to this creature."""
+        return self.creatureaction_set
+
+
 class CreatureAction(HasName, HasDescription):
     """Describes an action available to a creature."""
     key = key_field()

api_v2/serializers/creature.py

@@ -79,6 +79,7 @@ def make_attack_obj(attack):
 
 def make_action_obj(action):
     '''Structures an object in a way that can be consistently referenced.'''
+    return action
     obj = { 'name': action.name, 'desc': action.desc }
 
     match action.uses_type:
@@ -97,6 +98,14 @@ def make_action_obj(action):
     return obj
 
 
+class CreatureActionSerializer(serializers.ModelSerializer):
+    key = serializers.ReadOnlyField()
+
+    class Meta:
+        model = models.CreatureAction
+        fields = '__all__'
+
+
 class CreatureTypeSerializer(GameContentSerializer):
     '''Serializer for the Creature Type object'''
     key = serializers.ReadOnlyField()
@@ -117,7 +126,7 @@ class CreatureSerializer(GameContentSerializer):
     saving_throws_all = serializers.SerializerMethodField()
     skill_bonuses = serializers.SerializerMethodField()
     skill_bonuses_all = serializers.SerializerMethodField()
-    actions = serializers.SerializerMethodField()
+    actions = CreatureActionSerializer(many=True, context={'request': {}})
     speed = serializers.SerializerMethodField()
     speed_all = serializers.SerializerMethodField()
     challenge_rating_text = serializers.SerializerMethodField()
@@ -225,13 +234,13 @@ def get_speed_all(self, creature):
         '''Implicit speed helper method.'''
         return creature.get_speed_all()
 
-    def get_actions(self, creature):
-        '''Actions helper method.'''
-        result = []
-        for action in creature.creatureaction_set.all():
-            action_obj = make_action_obj(action)
-            result.append(action_obj)
-        return result
+#    def get_actions(self, creature):
+#        '''Actions helper method.'''
+#        result = []
+#        for action in creature.creatureaction_set.all():
+#            action_obj = make_action_obj(action)
+#            result.append(action_obj)
+#        return result
 
     def get_challenge_rating_text(self, creature):
         return creature.challenge_rating_text
@@ -249,3 +258,5 @@ class Meta:
         '''Meta options for serializer.'''
         model = models.CreatureSet
         fields = '__all__'
+
+

data/v2/en-publishing/mmenag/CreatureAction.json

@@ -32759,6 +32759,20 @@
     "legendary_cost": 1
   }
 },
+{
+  "model": "api_v2.creatureaction",
+  "pk": "mmenag_titanic-dragon-turtle_legendary-tail",
+  "fields": {
+    "name": "Tail",
+    "desc": "The dragon turtle makes a tail attack.",
+    "parent": "mmenag_titanic-dragon-turtle",
+    "uses_type": null,
+    "uses_param": null,
+    "action_type": "LEGENDARY_ACTION",
+    "form_condition": null,
+    "legendary_cost": 2
+  }
+},
 {
   "model": "api_v2.creatureaction",
   "pk": "mmenag_titanic-dragon-turtle_lightning-storm",