Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.8.0-a0-6077-g57d6060
|
From: <gi...@cr...> - 2011-03-31 16:44:22
|
via 57d6060d12f6e46920d439c244f48d94a69e9570 (commit)
via ddc7011b61214c08939c73d884740c6ce6463270 (commit)
via 89eb417abcf80e417cd5f4f628bb878b65b46c15 (commit)
via 53826a4578068a53918585f41fcb3b6905c6d8a9 (commit)
via 8640b91d4a3a225f4264fb5b5305e1f2538212be (commit)
via c35e67c6c8c7430f3b1d0850c946d3ed8db2de98 (commit)
from 82eba65f58c9268fc52cafa246d04cadb00e95b9 (commit)
-----------------------------------------------------------------------
commit 57d6060d12f6e46920d439c244f48d94a69e9570
Author: Eino Keskitalo <ein...@gm...>
Date: Thu Mar 31 19:18:28 2011 +0300
New spellbook: the book of zoology: summon butterflies, sticks to snakes, call canine familiar, ice form, summon ice beast, summon hydra.
Mainly a vehicle for keeping summon hydra in the game (apart from randart books). Transmutation spells thrown in for theme.
Adding another source of Butterflies might be not so good, but on the other hand it was recently nerfed. Not sure about the rarity, but I want Summon Hydra to pop up every now and then.
commit ddc7011b61214c08939c73d884740c6ce6463270
Author: Eino Keskitalo <ein...@gm...>
Date: Thu Mar 31 19:15:37 2011 +0300
Remove the book of surveyances description.
commit 89eb417abcf80e417cd5f4f628bb878b65b46c15
Author: Eino Keskitalo <ein...@gm...>
Date: Thu Mar 31 19:11:59 2011 +0300
Arrange spellbook descriptions alphabetically.
commit 53826a4578068a53918585f41fcb3b6905c6d8a9
Author: Eino Keskitalo <ein...@gm...>
Date: Thu Mar 31 19:00:37 2011 +0300
Remove Summon Hydra from the Book of Summonings.
It's in the Vehumet gifting chain and Vehumet-worshippers already have a good enough variety of spells.
commit 8640b91d4a3a225f4264fb5b5305e1f2538212be
Author: Eino Keskitalo <ein...@gm...>
Date: Mon Mar 28 21:07:26 2011 +0300
Remove the book of divinations description.
commit c35e67c6c8c7430f3b1d0850c946d3ed8db2de98
Author: Eino Keskitalo <ein...@gm...>
Date: Mon Mar 28 21:03:51 2011 +0300
Prefix an internal function with an underscore. (code conventions)
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/book-data.h | 13 +++++++++-
crawl-ref/source/dat/descript/items.txt | 40 ++++++++++++++-----------------
crawl-ref/source/enum.h | 3 +-
crawl-ref/source/itemname.cc | 7 +++--
crawl-ref/source/spl-book.cc | 1 +
5 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/crawl-ref/source/book-data.h b/crawl-ref/source/book-data.h
index 6b24635..35a1b27 100644
--- a/crawl-ref/source/book-data.h
+++ b/crawl-ref/source/book-data.h
@@ -84,7 +84,7 @@
SPELL_SHADOW_CREATURES,
SPELL_SUMMON_DEMON,
SPELL_SUMMON_UGLY_THING,
- SPELL_SUMMON_HYDRA,
+ SPELL_NO_SPELL,
SPELL_NO_SPELL,
},
@@ -464,6 +464,17 @@
SPELL_NO_SPELL,
},
+{ // Book of Zoology
+ SPELL_SUMMON_BUTTERFLIES,
+ SPELL_STICKS_TO_SNAKES,
+ SPELL_CALL_CANINE_FAMILIAR,
+ SPELL_ICE_FORM,
+ SPELL_SUMMON_ICE_BEAST,
+ SPELL_SUMMON_HYDRA,
+ SPELL_NO_SPELL,
+ SPELL_NO_SPELL,
+},
+
{ // Book of Annihilations - Vehumet special
SPELL_POISON_ARROW,
SPELL_IOOD,
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 3b88cb7..21a6e5f 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -137,6 +137,14 @@ book of annihilations
While browsing, you note blood leaking from the pages. Even an illiterate will feel the sheer impact of arcane fury contained in this book. It is sought after by sorcerers, for it allows the gifted and resourceful to command destruction with the ease of a twinkle. Feeble wizards, however, may well meet their doom when trying to read this opus.
%%%%
+book of brands
+
+This book contains magical spells related to the branding of weapons and launchers, as well as spells that are helpful in all forms of ranged combat.
+%%%%
+book of burglary
+
+A worn-looking book, with a small key pressed between two pages.
+%%%%
book of callings
A book of magic spells.
@@ -157,6 +165,10 @@ book of charms
A book of magic spells.
%%%%
+book of chemistry
+
+A slightly seared book, with a hole burnt through the cover.
+%%%%
book of clouds
A book of magic spells.
@@ -173,9 +185,9 @@ book of death
A black book containing spells written in a hasty scrawl.
%%%%
-book of divinations
+book of dreams
-A book of magic spells.
+A translucent book; light plays strangely on its surface.
%%%%
book of enchantments
@@ -261,9 +273,9 @@ book of summonings
A book of magic spells.
%%%%
-book of surveyances
+book of the dragon
-A book of magic spells.
+A book of magic spells; it is warm to the touch.
%%%%
book of the earth
@@ -301,25 +313,9 @@ book of wizardry
A book of magic spells.
%%%%
-book of brands
+book of zoology
-This book contains magical spells related to the branding of weapons and launchers, as well as spells that are helpful in all forms of ranged combat.
-%%%%
-book of the dragon
-
-A book of magic spells; it is warm to the touch.
-%%%%
-book of burglary
-
-A worn-looking book, with a small key pressed between two pages.
-%%%%
-book of dreams
-
-A translucent book; light plays strangely on its surface.
-%%%%
-book of chemistry
-
-A slightly seared book, with a hole burnt through the cover.
+A book of magic spells.
%%%%
bottled efreet
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 29b1ba2..c6e4407 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -402,7 +402,8 @@ enum book_type
BOOK_BURGLARY,
BOOK_DREAMS,
BOOK_CHEMISTRY,
- MAX_NORMAL_BOOK = BOOK_CHEMISTRY,
+ BOOK_ZOOLOGY,
+ MAX_NORMAL_BOOK = BOOK_ZOOLOGY,
MIN_GOD_ONLY_BOOK,
BOOK_ANNIHILATIONS = MIN_GOD_ONLY_BOOK,
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 030e671..929e7cf 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -960,7 +960,7 @@ static const char* book_primary_string(int p)
}
}
-static const char* book_type_name(int booktype)
+static const char* _book_type_name(int booktype)
{
switch (static_cast<book_type>(booktype))
{
@@ -1010,6 +1010,7 @@ static const char* book_type_name(int booktype)
case BOOK_BURGLARY: return "Burglary";
case BOOK_DREAMS: return "Dreams";
case BOOK_CHEMISTRY: return "Chemistry";
+ case BOOK_ZOOLOGY: return "Zoology";
case BOOK_RANDART_LEVEL: return "Fixed Level";
case BOOK_RANDART_THEME: return "Fixed Theme";
default: return "Bugginess";
@@ -1161,7 +1162,7 @@ std::string sub_type_string(object_class_type type, int sub_type,
else if (sub_type == BOOK_YOUNG_POISONERS)
return "Young Poisoner's Handbook";
- return book_type_name(sub_type);
+ return _book_type_name(sub_type);
}
case OBJ_STAVES: return staff_type_name(sub_type);
case OBJ_MISCELLANY:
@@ -1804,7 +1805,7 @@ std::string item_def::name_aux(description_level_type desc,
else if (item_typ == BOOK_YOUNG_POISONERS)
buff << "Young Poisoner's Handbook";
else
- buff << "book of " << book_type_name(item_typ);
+ buff << "book of " << _book_type_name(item_typ);
break;
case OBJ_STAVES:
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 855ee19..fae15e2 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -276,6 +276,7 @@ int book_rarity(uint8_t which_book)
return 7;
case BOOK_TRANSFIGURATIONS:
+ case BOOK_ZOOLOGY:
return 8;
case BOOK_FIRE:
--
Dungeon Crawl Stone Soup
|
