Tidy up the new lines item descriptions a bit, so you don't get three free lines in some cases (non-randart, non-special description items) and one or two in other cases.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6370 c06c8d41-db1a-0410-9941-cceddc491573
Q57GOIHVFNJHTBYNUGJNME3UF2QFRJ6CN2UXVY47NHU7XAT7JJYAC
2CHVQN2TKU3XDDKODGOCP5ZIVPAFV4H3FAY5ZFXE2I52GK3LZG5QC
JZSJAFHPIC5L6BVNOE3CWEI3IMUOUE7IVEPIKVSLS5KVGJLQBDLQC
YOU6TP4DLQ7MBTERRQ3DF3Y4LUDXBATKEBLEKOIPUGZL6T2O2C2AC
6DNIJ5AUXSKOXNSKVOE2TBKNSTRK3UQDML2FI7D4JQXI5JBSJGCQC
UEI5JAVCMN7Y2SACTEZPZSNFJWOJTC55G24Q6LKQCT4XNDH5ZQIAC
RC6L3CIBLJEH4GWRFD7UQNGI6PZT74FRUVOYHSAN2XCC74NZUASQC
JM6GKZ6VMX6FNVOZIDXIV22HGX7YESMIFZFE6EEQVCMFJIEA3FNAC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
XVFTIQ7MSVKQDMQ2HT3IY6FJOZFK4H6OFGTUAID5VGCA5BGVXYPAC
PL6I2CMSTHY5ZHWVMIQE5YTM5S5VPKBNZM6QJVHZSSKOJGIJ5W4AC
EB33TUEEJFHMEO6YHEXSYX3MBXHNPEFNMZL2VA75GOGKY6POSF2AC
GQ3RKP6CX6TT37NNKSLCW3S3WPICG2HO7GIKGKO7UOKX4UQFD7RAC
Q263OF72GJOH2VQHGCF5IYZ5UHKV5DNX3J3WTCEONPN3WGGNZOUQC
RQR4PTMGQLTRWLYRU3KXIIDGND7FBORESJWMWFVD3WYU5SISZXAAC
2WVP47RBNL5OVYMAZH7TKRYD7F2TGSZ5X74PWVGAYCQP26G3JUHQC
JCWJWGMQIKQGSSFJUQRKNIWW3HBOJSHYDTOPPE5BWOJTIJTDYUTAC
RVJJOTPIEADHXAPIDZPFCCYJNIR6UGPVNF6YZMW4JBI52G2NSEXQC
TRCCLE5RJ4VJULBOWOI2WC3RJU7WTEGS7RRQTDQL6W5UU246LKTQC
UET576SVCGS2TXEDRTO7BUTOTLJ77MYHIVZJCDWGH2BAXYMKG6DAC
57E4T664CXRFPVW2BZBYI33UIHFS4PSEZURZYPSYSZK5DRLJJ5CQC
XRZPPYWPWUOM4SFNI6BHKH2UKJQNLKOV6Y7XIEPEZXE5QYRT26PAC
7HMVMNBIRU5WDSIWYK6RX57E4LA35N3HLT7RPIAGCDLEKAEEDX2QC
QEEJFAETO6B2J4IWDIDCJ5UNIFNNHHG22IWF2CUJRTJJBNE47CWQC
6UPCB64Z2W243QR3JQD7WPQMPVNVBPYRG7GTGZK6LTKKBBSKBHZQC
7BBEAPSUBQMBK4XC2Q6YJ2JPSVSPCSBJUYXM6EWXHNTQG4AEJX3QC
UWI3ZNJDRQRL7CXFNFEG46TA6SAK24XUFY5YOKVOTJA3VG3OBNFAC
3VO4LT3UMO752LBBVQIYMEY2GILQN7XJT254WQABE55IW2X423GQC
2OQFLBVWCTXCWUPSDM76KNXTNC3YPAKRI5KLDAEU4KQLN4DEOLYQC
HQD6TO36QRWAVQDAL4ORFK2OQUEZZ7KQQQWHZMUKOCZRT2GKCH4AC
GL7TJGUGV4JPLZCDWH6QVST4RYW7UJV6IP7UAEWEKNBWJO2H2ZHAC
VCG3BRIYRTNNWYC3LOXD6KFGXOX37HAFW2HNV7WXVG2V7EUHLDZQC
NGW2XPEX2XRK3CYC37DNUZSSB5IQLECMKRB6NX257I2X3G35LMPAC
2KTJHQUX2LTU2BCLS5YXVRRKMOYKKIZAPF2LBKORFGSHEN5IO3IAC
TRZAZJJA5VQBJ65SO5H5DNSILIZEJHIZCBYEBHEATCT6ZSMWIFKQC
P2OYYNPHIBGOLT4CRLNTTIXDN34EU2QCMFQJNLAMUAHQXZTEDPXQC
QCUMH3C7GXV7ZW444WT5SFAXQOJKJSE2YCQCEHMRYXCWF4QI7UMAC
LC2XZTUD56PLARIGBTDXDPJIYJNMJU446GFDGLRIFD2I4F66L6TAC
G4TVXOLIF5X2MWV7I4UPT3MSQHRMGME6QRIIFAQ64C45JGYK7SIAC
23PFLB2E4QHL5SF3Q2YV5FXRH6MFHENEU2ACVC572ZCYDXCBZVQAC
GZ4FB5VKL4C22KK3GSKQPLJYMRGLFXUDCOBNEBC2OKK6KVZL3OSQC
PZNRGNZPN4YLXL2UDMEUPE33AAZZ6Z2YPK6EQGYZL2PNTRWLCUNQC
HC35ORPWMUNGV4G2TVNPID4ZDRNTWXE4U37LYT4QGSEQR2EXQJNAC
5BJPWUPLJFS34FUTFJVKA4A52YMIGV6EWDXLNSDCWBJWBGVSQFGQC
LSAVA5BJQO4Z2MYXVQOM4AOXTCLKDNQMOS3DZ4SDNO4LI422LA3AC
TO43FWKHNIA5MVDOFXYHQODTLBQYEZKX5UIUGID57436UF7G2EXQC
MBBPLL4SZUB3JUUYQYLZW7S5OXRCEGJX3WWADOQXGHWQ7BIKCY5QC
NLXVJSK53M3GCGGVJWYPHYZJ2A7JAF2FEYQPIGLRUYJ3FTWYONLQC
RV4L36J3DCVW3SONFFYAVK44XJQOFVNPGKHET7VOIFYHWZHCJRNAC
RVST2QHYJ757ZHK4AUJ5NGPDZ44AD6RVFVXYPKQIBJXZBDNUCHXQC
case OBJ_MISSILES:
description << _describe_ammo( item );
case OBJ_ARMOUR:
desc = _describe_armour( item, verbose );
if (desc.empty())
need_extra_line = false;
else
description << desc;
case OBJ_ARMOUR:
description << _describe_armour( item, verbose );
case OBJ_JEWELLERY:
desc = _describe_jewellery( item, verbose );
if (desc.empty())
need_extra_line = false;
else
description << desc;
break;
case OBJ_MISSILES:
description << _describe_ammo( item );
break;
case OBJ_JEWELLERY:
description << _describe_jewellery( item, verbose );
if (! player_can_read_spellbook( item ))
description << "$This book is beyond your current level of understanding.";
if (!player_can_read_spellbook( item ))
{
description << "$This book is beyond your current level of "
"understanding.";
}
// although they will often be chained (remove cloak, remove
// armour, wear new armour, replace cloak), all of which can
// be stopped when complete. This is a fairly reasonable
// behaviour, although perhaps the character should have
// option of reversing the current action if it would take
// less time to get out of the plate mail that's half on
// than it would take to continue. Probably too much trouble,
// and would have to have a prompt... this works just fine. -- bwr
// although they will often consist of chained intermediary steps
// (remove cloak, remove armour, wear new armour, replace cloak),
// all of which can be stopped when complete. This is a fairly
// reasonable behaviour, although perhaps the character should have
// the option of reversing the current action if it would take less
// time to get out of the plate mail that's half on than it would
// take to continue. Probably too much trouble, and we'd have to
// have a prompt... this works just fine. -- bwr
if (delay.type == DELAY_BUTCHER || delay.type == DELAY_BOTTLE_BLOOD
|| delay.type == DELAY_OFFER_CORPSE)
if (delay.type == DELAY_FEED_VAMPIRE)
{
if (you.hunger_state == HS_ENGORGED
|| you.hunger_state > HS_SATIATED
&& you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
{
// Messages handled in _food_change() in food.cc.
stop_delay();
return;
}
}
else if (delay.type == DELAY_BUTCHER || delay.type == DELAY_BOTTLE_BLOOD
|| delay.type == DELAY_OFFER_CORPSE)