Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

caravan: fix special case for obsidian swords#1585

Merged
ab9rf merged 1 commit into
DFHack:masterfrom
chdoc:fix-ethics-wood
May 19, 2026
Merged

caravan: fix special case for obsidian swords#1585
ab9rf merged 1 commit into
DFHack:masterfrom
chdoc:fix-ethics-wood

Conversation

@chdoc
Copy link
Copy Markdown
Member

@chdoc chdoc commented May 15, 2026

fixes: DFHack/dfhack#5660

It turns out that obsidian short swords are not the only wooden weapons...

@chdoc chdoc changed the title fix special case for obsidian swords caravan: fix special case for obsidian swords May 19, 2026
@chdoc chdoc added the bugfix label May 19, 2026
@quietust
Copy link
Copy Markdown
Member

Looks reasonable to me - the weapon check should be in addition to the material checks (on the item and its improvements), not instead of them.

@ab9rf ab9rf merged commit ca46261 into DFHack:master May 19, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Elf trading ethics warning

3 participants