Skip to content

Commit

Permalink
Merge pull request #501 from open5e/482-v2-consider-_all-as-a-suffix-…
Browse files Browse the repository at this point in the history
…not-a-prefix-on-fields

refactored fields to have _all suffix instead of all_ prefix.
  • Loading branch information
augustjohnson authored Aug 4, 2024
2 parents 2b29152 + ad0d652 commit 20420c0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion api_v2/models/speed.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def get_speed(self):

return speed

def get_all_speed(self):
def get_speed_all(self):
return {
"unit": self.get_unit(),
"walk": self.walk,
Expand Down
20 changes: 10 additions & 10 deletions api_v2/serializers/creature.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ class CreatureSerializer(GameContentSerializer):
ability_scores = serializers.SerializerMethodField()
modifiers = serializers.SerializerMethodField()
saving_throws = serializers.SerializerMethodField()
all_saving_throws = serializers.SerializerMethodField()
saving_throws_all = serializers.SerializerMethodField()
skill_bonuses = serializers.SerializerMethodField()
all_skill_bonuses = serializers.SerializerMethodField()
skill_bonuses_all = serializers.SerializerMethodField()
actions = serializers.SerializerMethodField()
size = SizeSerializer(read_only=True, context={'request': {}})
speed = serializers.SerializerMethodField()
all_speed = serializers.SerializerMethodField()
speed_all = serializers.SerializerMethodField()
challenge_rating_text = serializers.SerializerMethodField()
experience_points = serializers.SerializerMethodField()

Expand All @@ -125,7 +125,7 @@ class Meta:
'name',
'size',
'speed',
'all_speed',
'speed_all',
'category',
'type',
'alignment',
Expand All @@ -139,9 +139,9 @@ class Meta:
'ability_scores',
'modifiers',
'saving_throws',
'all_saving_throws',
'saving_throws_all',
'skill_bonuses',
'all_skill_bonuses',
'skill_bonuses_all',
'passive_perception',
'damage_immunities',
'nonmagical_attack_immunity',
Expand Down Expand Up @@ -171,7 +171,7 @@ def get_saving_throws(self, creature):
entries = creature.get_saving_throws().items()
return { key: value for key, value in entries if value is not None }

def get_all_saving_throws(self, creature):
def get_saving_throws_all(self, creature):
'''Implicit saving throws helper method.'''
defaults = creature.get_modifiers()
entries = creature.get_saving_throws().items()
Expand All @@ -182,7 +182,7 @@ def get_skill_bonuses(self, creature):
entries = creature.get_skill_bonuses().items()
return { key: value for key, value in entries if value is not None }

def get_all_skill_bonuses(self, creature):
def get_skill_bonuses_all(self, creature):
'''Implicit skill bonuses helper method.'''
defaults = {
'acrobatics': creature.modifier_dexterity,
Expand Down Expand Up @@ -212,9 +212,9 @@ def get_speed(self, creature):
entries = creature.get_speed().items()
return { key: value for key, value in entries if value is not None }

def get_all_speed(self, creature):
def get_speed_all(self, creature):
'''Implicit speed helper method.'''
return creature.get_all_speed()
return creature.get_speed_all()

def get_actions(self, creature):
'''Actions helper method.'''
Expand Down

0 comments on commit 20420c0

Please sign in to comment.