polserver / polserver / 35386859456

82%

Build Type

push

github

Committed by web-flow

Commit Message

Allow color ranges and color lists in equip.cfg (#969)

* Allow color ranges and color lists in equip.cfg

The color slot of an Equip/Weapon/Armor line took a single value, so an
equipment template dressed every character it touched identically. It now
also accepts an inclusive range written low-high, and a comma separated
list whose entries are single colors or ranges:

    Equip Robe      1701-1754
    Equip Sandals   1940, 1965, 1109, 1150-1154

EquipFromTemplate() picks a list entry with equal odds per entry, then a
value inside it when that entry is a range, once per item on every call.

The slot is now read as the whole rest of the line rather than one
whitespace token. strtoul still takes its base from the prefix and still
stops at trailing text, so decimal, hex and text after a value behave as
they did. An entry that cannot be read is dropped and reported, and the
item is created anyway, uncolored if nothing in the slot parsed.

* Render single equip colors as single values in the parse test

The test helper printed every parsed entry as low-high, so the section
covering single values asserted 0x6a5-0x6a5 and nothing in the file ever
showed a lone color. A one-wide pair now prints as a bare value, which
makes the expectations read back in equip.cfg's own syntax, and a new
case pins that 1701-1701 parses to the same thing as 1701.

Coverage Stats

41 of 43 new or added lines in 1 file covered. (95.35%)

11 existing lines in 3 files now uncovered.

59670 of 72998 relevant lines covered (81.74%)

1559996.12 hits per line