2 + skill(unarmed_combat)/3 to 2 + rnd(skill(unarmed_combat)/5 + 1)
Also replace the menu_colour_prefix colouring for prompts and the like to use message_colour instead, so those "msg" abbreviations in food_colouring.txt actually have an effect now, and players can disable colouring of prompts etc. (respects channels) while leaving it on in the inventory. I'm leaving the menu_colour_prefix function in for now, in case it can be used somewhere else.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5558 c06c8d41-db1a-0410-9941-cceddc491573
GAUT326KHT3MMZPC7TJUOKGPZ6X624E7Z3IOFZEXYWUCORBCZTOAC
BYYIPBFVTM3QFHAVAZJG7VUJYRH7BCW5HJLPBWOMEWGBUGSFWUUAC
NLFAU3OUXSCZDSKRC7KMQO2PRT24DBGCS55UXBDBMCKYA3CYTA4AC
C5WZ62XDFNON4HCJOXC6IL6SQYLE6TKX7DDSJX3MTWAZ4HHM27GQC
MKPQLG4B572NENLGQZLEPACYNJE5XXBFTLRSVZ6OKP5ATEH53BMAC
OFH2B2UZBK43QLFQBZ54FOCFLFNE54BZVDNCEUGDTBCUGNVZULIQC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
YCL3W2PFE6ILTGBFODCSXNPDIA46KVSZP2TI7HDMYAOEJT65RIEAC
BFYHDL4EHSPKKC6EPKDRPESHYAA2WFKC6RXQIRRTSSTF3Z2QPVCAC
3D6NWJ44UYHLZMD3BOQIWXJUEGITAVCHK6Z2WWDQONVQC4HSBRXQC
VCG3BRIYRTNNWYC3LOXD6KFGXOX37HAFW2HNV7WXVG2V7EUHLDZQC
57E4T664CXRFPVW2BZBYI33UIHFS4PSEZURZYPSYSZK5DRLJJ5CQC
5HGMULU7IWTFJJH35S6XTCW3YZEMCORXHQL6NVY2TO4DUMVITNJAC
6YQRV6WDHJU3CQSXGZLXLNOKGLBCTMOIU4ZWZVFSQULY7OUFX7AQC
2WVP47RBNL5OVYMAZH7TKRYD7F2TGSZ5X74PWVGAYCQP26G3JUHQC
YDDLIMYVR5YEORQ6YXEG3M4O26M3XIZ6OCXQTHEVLKTAAJP3FI5AC
R22TTMI6WXWULC7ODKFF3QCB7MOTETQQ6IR4BUCUPOCQKQNCTT5AC
PI5BATR2SER3RFE76IUGHM2AGXVFOUM3PLU7WC2K2Q2BA5K2E73QC
KBNY5FWKTEAKABFCLPC3QFKFSVZKAGXINPCIFV6WDSWFO4VCKNTAC
ILADK4YNPQVYLZYDMGGBYN2EBBCIPCDNUCWZH27DQTKOMVUDLVMAC
P2ZCF3BBG523ZEOD6XQA4X5YEHBTWH3IM33YVHXP2SQ5POXZIH4QC
SDLKLUNFGVKDS55DDJZCBAVIB7NL3RRYPTACAY65SCUQKV6APFSAC
OXHOOJE4XEQKGI3JKURNSITG6CRQFAOFQ2EKKG6M5DCLN7LS4GUAC
XCEZ7OA2INNPSYNAB5U6JB7XNDAD5BKU26YLFPPZ3SEESFZKADQAC
TPPJRQ2NTCV3GI2VRHEXQJREDERPJODCJWUG5WCOQGN4REPPPAMAC
TDAVD56MGLFSMJLPLSYLEVW7MBRMT7V5BNII4TRWVDIHH47CD2OAC
int col = -1;
const std::vector<message_colour_mapping>& mcm
= Options.message_colour_mappings;
typedef std::vector<message_colour_mapping>::const_iterator mcmci;
for (mcmci ci = mcm.begin(); ci != mcm.end(); ++ci)
{
if (ci->message.is_filtered(channel, cprf))
{
col = ci->colour;
break;
}
}
if (col != -1)
colour = colour_to_str( col );
if (!colour.empty())
{
// Order is important here.
colour_off = "</" + colour + ">";
colour = "<" + colour + ">";
item_name = colour + item_name + colour_off;
}
return (item_name);
}
### Colours both on the ground and in inventory!
### Use menu_colour (inv) to colour items in your inventory or the
### pickup menu.
### Use message_colour (msg) to highlight items in prompts and when
### listed on the ground.