fix github issue #623 - soldiers and mattocks

Reported by eakaye.  Selection of equipment when creating a soldier
or watchperson can pick a polearm, but random selection among those
had a chance to choose dwarvish mattock which doesn't use polearms
skill and isn't appropriate for a human soldier or watchperson.
Not mentioned, but lance was in the same boat.

Change the selection to only pick something which uses polearms
skill, then make that moot by moving lance and dwarvish mattock out
of the midst of the polearms so that they're no longer candidates
for special case rejection.

A couple of other things which might have had a similar issue were
already ok.  Giving a polearm when creating a troll selects between
a few choices rather than among all the polearms.  And wishing for
"polearm" only considers items which use polearms skill.

While changing objects.h to reorder the two non-polearms, I removed
a bunch of tabs that were present in the scroll definitions.

EDITLEVEL is incremented due to objects[] reordering, so existing
save and bones files will be invalidated.

Fixes #623
This commit is contained in:
PatR
2021-10-27 15:36:32 -07:00
parent 6b882609ac
commit da859c5eb8
4 changed files with 36 additions and 26 deletions

View File

@@ -670,6 +670,7 @@ if an artifact gets created as a random treasure drop and then deleted because
when creating random contents for a container, explicitly exclude artifacts
(already implicitly excluded because randomly generated artifacts are
all weapons and containers don't start with any weapons in them)
don't give lance or mattock as starting equipment when creating soldiers
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository