diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
| commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
| tree | 6a86adac74beac293bc688dafcfa1709a6476901 /lib/mods/theme/help/magic.txt | |
| parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
| parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'lib/mods/theme/help/magic.txt')
| -rw-r--r-- | lib/mods/theme/help/magic.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mods/theme/help/magic.txt b/lib/mods/theme/help/magic.txt index 93486f0b..14fa6570 100644 --- a/lib/mods/theme/help/magic.txt +++ b/lib/mods/theme/help/magic.txt @@ -24,7 +24,7 @@ schools: Other magical skills, generally being used primarily by characters of a specific class, are: *****m_demono.txt*0[Demonology] *****m_necrom.txt*0[Necromancy] *****skills.txt*36[Runecraft] - *****m_thaum.txt*0[Thaumaturgy] *****skills.txt*49[Alchemy] *****m_geoman.txt*0[Geomancy] + *****m_thaum.txt*0[Thaumaturgy] *****m_geoman.txt*0[Geomancy] The *****m_demono.txt*0[Demonology] skill is primarily used by *****c_demono.txt*0[Demonologists] for their special spells, whereas the *****m_necrom.txt*0[Necromancy] skill is used by *****c_necro.txt*0[Necromancers] for their own set @@ -32,8 +32,7 @@ of special spells. The same goes for *****skills.txt*36[Runecraft], which is used by *****c_runecr.txt*0[Runecrafters] to allow use of more difficult runes or rune-combinations. *****m_thaum.txt*0[Thaumaturgy] gives you randomly chosen attack spells, and as such each game with it will be different. *****c_geoman.txt*0[Geomancers] -harness the powers of the elements using *****m_geoman.txt*0[Geomancy]. Lastly we have -*****skills.txt*49[Alchemy], which is used by *****c_alchem.txt*0[Alchemists]. +harness the powers of the elements using *****m_geoman.txt*0[Geomancy]. In addition to the schools of magic, you can get access to special sets of spells if you worship a God. There are currently four good Gods, |