diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/docs/crawl_manual.txt | 13 | ||||
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt index b6a6009f11..9dc566c768 100644 --- a/crawl-ref/docs/crawl_manual.txt +++ b/crawl-ref/docs/crawl_manual.txt @@ -2000,12 +2000,13 @@ some ammunition, as well as an edged weapon and a set of leathers. Artificers: ----------- -The Artificer is attuned to gadgets, mechanics, and magic elicited from arcane -items as opposed to casting magic himself. As a consequence, he enters the -Dungeon with an assortment of wands. Artificers are skilled at Evoking magical -items, finding Traps and Doors, have some prior experience with Scrolls of -Recharging, and understand the basics of melee combat. Dwarves, Gnomes, and -Spriggans are renowned for their skill in artifice. +Artificers are attuned to gadgets, mechanics, and magic elicited from +arcane items as opposed to casting magic themselves. As a consequence, +they enter the Dungeon with an assortment of wands. Artificers are +skilled at evoking magical items, finding Traps and Doors, have some +prior experience with scrolls of recharging, and understand the basics +of melee combat. Dwarves, Gnomes, and Spriggans are renowned for their +skill in artifice. Wanderers: ---------- diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 161fbedf73..422064a433 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2980,7 +2980,7 @@ static monsterentry mondata[] = { }, { - MONS_SHARK, ';', YELLOW, "shark", + MONS_SHARK, ';', WHITE, "shark", // Goes into a battle frenzy when it smells blood. M_COLD_BLOOD | M_BLOOD_SCENT, MR_NO_FLAGS, diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 3f88e4183d..753095e6b3 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -614,9 +614,6 @@ int place_monster(mgen_data mg, bool force_pos) #endif const band_type band = _choose_band(mg.cls, mg.power, band_size); band_size++; - if (band_size > 1) - mprf("Monster type %d: Create a band (band size %d).", - mg.cls, band_size); for (int i = 1; i < band_size; i++) band_monsters[i] = _band_member( band, mg.power ); @@ -1211,7 +1208,8 @@ static band_type _choose_band( int mon_type, int power, int &band_size ) #ifdef DEBUG_MON_CREATION mpr("in choose_band()", MSGCH_DIAGNOSTICS); #endif - // init + // Band size describes the number of monsters in addition to + // the band leader. band_size = 0; // Single monster, no band. band_type band = BAND_NO_BAND; diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 7c8908b5a7..44138a9ec0 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2876,6 +2876,7 @@ static void _give_basic_knowledge(job_type which_job) case JOB_ARTIFICER: set_ident_type( OBJ_SCROLLS, SCR_RECHARGING, ID_KNOWN_TYPE ); + break; default: break; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index e4d10656fb..8336668fd6 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -5975,7 +5975,7 @@ static piety_gain_t _sacrifice_one_item_noncount( const item_def& item) static int _gold_to_donation(int gold) { - return (int) ((gold * log((double)gold)) / MAX_PIETY); + return static_cast<int>((gold * log((double)gold)) / MAX_PIETY); } void offer_items() |