summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-02-29 00:47:17 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-02-29 00:47:17 +0000
commit08313313f3784b007dac16a613b9472311d42fb6 (patch)
treeaee3a0a26ab449dbfa50e6649893303318e9e48e
parentda65a68b7a8bbe8898aa81b5d6cc794d3c01ffc6 (diff)
downloadcrawl-ref-08313313f3784b007dac16a613b9472311d42fb6.tar.gz
crawl-ref-08313313f3784b007dac16a613b9472311d42fb6.zip
Fix [1889577]: Don't give kobold gladiators the option to start with a
trident, as kobolds can't wield both it and a buckler at the same time, and they're better with shields than they are with polearms. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3475 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/newgame.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index e39ac15dd5..cbb8f70a2c 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1630,8 +1630,11 @@ static bool choose_weapon()
int keyin = 0;
int num_choices = 4;
- if (you.char_class == JOB_GLADIATOR || you.species == SP_MERFOLK)
+ if ((you.char_class == JOB_GLADIATOR && you.species != SP_KOBOLD)
+ || you.species == SP_MERFOLK)
+ {
num_choices = 5;
+ }
if (Options.weapon != WPN_UNKNOWN && Options.weapon != WPN_RANDOM
&& (Options.weapon != WPN_TRIDENT || num_choices == 5))