Module:Spellbook - Revision history

Ge0ff: book_rarity was removed in 0.27

2021-11-04T12:40:02Z

book_rarity was removed in 0.27

Medar: Improve book sorting in spell sources.

2016-11-17T10:54:56Z

Improve book sorting in spell sources.

Medar: Fixes.

2016-11-09T14:58:29Z

Fixes.

Medar: Another fix.

2016-11-04T11:23:26Z

Another fix.

Medar: Fix main spell school code.

2016-11-04T11:12:00Z

Fix main spell school code.

Medar: Add spellbook_info to get infobox and flavour.

2016-11-04T10:42:45Z

Add spellbook_info to get infobox and flavour.

Medar: More book of vs. Book of fixes.

2016-11-03T11:17:14Z

More book of vs. Book of fixes.

Medar: Allow giving capitalized "Book of" book name.

2016-11-03T11:00:34Z

Allow giving capitalized "Book of" book name.

Medar: Support new data format: https://github.com/plampila/crawl-wiki-modules

2016-11-03T10:23:47Z

Support new data format: https://github.com/plampila/crawl-wiki-modules

Show changes

Medar: Fix pattern match in spell_sources.

2016-02-02T09:06:14Z

Fix pattern match in spell_sources.

@@ Line 156: / Line 156: @@
    local args = {}
    args.name = book.name:gsub('^%l', string.upper)
    local school = main_school(book)

@@ Line 4: / Line 4: @@
 local spell_data = mw.loadData('Module:Table of spells')
-local function table_keys_sorted(t)
+local function table_keys_sorted(t, f)
    local keys = {}
    for k in pairs(t) do
      table.insert(keys, k)
    end
-   table.sort(keys)
+   table.sort(keys, f)
    return keys
 end
@@ Line 97: / Line 97: @@
    result = result .. table.concat(spell_list, ', ')
    return result
 end
@@ Line 108: / Line 113: @@
      ret = ret .. ';Main Texts\n'
      for book in string.gmatch(primary_books, '[^,]+') do
-       ret = ret .. ':' .. frame:expandTemplate{title = 'spellbook2', args = {book, school}} .. '\n'
+       ret = ret .. ':' ..
        done[book:gsub('^Book of', 'book of')] = true
      end
@@ Line 126: / Line 133: @@
    if next(found) ~= nil then
      ret = ret .. ';Other Texts\n'
-    -- TODO: ignore "the" while sorting
+     for _,book in ipairs(table_keys_sorted(found, compare_books)) do
-     for _,book in ipairs(table_keys_sorted(found)) do
+       ret = ret .. ':' ..
-       ret = ret .. ':' .. frame:expandTemplate{title = 'spellbook2', args = {book, school}} .. '\n'
+        frame:expandTemplate{title = 'spellbook2', args = {book, school}} ..
      end
    end

@@ Line 13: / Line 13: @@
 end
-local function spell_school_link(school)
+local function format_schools(frame, schools, no_link_for)
    local ret = ''
-   for school in pairs(schools) do
+   for _, school in ipairs(table_keys_sorted(schools)) do
      if school == no_link_for then
        ret = ret .. school .. '/'
      else
-       ret = ret .. spell_school_link(school) .. '/'
+       ret = ret ..
      end
    end
@@ Line 83: / Line 64: @@
      return ''
    end
-   book = book:gsub("^Book of", "book of")
+   book = book:gsub('^Book of', 'book of')
    local result = [==[{| cellpadding="5" border="1"
 |- align="center"
@@ Line 89: / Line 70: @@
 ]==]
    local letters = 'abcdefghijklmnopqrstuvwxyz'
-   for i,name in pairs(book_data[book].spells) do
+   for i,name in ipairs(book_data[book].spells) do
      result = result .. '|-\n| [[File:' .. name:lower() .. '.png]] || ' ..
         letters:sub(i, i) .. ' - [[' .. name .. ']] || ' ..
-        format_schools(spell_data[name].schools) .. ' || ' ..
+        format_schools(frame, spell_data[name].schools) .. ' || ' ..
         spell_data[name].level .. '\n'
    end
@@ Line 106: / Line 87: @@
    local school = frame.args[2]
    if school == '' then school = nil end
-   local result = "'''[[" .. book:gsub("^%l", string.upper) .. "]]''': "
+   local result = "'''[[" .. book:gsub('^%l', string.upper) .. "]]''': "
    local spell_list = {}
-   book = book:gsub("^Book of", "book of")
+   book = book:gsub('^Book of', 'book of')
-   for _,name in pairs(book_data[book].spells) do
+   for _,name in ipairs(book_data[book].spells) do
      if school == nil or spell_data[name]['schools'][school] then
        table.insert(spell_list, '[['.. name .. ']]')
@@ Line 128: / Line 109: @@
      for book in string.gmatch(primary_books, '[^,]+') do
        ret = ret .. ':' .. frame:expandTemplate{title = 'spellbook2', args = {book, school}} .. '\n'
-       done[book:gsub("^Book of", "book of")] = true
+       done[book:gsub('^Book of', 'book of')] = true
      end
    end
@@ Line 156: / Line 137: @@
 function p.spellbook_info(frame)
    local name = frame.args[1]
-   if not name or name == "" then
+   if not name or name == '' then
      name = mw.title.getCurrentTitle().text
    end
-   name = name:gsub("^Book of", "book of")
+   name = name:gsub('^Book of', 'book of')
    local book = book_data[name]
    if not book then
@@ Line 166: / Line 147: @@
    local args = {}
-   args.name = book.name:gsub("^%l", string.upper)
+   args.name = book.name:gsub('^%l', string.upper)
    args.rarity = book.rarity

@@ Line 47: / Line 47: @@
 local function main_school(book)
    local schools = {}
    for _,name in pairs(book.spells) do
      for school in pairs(spell_data[name]['schools']) do
        if schools[school] == nil then
@@ Line 59: / Line 61: @@
    local found = nil
    for school,count in pairs(schools) do
-     if count == #book.spells then
+     if count == num_spells then
        if found ~= nil then return nil end
        found = school
@@ Line 68: / Line 70: @@
    end
    for school,count in pairs(schools) do
-     if count == #book.spells - 1 then
+     if count == num_spells - 1 then
        if found ~= nil then return nil end
        found = school

@@ Line 43: / Line 43: @@
    end
    return ret:sub(1, -2)
 end
@@ Line 136: / Line 167: @@
    args.rarity = book.rarity
-   local schools = {}
+   local school = main_school(book)
-  for _,name in pairs(book.spells) do
+  if school ~= nil then
-    for school in pairs(spell_data[name]['schools']) do
+     args.school = school
    end
    local infobox = frame:expandTemplate{title = 'book', args = args}
@@ Line 162: / Line 181: @@
    return infobox .. '\n' .. flavour
 end
 return p

@@ Line 69: / Line 69: @@
    if primary_books ~= nil and primary_books ~= "" then
      ret = ret .. ";Main Texts\n"
-     for book in string.gmatch(primary_books, "%P+") do
+     for book in string.gmatch(primary_books, "[^,]+") do
        ret = ret .. ":" .. frame:expandTemplate{title = "spellbook2", args = {book, school}} .. "\n"
        done[book] = true