Skip to content
Snippets Groups Projects
Commit c29d15ac authored by Malin Freeborn's avatar Malin Freeborn
Browse files

Merge commit '8246bb35' into dev

parents 2f7ef853 205fa555
No related branches found
No related tags found
No related merge requests found
......@@ -334,7 +334,14 @@
description={Captain of the Gnolls' Guild at Keliesend}
}
%%%%% Adventures in Whiteland
%%%%% Adventures in Eastlake
\newglossaryentry{nightfog}{
name={Night Fog},
description={fills the hallways every night. The attempt to keep the young ones in bed throughout the night never works, but it \emph{does} make moving around a lot harder}
text={the Night Fog}
first={the Night Fog\footnote{The \glsentrytext{college}'s lower floor is filled with magical mist each night to stop the young ones running around}}
}
\newglossaryentry{fishtown}{
name={Fishtown},
......@@ -348,7 +355,7 @@
}
\newglossaryentry{deanconjuration}{
name={The Dean of Conjuration},
name={Andrew Fore, the Dean of Conjuration,},
description={the quintessential alchemist who, due to too much inhalation of dangerous materials, has acquired a lethal cough},
text={the Dean of Conjuration},
first={Andrew Fore, the Dean of Conjuration}
......@@ -356,13 +363,13 @@
\newglossaryentry{deanforce}{
name={The Dean of Forces},
description={Derren Arthur},
description={Derren Kisha},
text={the Dean of Forces},
first={Derren Arthur, the Dean of Forces}
first={Derren Kisha, the Dean of Forces}
}
\newglossaryentry{deanmetamagic}{
name={The Dean of Metamagics},
name={Ashkal Quennom, the Dean of Metamagics},
text={the Dean of Metamagics},
description={answers every question with two more, and has the irritating habit of shaving his beard and then socializing with the younger alchemists},
first={Ashkal Quennom, Dean of Metamagics}
......@@ -370,9 +377,9 @@
\newglossaryentry{deaninvocation}{
name={The Dean of Invocation},
description={a wizzened and completely hairless creature who still, at the age of 80, cannot sit still for ten minutes, and wanders, occasionally twitching, while lecturing people on everything at all occasions},
description={is a wizzened and completely hairless creature who still, at the age of 80, cannot sit still for ten minutes, and wanders, occasionally twitching, while lecturing people on everything at all occasions},
text={the Dean of Invocation},
first={Adrian Beard, the Dean of Invocation}
first={Adrian Stein, the Dean of Invocation}
}
\newglossaryentry{moore}{
......@@ -383,16 +390,45 @@
}
\newglossaryentry{prefforce}{
name={Prefect Sailon Quennome},
description={a sly man from the Quennome region whose elven grandmother has left him noticeably shorter than the other students},
name={Prefect Sailon Alisa the Prefect},
description={a sly young man from the Quennome region whose elven grandmother has left him noticeably shorter than the other students},
text={Sailon},
first={Sailon Quennome}
first={Sailon Alisa}
}
\newglossaryentry{prefconjuration}{
name={Prefect Dane Arthur},
name={Prefect Dane Arthur the Prefect},
description={a bright eyed young farmhand, who still patches his own clothes},
text={Dane},
first={Prefect Dane Arthur}
}
\newglossaryentry{prefmetamagic}{
name={Iseobel Ventress the Prefect},
description={Prefect Iseobel Ventress},
text={Prefect Ventress},
first={Prefect Iseobel Ventress}
}
\newglossaryentry{whitelies}{
name={Chloe Firya},
description={is a hyperactive, petulant lier, with a greater imagination than all the bards in the North combined. She's fond of faking magical ability using illusion magics},
text={Chloe},
first={Chloe Firya}
}
\newglossaryentry{rat}{
name={Roger Stein (rat)},
description={comes from a long line of powerful mages, and carries with him a potent magical ring. He takes the nickname ``rat'' from his habit of rubbing his nose},
text={Roger},
first={Roger Stein (the rat)}
}
\newglossaryentry{headmaster}{
name={The Headmaster},
text={the Head},
description={came from riches in Mount Arthur, maintained his family's age-old tradition of running \glsentrytext{college} and currently works hard to maintain the status quo},
first={Headmaster Aron Arthur}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment