granblue.team/hensei-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #61 from jedmund/fix-base-skills

Browse source 
Fix bug preventing selection of base skills
This commit is contained in:
Justin Edmund 2023-01-28 02:38:31 -08:00 committed by GitHub
commit 54ed380d57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/api/v1/jobs_controller.rb
View file

@ -63,8 +63,7 @@ module Api
new_skill_ids = new_skill_keys.map { |key| job_params[key] } new_skill_ids = new_skill_keys.map { |key| job_params[key] }
new_skill_ids.map do |id| new_skill_ids.map do |id|
skill = JobSkill.find(id) skill = JobSkill.find(id)
raise Api::V1::IncompatibleSkillError.new(job: @party.job, skill: skill) if mismatched_skill(@party.job, raise Api::V1::IncompatibleSkillError.new(job: @party.job, skill: skill) if mismatched_skill(@party.job, skill)
skill)
end end
positions = extract_positions_from_keys(new_skill_keys) positions = extract_positions_from_keys(new_skill_keys)
@ -154,7 +153,11 @@ module Api
mismatched_base = skill.job.base_job && (job.row != 'ex2' || skill.job.base_job.id != job.base_job.id) && skill.base mismatched_base = skill.job.base_job && (job.row != 'ex2' || skill.job.base_job.id != job.base_job.id) && skill.base
if %w[4 5 ex2].include?(job.row) if %w[4 5 ex2].include?(job.row)
true if mismatched_emp || mismatched_base || mismatched_main if skill.base && !mismatched_base
false
else
true if mismatched_emp || mismatched_main
end
elsif mismatched_emp || mismatched_main elsif mismatched_emp || mismatched_main
true true
else else