From 7575ced8051ec32ddc6672f9f02f845022ab02cf Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sun, 18 Jun 2023 23:01:49 -0700 Subject: [PATCH] Update blueprints This updates the blueprints to match the new schema. The new AwakeningBlueprint was accidentally added already, oops. --- app/blueprints/api/v1/character_blueprint.rb | 6 ++++++ app/blueprints/api/v1/grid_character_blueprint.rb | 5 ++++- app/blueprints/api/v1/grid_weapon_blueprint.rb | 4 ++-- app/blueprints/api/v1/weapon_blueprint.rb | 10 ++++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/blueprints/api/v1/character_blueprint.rb b/app/blueprints/api/v1/character_blueprint.rb index d47bde7..1857ac1 100644 --- a/app/blueprints/api/v1/character_blueprint.rb +++ b/app/blueprints/api/v1/character_blueprint.rb @@ -63,6 +63,12 @@ module Api ougi_ratio_flb: w.ougi_ratio_flb } end + + field :awakenings do + Awakening.where(object_type: 'Character').map do |a| + AwakeningBlueprint.render_as_hash(a) + end + end end end end diff --git a/app/blueprints/api/v1/grid_character_blueprint.rb b/app/blueprints/api/v1/grid_character_blueprint.rb index 4ecf072..4f9d656 100644 --- a/app/blueprints/api/v1/grid_character_blueprint.rb +++ b/app/blueprints/api/v1/grid_character_blueprint.rb @@ -18,7 +18,10 @@ module Api end field :awakening do |c| - c.awakening + { + type: AwakeningBlueprint.render_as_hash(c.awakening), + level: c.awakening_level + } end field :over_mastery, if: lambda { |_fn, obj, _opt| diff --git a/app/blueprints/api/v1/grid_weapon_blueprint.rb b/app/blueprints/api/v1/grid_weapon_blueprint.rb index 3e409e8..7ab9355 100644 --- a/app/blueprints/api/v1/grid_weapon_blueprint.rb +++ b/app/blueprints/api/v1/grid_weapon_blueprint.rb @@ -32,9 +32,9 @@ module Api end end - field :awakening, if: ->(_field_name, w, _options) { w.weapon.awakening } do |w| + field :awakening, if: ->(_field_name, w, _options) { w.awakening_id } do |w| { - type: w.awakening_type, + type: AwakeningBlueprint.render_as_hash(w.awakening), level: w.awakening_level } end diff --git a/app/blueprints/api/v1/weapon_blueprint.rb b/app/blueprints/api/v1/weapon_blueprint.rb index d7701e1..2b42710 100644 --- a/app/blueprints/api/v1/weapon_blueprint.rb +++ b/app/blueprints/api/v1/weapon_blueprint.rb @@ -11,8 +11,8 @@ module Api end fields :granblue_id, :element, :proficiency, - :max_level, :max_skill_level, :limit, :rarity, - :series, :ax, :ax_type, :awakening + :max_level, :max_skill_level, :max_awakening_level, :limit, :rarity, + :series, :ax, :ax_type field :uncap do |w| { @@ -38,6 +38,12 @@ module Api max_atk_ulb: w.max_atk_ulb } end + + field :awakenings, if: ->(_field_name, w, _options) { w.awakenings } do |w| + w.awakenings.map do |a| + AwakeningBlueprint.render_as_hash(a) + end + end end end end