summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDavid Gay <david@davidgay.org>2021-07-11 17:27:38 -0400
committerDavid Gay <david@davidgay.org>2021-07-11 17:27:38 -0400
commit0fba923dda9440a7817e4dfa191bc242e5e0eb76 (patch)
tree5c666d25ea26b23ac026cd0fedbea5021f8b8e83 /app/controllers
parent362b92dbebf1ccc529794890153f8c1bfc43637d (diff)
First worldcall spell: Hearth Passage
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/characters/spells_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/characters/spells_controller.rb b/app/controllers/characters/spells_controller.rb
index a0e6913..b98c1c3 100644
--- a/app/controllers/characters/spells_controller.rb
+++ b/app/controllers/characters/spells_controller.rb
@@ -1,6 +1,8 @@
class Characters::SpellsController < ApplicationController
def index
- @spell_activities = Activity.where("gid like ?", "havencast_%").where(innate: true).order(:name)
+ @spell_activities = Activity.where("gid like ?", "havencast_%")
+ .or(Activity.where("gid like ?", "worldcall_%"))
+ .where(innate: true).order(:name)
# TODO: Don't load into memory
@spell_activities = @spell_activities.to_a + current_char.learned_activities
.map { |la| la.activity }