Revision 3747

Date:
2019-10-30 02:27:29
Author:
dsb
Revision Log:
All the stupid typoes and omissions I should have checked for before
checking in the preceding.
Files:

Legend:

 
Added
 
Removed
 
Modified
  • tome2/trunk/class/interface/PlayerLore.lua

     
    19 19 -- dsb-tome@killerbunnies.org
    20 20
    21 21 require 'engine.class'
    22 local LorePopup = require 'mod.dialogs.LorePopup'
    22 23
    23 24 module(..., package.seeall, class.make)
    24 25
  • tome2/trunk/data/general/objects/bases.lua

     
    166 166 end
    167 167 elseif self.use_simple.lore then
    168 168 if who.learnLore then
    169 who:learnLore(self.use_simple_lore)
    169 who:learnLore(self.use_simple.lore)
    170 170 else
    171 171 game.log('[??? actor %s using lore %s]', who:getName(), self:getName{no_count=true})
    172 172 end
    173 173 else
    174 174 game.log('[Sorry, not implemented (%s)]', self:getName{no_count=true})
    175 175 end
    176 return { id=true, used=true, destroy=true }
    176 177 end,
    177 178 name = function(self)
    178 179 local desc = 'do something unspecified'
    179 if self.use.simple.town_map then
    180 if self.use_simple.town_map then
    180 181 desc = 'reveal the location of a town and its surrounding geography on the world map'
    181 182 elseif self.use_simple.lore then
    182 183 desc = 'learn the lore on the parchment'
  • tome2/trunk/data/lore/deep-thoughts.lua

     
    20 20
    21 21 newLore {
    22 22 id = 'deep-thoughts-1',
    23 title = [[Mordekainen's Magical Compendum of Deep Thought]],
    23 name = [[Mordekainen's Magical Compendum of Deep Thought]],
    24 24 category = 'deep thoughts',
    25 25 lore = [[If they ever come up with a swashbuckling School, I think one of the courses should be Laughing, Then Jumping Off Something.
    26 26
     
    67 67
    68 68 newLore {
    69 69 id = 'deep-thoughts-2',
    70 title = [[Mordekainen's Magical Compendum of Deep Thought, Vol. 2]],
    70 name = [[Mordekainen's Magical Compendum of Deep Thought, Vol. 2]],
    71 71 category = 'deep thoughts',
    72 72 lore = [[It makes me mad when people say I turned and ran like a scared rabbit. Maybe it was like an angry rabbit, who was running to go fight in another fight, away from the first fight.
    73 73
     
    116 116
    117 117 newLore {
    118 118 id = 'deep-thoughts-3',
    119 title = [[Mordekainen's Magical Compendum of Deep Thought, Vol. 3]],
    119 name = [[Mordekainen's Magical Compendum of Deep Thought, Vol. 3]],
    120 120 category = 'deep thoughts',
    121 121 lore = [[I think my new thing will be to try to be a real happy guy. I'll just walk around being real happy until some jerk says something stupid to me.
    122 122
  • tome2/trunk/data/lore/floor-inscr.lua

     
    20 20
    21 21 newLore {
    22 22 id = 'language-1',
    23 title = [[Númenórean for Beginners (I)]],
    23 name = [[Númenórean for Beginners (I)]],
    24 24 category = 'languages',
    25 25 lore = [[nalo means shadow
    26 26 ure means sun
     
    30 30
    31 31 newLore {
    32 32 id = 'language-2',
    33 title = [[Númenórean for Beginners (II)]],
    33 name = [[Númenórean for Beginners (II)]],
    34 34 category = 'languages',
    35 35 lore = [[gimli means star
    36 36 kadar means city
     
    40 40
    41 41 newLore {
    42 42 id = 'language-3',
    43 title = [[Advanced Lessons of Númenórean]],
    43 name = [[Advanced Lessons of Númenórean]],
    44 44 category = 'languages',
    45 45 lore = [[attu means father
    46 46 aru means king
     
    52 52
    53 53 newLore {
    54 54 id = 'language-4',
    55 title = [[Advanced Lessons of Sindarin]],
    55 name = [[Advanced Lessons of Sindarin]],
    56 56 category = 'languages',
    57 57 lore = [[naur means fire
    58 58 mellon means friend
     
    64 64
    65 65 newLore {
    66 66 id = 'language-5',
    67 title = [[Khuzdul - The Hidden Tongue of the Dwarves]],
    67 name = [[Khuzdul - The Hidden Tongue of the Dwarves]],
    68 68 category = 'languages',
    69 69 lore = [[baraz means red
    70 70 Baruk means Axes
     
    77 77
    78 78 newLore {
    79 79 id = 'language-6',
    80 title = [[Nandorin for Dummies]],
    80 name = [[Nandorin for Dummies]],
    81 81 category = 'languages',
    82 82 lore = [[dori means land
    83 83 hrassa means precipice
     
    88 88
    89 89 newLore {
    90 90 id = 'language-7',
    91 title = [[Advanced Lessons of Orcish]],
    91 name = [[Advanced Lessons of Orcish]],
    92 92 category = 'languages',
    93 93 lore = [[nazg means ring
    94 94 ghash means fire
  • tome2/trunk/data/lore/misc.lua

     
    20 20
    21 21 newLore {
    22 22 id = 'one-ring',
    23 title = [[The One Ring]],
    23 name = [[The One Ring]],
    24 24 category = 'misc',
    25 25 lore = [[Ash nazg durbatuluk,
    26 26 ash nazg gimbatul,
     
    37 37
    38 38 newLore {
    39 39 id = 'adventurers-guide',
    40 title = [[language-7]],
    40 name = [[Adventurer's Guide to Middle-earth]],
    41 41 category = 'misc',
    42 42 lore = [[
    43 43 #C_R##{bold}#Adventurer's guide to the Middle-earth#{italic}##LAST#
  • tome2/trunk/dialogs/LorePopup.lua

     
    29 29 self.color = {r=0x3a, g=0x35, b=0x33}
    30 30 self.ui = 'parchment'
    31 31
    32 Dialog.init(self, 'Lore found: #0080FF#'..l.name..'#LAST#')
    32 Dialog.init(self, 'Lore found: #0080FF#'..l.name..'#LAST#', 1, 1)
    33 33
    34 34 local lines = l.lore:splitLines(w - 10, self.font)
    35 35
     
    41 41 height = h,
    42 42 scrollbar = (h < required_h and true or false),
    43 43 text = l.lore,
    44 color = self.color,
    44 45 }
    45 46 self.c_text:setTextShadow(false)
    46 47
  • tome2/trunk/dialogs/ShowLore.lua

     
    51 51 sortable = true,
    52 52 columns = {
    53 53 { name='', width={40,'fixed'}, display_prop='order', sort='order' },
    54 { name='Lore' width=60, display_prop='name', sort='name' },
    54 { name='Lore', width=60, display_prop='name', sort='name' },
    55 55 { name='Category', width=40, display_prop='cat', sort='cat' },
    56 56 },
    57 57 list = self.list,
     
    77 77 local list = {}
    78 78
    79 79 for id, _ in pairs(self.actor.lore_known) do
    80 local l = self:getLore(id)
    80 local l = self.actor:getLore(id)
    81 81 -- TODO Maybe filter on search?
    82 82 list[#list+1] = {
    83 83 name = l.name,
  • tome2/trunk/load.lua

     
    39 39 local PlayerSkills = require 'mod.class.interface.PlayerSkills'
    40 40 local PlayerCombat = require 'mod.class.interface.PlayerCombat'
    41 41 local PlayerAlchemy = require 'mod.class.interface.PlayerAlchemy'
    42 local PlayerLore = require 'mod.class.interface.PlayerLore'
    42 43 local ActorAI = require "engine.interface.ActorAI"
    43 44 local ActorTemporaryEffects = require "engine.interface.ActorTemporaryEffects"
    44 45 local NPCFields = require 'mod.class.interface.NPCFields'
     
    120 121 -- Achievements
    121 122 WorldAchievements:loadDefinition("/data/achievements/")
    122 123
    124 -- Lore
    125 PlayerLore:loadDefinition('/data/lore/lore.lua')
    126
    123 127 -- Talents
    124 128 ActorTalents:loadDefinition('/data/talents/talents.lua')
    125 129
  • tome2/trunk/obj-util.lua

     
    190 190 -- as remembered.
    191 191 function obj_util.parchment_map_town(zone, level, data)
    192 192 local function block_cb(_, x, y) return not level.map:isBound(x, y) end
    193 local function apply cb(_, x, y) level.map.remembers(x, y, true) end
    193 local function apply_cb(_, x, y) level.map.remembers(x, y, true) end
    194 194 local txy = game.state:getWorldMapZoneCoords(data.zone)
    195 195 if not txy then return end
    196 196 core.fov.calc_circle(txy.x, txy.y, level.map.w, level.map.h, data.radius, block_cb, apply_cb, nil)