diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-21 13:49:11 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-21 13:49:11 +0000 |
| commit | ad4b537375a36b53291b1bfff87c729a983d5417 (patch) | |
| tree | 9d9a978af6003c9576681bfe9fea71b9127adc44 /crawl-ref | |
| parent | a5f6b9ec2ffcbdebca189f4fed30b8f1e24727dc (diff) | |
| download | crawl-ref-ad4b537375a36b53291b1bfff87c729a983d5417.tar.gz crawl-ref-ad4b537375a36b53291b1bfff87c729a983d5417.zip | |
Add information to demon weapons that Demonspawn fight better with them.
(Hmmm, while I wrote Demonspawns going by proper grammar rules my gut
feeling says it should be simply "Demonspawn" without that "s". Help?)
Also catering to FR 1816411: disallow elven M&F as well as dwarven Pole-arms.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2505 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/describe.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 12 |
3 files changed, 21 insertions, 4 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 29561c65f3..504701cc67 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1279,6 +1279,17 @@ static std::string describe_weapon( const item_def &item, bool verbose) description += "$It is a buggy weapon."; break; } + + switch(item.sub_type) + { + case WPN_DEMON_BLADE: + case WPN_DEMON_WHIP: + case WPN_DEMON_TRIDENT: + description += "$Demonspawns are more deadly with it."; + break; + default: + break; + } } if (!is_random_artefact( item )) diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 0cecea466f..5436b91395 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1096,8 +1096,6 @@ int items( int allow_uniques, // not just true-false, case WPN_SPIKED_FLAIL: case WPN_GREAT_MACE: case WPN_DIRE_FLAIL: - if (one_chance_in(6)) - set_equip_race( mitm[p], ISFLAG_ELVEN ); if (one_chance_in(4)) set_equip_race( mitm[p], ISFLAG_DWARVEN ); if (one_chance_in(3)) diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 8717e8df44..8d1d592ade 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -539,11 +539,19 @@ static void racialise_starting_equipment() case SP_GREY_ELF: case SP_DEEP_ELF: case SP_SLUDGE_ELF: - set_equip_race( you.inv[i], ISFLAG_ELVEN ); + if (you.inv[i].sub_type != OBJ_WEAPONS + || weapon_skill(you.inv[i]) != SK_MACES_FLAILS) + { + set_equip_race( you.inv[i], ISFLAG_ELVEN ); + } break; case SP_MOUNTAIN_DWARF: - set_equip_race( you.inv[i], ISFLAG_DWARVEN ); + if (you.inv[i].sub_type != OBJ_WEAPONS + || weapon_skill(you.inv[i]) != SK_POLEARMS) + { + set_equip_race( you.inv[i], ISFLAG_DWARVEN ); + } break; case SP_HILL_ORC: |